diff --git a/playbooks/golangci-lint/pre.yaml b/playbooks/golangci-lint/pre.yaml
index 9c2366e3a..f6f23bf5f 100644
--- a/playbooks/golangci-lint/pre.yaml
+++ b/playbooks/golangci-lint/pre.yaml
@@ -1,5 +1,5 @@
 ---
 - hosts: all
   roles:
-    - install-go
+    - ensure-go
     - ensure-golangci-lint
diff --git a/test-playbooks/ensure-kubernetes/crio.yaml b/test-playbooks/ensure-kubernetes/crio.yaml
index 7bf17420b..a5ebfe39e 100644
--- a/test-playbooks/ensure-kubernetes/crio.yaml
+++ b/test-playbooks/ensure-kubernetes/crio.yaml
@@ -1,7 +1,7 @@
 - hosts: all
   name: Install kubernetes with minikube
   roles:
-    - role: install-kubernetes
+    - role: ensure-kubernetes
       vars:
         minikube_dns_resolvers:
           - '1.1.1.1'
diff --git a/test-playbooks/ensure-kubernetes/docker.yaml b/test-playbooks/ensure-kubernetes/docker.yaml
index 0d0cc21fe..85e5b35fe 100644
--- a/test-playbooks/ensure-kubernetes/docker.yaml
+++ b/test-playbooks/ensure-kubernetes/docker.yaml
@@ -1,7 +1,7 @@
 - hosts: all
   name: Install kubernetes with minikube
   roles:
-    - role: install-kubernetes
+    - role: ensure-kubernetes
       vars:
         minikube_dns_resolvers:
           - '1.1.1.1'
diff --git a/zuul-tests.d/go-jobs.yaml b/zuul-tests.d/go-jobs.yaml
index 2f64eb3bf..e071d9e25 100644
--- a/zuul-tests.d/go-jobs.yaml
+++ b/zuul-tests.d/go-jobs.yaml
@@ -5,7 +5,7 @@
     tags: all-platforms
     files:
       - playbooks/go
-      - roles/install-go
+      - roles/ensure-go
       - roles/go
       - zuul.d/go-jobs.yaml
     vars: