diff --git a/playbooks/helm/pre.yaml b/playbooks/helm/pre.yaml
index a9b4fee..b328c22 100644
--- a/playbooks/helm/pre.yaml
+++ b/playbooks/helm/pre.yaml
@@ -1,3 +1,10 @@
 - hosts: all
   roles:
     - role: use-buildset-registry
+    - role: clear-firewall
+    - role: ensure-docker
+    - role: ensure-minikube
+    - role: ensure-helm
+  tasks:
+    - name: Start minikube
+      command: minikube start
diff --git a/playbooks/kubernetes/post.yaml b/playbooks/kubernetes/post.yaml
index 5e8c70d..4639af1 100644
--- a/playbooks/kubernetes/post.yaml
+++ b/playbooks/kubernetes/post.yaml
@@ -1,4 +1,5 @@
 - hosts: all
   roles:
+    - collect-container-logs  # for some of minikube logs
     - collect-kubernetes-state
     - collect-kubernetes-pods-logs
diff --git a/roles/ensure-minikube/defaults/main.yaml b/roles/ensure-minikube/defaults/main.yaml
new file mode 100644
index 0000000..07ebc2f
--- /dev/null
+++ b/roles/ensure-minikube/defaults/main.yaml
@@ -0,0 +1 @@
+minikube_version: latest
diff --git a/roles/ensure-minikube/tasks/main.yaml b/roles/ensure-minikube/tasks/main.yaml
new file mode 100644
index 0000000..1716e08
--- /dev/null
+++ b/roles/ensure-minikube/tasks/main.yaml
@@ -0,0 +1,20 @@
+- name: Download minikube
+  ansible.builtin.get_url:
+    url: https://storage.googleapis.com/minikube/releases/{{ minikube_version }}/minikube-linux-amd64
+    dest: /tmp/minikube
+    mode: 0755
+
+- name: Install minikube
+  become: true
+  ansible.builtin.copy:
+    remote_src: true
+    src: /tmp/minikube
+    dest: /usr/local/bin/minikube
+    mode: "0755"
+
+- name: Install kubectl from minikube
+  become: true
+  ansible.builtin.file:
+    src: /usr/local/bin/minikube
+    dest: /usr/local/bin/kubectl
+    state: link
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 8eb3872..45c6d17 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -14,10 +14,6 @@
 - job:
     name: nebulous-apply-helm-charts
     parent: opendev-buildset-registry-consumer
-
-- job:
-    name: nebulous-apply-helm-charts
-    parent: apply-helm-charts
     description: Deploy a Kubernetes cluster and apply charts.
     roles:
       - zuul: zuul/zuul-jobs
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 737e148..7ef7d1a 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -30,8 +30,10 @@
             files: &nebulous-component-template-apply-helm-charts-files
               - ^playbooks/helm/
               - ^playbooks/kubernetes/
+              - ^roles/check-pod-restarts/
               - ^roles/collect-kubernetes-pods-logs/
               - ^roles/collect-kubernetes-state/
+              - ^roles/ensure-minikube/
         - opendev-buildset-registry:
             files: *nebulous-component-template-apply-helm-charts-files