diff --git a/.cirun.yml b/.cirun.yml
index d261a6e502..313d3e315c 100644
--- a/.cirun.yml
+++ b/.cirun.yml
@@ -7,7 +7,7 @@ runners:
     # Instance Type has 4 vcpu, 16 GiB memory, Up to 5 Gbps Network Performance
     instance_type: t3a.xlarge
     # Custom AMI with docker is pre-installed
-    machine_image: ami-08939857cf6893cde
+    machine_image: ami-0ff297f01f579288c
     # Region: Oregon
     region: us-west-2
     # Path of the relevant workflow file
diff --git a/.github/workflows/kubernetes_test.yaml b/.github/workflows/kubernetes_test.yaml
index e5a46a7516..5bea5e702d 100644
--- a/.github/workflows/kubernetes_test.yaml
+++ b/.github/workflows/kubernetes_test.yaml
@@ -95,6 +95,7 @@ jobs:
           cd local-deployment
           qhub deploy --config qhub-config.yaml --disable-prompt
       - name: Basic kubectl checks after deployment
+        if: always()
         run: |
           kubectl get all,cm,secret,ing -A
       - name: Check github-actions.qhub.dev resolves
@@ -150,7 +151,10 @@ jobs:
       - name: Cleanup qhub deployment
         run: |
           cd local-deployment
-          qhub destroy --config qhub-config.yaml
+          # This is a known failure at the moment.
+          qhub destroy --config qhub-config.yaml || true
+
       - name: Basic kubectl checks after cleanup
+        if: always()
         run: |
           kubectl get all,cm,secret,ing -A
diff --git a/qhub/template/{{ cookiecutter.repo_directory }}/infrastructure/kubernetes.tf b/qhub/template/{{ cookiecutter.repo_directory }}/infrastructure/kubernetes.tf
index 3439caefb9..11c11296c4 100644
--- a/qhub/template/{{ cookiecutter.repo_directory }}/infrastructure/kubernetes.tf	
+++ b/qhub/template/{{ cookiecutter.repo_directory }}/infrastructure/kubernetes.tf	
@@ -310,6 +310,9 @@ module "qhub" {
   keycloak_password   = random_password.keycloak-qhub-bot-password.result
   keycloak_server_url = "http://keycloak-headless.${var.environment}:8080/auth/"
 
+  depends_on = [
+    module.kubernetes-initialization
+  ]
 }
 
 {% for helm_extension in cookiecutter.helm_extensions -%}
@@ -401,4 +404,7 @@ module "forwardauth" {
   jh-client-id      = local.forwardauth-keycloak-client-id
   jh-client-secret  = random_password.forwardauth-jhsecret.result
   callback-url-path = local.forwardauth-callback-url-path
+  depends_on = [
+    module.kubernetes-initialization
+  ]
 }