diff --git a/.gitlab-ci/gce.yml b/.gitlab-ci/gce.yml
index 4c48798dd2acca75e166b8f66d75e3528557cc8b..5c0e369f1d5cb48f94c3ad53a4d246f663a6d3c9 100644
--- a/.gitlab-ci/gce.yml
+++ b/.gitlab-ci/gce.yml
@@ -146,7 +146,7 @@ gce_coreos-cilium:
   except: ['triggers']
   only: ['master', /^pr-.*$/]
 
-gce_ubuntu-cilium-sep:
+gce_ubuntu18-cilium-sep:
   stage: deploy-special
   <<: *gce
   when: manual
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 3588f4b5ed5aaa6a64ebbca01a3dd7e4cd352e23..353e0eedc3be7da110a5b3aee4b4d0526494d382 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -73,7 +73,7 @@ packet_ubuntu-contiv-sep:
   except: ['triggers']
   only: ['master', /^pr-.*$/]
 
-packet_ubuntu-cilium-sep:
+packet_ubuntu18-cilium-sep:
   stage: deploy-special
   <<: *packet
   when: manual
@@ -108,20 +108,6 @@ packet_centos7-calico-ha:
   except: ['triggers']
   only: ['master', /^pr-.*$/]
 
-packet_centos7-cilium:
-  stage: deploy-special
-  <<: *packet
-  when: manual
-  except: ['triggers']
-  only: ['master', /^pr-.*$/]
-
-packet_rhel7-cilium:
-  stage: deploy-special
-  <<: *packet
-  when: manual
-  except: ['triggers']
-  only: ['master', /^pr-.*$/]
-
 packet_centos7-kube-router:
   stage: deploy-special
   <<: *packet
diff --git a/tests/files/gce_centos7-cilium.yml b/tests/files/gce_centos7-cilium.yml
deleted file mode 100644
index f945ad5adeb1601825f8017b0764b6ba3ee71851..0000000000000000000000000000000000000000
--- a/tests/files/gce_centos7-cilium.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-# Instance settings
-cloud_image_family: centos-7
-cloud_region: us-central1-c
-cloud_machine_type: "n1-standard-1"
-mode: default
-
-# Deployment settings
-kube_network_plugin: cilium
-deploy_netchecker: true
-enable_network_policy: true
-dns_min_replicas: 1
-cloud_provider: gce
diff --git a/tests/files/gce_rhel7-cilium.yml b/tests/files/gce_rhel7-cilium.yml
deleted file mode 100644
index 7a00b1b7f7d7cd404b9c601ad95f824c3af1bbd2..0000000000000000000000000000000000000000
--- a/tests/files/gce_rhel7-cilium.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# Instance settings
-cloud_image_family: rhel-7
-cloud_region: us-central1-b
-mode: default
-
-# Deployment settings
-kube_network_plugin: cilium
-deploy_netchecker: true
-enable_network_policy: true
-dns_min_replicas: 1
-cloud_provider: gce
diff --git a/tests/files/gce_ubuntu-cilium-sep.yml b/tests/files/gce_ubuntu18-cilium-sep.yml
similarity index 85%
rename from tests/files/gce_ubuntu-cilium-sep.yml
rename to tests/files/gce_ubuntu18-cilium-sep.yml
index 4965060dbe075934e2d029611d2e4d09ba038432..7d30e6fdb208037dda207c2623e17634d153cdec 100644
--- a/tests/files/gce_ubuntu-cilium-sep.yml
+++ b/tests/files/gce_ubuntu18-cilium-sep.yml
@@ -1,6 +1,6 @@
 ---
 # Instance settings
-cloud_image_family: ubuntu-1604-lts
+cloud_image_family: ubuntu-1804-lts
 cloud_region: us-central1-b
 mode: separate
 
diff --git a/tests/files/packet_centos7-cilium.yml b/tests/files/packet_centos7-cilium.yml
deleted file mode 100644
index 2c34af25814e86767f8fd34a9256846dd8ceee69..0000000000000000000000000000000000000000
--- a/tests/files/packet_centos7-cilium.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# Instance settings
-cloud_image: centos-7
-mode: default
-
-# Kubespray settings
-kube_network_plugin: cilium
-deploy_netchecker: true
-enable_network_policy: true
-dns_min_replicas: 1
diff --git a/tests/files/packet_rhel7-cilium.yml b/tests/files/packet_rhel7-cilium.yml
deleted file mode 100644
index f4e7a128fc0e2b38351437dcc4d83c2db0d5123b..0000000000000000000000000000000000000000
--- a/tests/files/packet_rhel7-cilium.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# Instance settings
-cloud_image: rhel-server-7
-mode: default
-
-# Kubespray settings
-kube_network_plugin: cilium
-deploy_netchecker: true
-enable_network_policy: true
-dns_min_replicas: 1
diff --git a/tests/files/packet_ubuntu-cilium-sep.yml b/tests/files/packet_ubuntu18-cilium-sep.yml
similarity index 86%
rename from tests/files/packet_ubuntu-cilium-sep.yml
rename to tests/files/packet_ubuntu18-cilium-sep.yml
index 093c14213f9557a61ba7d9abb03de4271a42d3cf..df6caaea905a6b8e82570408ce230aeb263f012f 100644
--- a/tests/files/packet_ubuntu-cilium-sep.yml
+++ b/tests/files/packet_ubuntu18-cilium-sep.yml
@@ -1,6 +1,6 @@
 ---
 # Instance settings
-cloud_image: ubuntu-1604
+cloud_image: ubuntu-1804
 mode: separate
 
 # Kubespray settings