diff --git a/.lighthouse/jenkins-x/bdd/terraform-tls.yaml.gotmpl b/.lighthouse/jenkins-x/bdd/terraform-tls.yaml.gotmpl
index 14d0670d3..3ec4901ee 100644
--- a/.lighthouse/jenkins-x/bdd/terraform-tls.yaml.gotmpl
+++ b/.lighthouse/jenkins-x/bdd/terraform-tls.yaml.gotmpl
@@ -6,6 +6,10 @@ spec:
     value: "/tmp/kubecfg"
   - name: TF_VAR_jx_git_url
     value: https://github.com/jenkins-x-bdd/cluster-{{ .Env.TF_VAR_cluster_name }}-dev.git
+  - name: TF_VAR_node_spot
+    value: "true"
+  - name: TF_VAR_kuberhealthy
+    value: "false"
   - name: TF_VAR_jx_bot_username
     value: jenkins-x-bot-bdd
   - name: TF_VAR_jx_bot_token
@@ -61,9 +65,9 @@ spec:
     echo "Removing kubernetes resources from state"
     terraform state rm 'module.jx.module.cluster.helm_release.jx-git-operator[0]'
     terraform state rm 'module.jx.module.cluster.kubernetes_config_map.jenkins_x_requirements[0]'
-    terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.cluster-checks'
-    terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.health-checks-install'
-    terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.kuberhealthy'
+    terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.cluster-checks' || echo "Resource does not exist"
+    terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.health-checks-install' || echo "Resource does not exist"
+    terraform state rm 'module.jx.module.cluster.module.jx-health[0].helm_release.kuberhealthy' || echo "Resource does not exist"
 
     echo "lets connect to the remote cluster"
     $(terraform output -raw connect)
diff --git a/.lighthouse/jenkins-x/bdd/terraform.yaml.gotmpl b/.lighthouse/jenkins-x/bdd/terraform.yaml.gotmpl
index a57068fbc..077f83cc2 100644
--- a/.lighthouse/jenkins-x/bdd/terraform.yaml.gotmpl
+++ b/.lighthouse/jenkins-x/bdd/terraform.yaml.gotmpl
@@ -82,7 +82,7 @@ spec:
 
     echo "lets verify the log completes"
     jx admin log -b
-    
+
     echo "installing the BDD test"
     export GIT_ORGANISATION="jenkins-x-bdd"
     export TEST_NAME="test-create-spring"
diff --git a/.lighthouse/jenkins-x/pullrequest.yaml b/.lighthouse/jenkins-x/pullrequest.yaml
index 686023d9e..0a0026953 100755
--- a/.lighthouse/jenkins-x/pullrequest.yaml
+++ b/.lighthouse/jenkins-x/pullrequest.yaml
@@ -48,5 +48,5 @@ spec:
               name: podinfo
   podTemplate: {}
   serviceAccountName: bdd-bot
-  timeout: 240h0m0s
+  timeout: 2h0m0s
 status: {}
diff --git a/.lighthouse/jenkins-x/triggers.yaml b/.lighthouse/jenkins-x/triggers.yaml
index 194edf647..33ea33933 100644
--- a/.lighthouse/jenkins-x/triggers.yaml
+++ b/.lighthouse/jenkins-x/triggers.yaml
@@ -46,7 +46,7 @@ spec:
     source: "pullrequest-gitea.yaml"
   - name: gsm
     context: "gsm"
-    always_run: true
+    always_run: false
     optional: false
     trigger: (?m)^/test( all| gsm),?(s+|$)
     rerun_command: /test gsm
@@ -81,7 +81,7 @@ spec:
     source: "pullrequest.yaml"
   - name: tls
     context: "tls"
-    always_run: false
+    always_run: true
     optional: false
     trigger: (?m)^/test( all| tls),?(s+|$)
     rerun_command: /test tls
diff --git a/charts/jxgh/acme-jx/defaults.yaml b/charts/jxgh/acme-jx/defaults.yaml
index d92d6213b..11320d2ba 100644
--- a/charts/jxgh/acme-jx/defaults.yaml
+++ b/charts/jxgh/acme-jx/defaults.yaml
@@ -1,3 +1,3 @@
 gitUrl: https://github.com/jenkins-x/acme
-version: 0.0.24
+version: 0.0.26
 namespace: jx
\ No newline at end of file
diff --git a/src/Makefile.mk b/src/Makefile.mk
index d6e1a30da..29d51f382 100644
--- a/src/Makefile.mk
+++ b/src/Makefile.mk
@@ -288,10 +288,9 @@ kubectl-apply:
 	@echo "using kubectl to apply resources"
 
 # NOTE be very careful about these 2 labels as getting them wrong can remove stuff in you cluster!
-	kubectl apply $(KUBECTL_APPLY_FLAGS) --prune -l=gitops.jenkins-x.io/pipeline=customresourcedefinitions -R -f $(OUTPUT_DIR)/customresourcedefinitions
 	kubectl apply $(KUBECTL_APPLY_FLAGS) --prune -l=gitops.jenkins-x.io/pipeline=cluster                   -R -f $(OUTPUT_DIR)/cluster
 	kubectl apply $(KUBECTL_APPLY_FLAGS) --prune -l=gitops.jenkins-x.io/pipeline=namespaces                -R -f $(OUTPUT_DIR)/namespaces
-
+	kubectl apply $(KUBECTL_APPLY_FLAGS) --prune -l=gitops.jenkins-x.io/pipeline=customresourcedefinitions -R -f $(OUTPUT_DIR)/customresourcedefinitions
 # lets apply any infrastructure specific labels or annotations to enable IAM roles on ServiceAccounts etc
 	jx gitops postprocess