diff --git a/.travis.yml b/.travis.yml
index 77a9ca611..d12f7ffd8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,41 +23,41 @@ env:
     # Debian Jessie
     - >-
       KUBE_NETWORK_PLUGIN=flannel
-      CLOUD_IMAGE=debian-8-kubespray
+      CLOUD_IMAGE=debian-8
       CLOUD_REGION=europe-west1-b
       CLUSTER_MODE=default
     - >-
       KUBE_NETWORK_PLUGIN=calico
-      CLOUD_IMAGE=debian-8-kubespray
+      CLOUD_IMAGE=debian-8
       CLOUD_REGION=us-central1-c
       CLUSTER_MODE=default
 
     # Centos 7
     - >-
       KUBE_NETWORK_PLUGIN=flannel
-      CLOUD_IMAGE=centos-7-sudo
+      CLOUD_IMAGE=centos-7
       CLOUD_REGION=asia-east1-c
       CLUSTER_MODE=default
     - >-
       KUBE_NETWORK_PLUGIN=calico
-      CLOUD_IMAGE=centos-7-sudo
+      CLOUD_IMAGE=centos-7
       CLOUD_REGION=europe-west1-b
       CLUSTER_MODE=default
     - >-
       KUBE_NETWORK_PLUGIN=weave
-      CLOUD_IMAGE=centos-7-sudo
+      CLOUD_IMAGE=centos-7
       CLOUD_REGION=us-central1-c
       CLUSTER_MODE=default
 
    # Redhat 7
     - >-
       KUBE_NETWORK_PLUGIN=calico
-      CLOUD_IMAGE=rhel-7-sudo
+      CLOUD_IMAGE=rhel-7
       CLOUD_REGION=asia-east1-c
       CLUSTER_MODE=default
     - >-
       KUBE_NETWORK_PLUGIN=weave
-      CLOUD_IMAGE=rhel-7-sudo
+      CLOUD_IMAGE=rhel-7
       CLOUD_REGION=europe-west1-b
       CLUSTER_MODE=default
 
@@ -90,7 +90,7 @@ env:
     # Extra cases for separated roles
     - >-
       KUBE_NETWORK_PLUGIN=canal
-      CLOUD_IMAGE=rhel-7-sudo
+      CLOUD_IMAGE=rhel-7
       CLOUD_REGION=europe-west1-b
       CLUSTER_MODE=separate
     - >-
@@ -100,7 +100,7 @@ env:
       CLUSTER_MODE=separate
     - >-
       KUBE_NETWORK_PLUGIN=weave
-      CLOUD_IMAGE=debian-8-kubespray
+      CLOUD_IMAGE=debian-8
       CLOUD_REGION=us-east1-d
       CLUSTER_MODE=separate
     - >-
diff --git a/docs/test_cases.md b/docs/test_cases.md
index f9e84548d..c0b98b785 100644
--- a/docs/test_cases.md
+++ b/docs/test_cases.md
@@ -8,20 +8,20 @@ Here is the test matrix for the Travis CI gates:
 
 |           Network plugin|                  OS type|               GCE region|             Nodes layout|
 |-------------------------|-------------------------|-------------------------|-------------------------|
-|                  flannel|       debian-8-kubespray|           europe-west1-b|                  default|
-|                   calico|       debian-8-kubespray|            us-central1-c|                  default|
-|                  flannel|            centos-7-sudo|             asia-east1-c|                  default|
-|                   calico|            centos-7-sudo|           europe-west1-b|                  default|
-|                    weave|            centos-7-sudo|            us-central1-c|                  default|
-|                   calico|              rhel-7-sudo|             asia-east1-c|                  default|
-|                    weave|              rhel-7-sudo|           europe-west1-b|                  default|
+|                  flannel|                 debian-8|           europe-west1-b|                  default|
+|                   calico|                 debian-8|            us-central1-c|                  default|
+|                  flannel|                 centos-7|             asia-east1-c|                  default|
+|                   calico|                 centos-7|           europe-west1-b|                  default|
+|                    weave|                 centos-7|            us-central1-c|                  default|
+|                   calico|                   rhel-7|             asia-east1-c|                  default|
+|                    weave|                   rhel-7|           europe-west1-b|                  default|
 |                    canal|       ubuntu-1604-xenial|            us-central1-c|                  default|
 |                    weave|       ubuntu-1604-xenial|             asia-east1-c|                  default|
 |                    weave|            coreos-stable|           europe-west1-b|                  default|
 |                    canal|            coreos-stable|               us-east1-d|                  default|
-|                    canal|              rhel-7-sudo|           europe-west1-b|                 separate|
+|                    canal|                   rhel-7|           europe-west1-b|                 separate|
 |                   calico|       ubuntu-1604-xenial|            us-central1-a|                 separate|
-|                    weave|       debian-8-kubespray|               us-east1-d|                 separate|
+|                    weave|                 debian-8|               us-east1-d|                 separate|
 |                   calico|            coreos-stable|             asia-east1-c|                 separate|
 
 Where the nodes layout `default` is that is given in the example inventory file.