diff --git a/basic/clusters/production/gitea-kustomization.yaml b/basic/clusters/production/gitea-kustomization.yaml
index 64701a6238e2730de25c3401e202f013e2b312a2..19ed63119c5612147b692123518ff80688dc6fc6 100644
--- a/basic/clusters/production/gitea-kustomization.yaml
+++ b/basic/clusters/production/gitea-kustomization.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 5m
+  wait: true
   timeout: 12h
   dependsOn:
     - name: single-sign-on
@@ -14,23 +15,23 @@ spec:
     name: stackspout
   path: ./basic/apps/dev
   prune: true
-  healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
-      kind: HelmRelease
-      name: gitea
-      namespace: stackspout
-    - apiVersion: apps/v1
-      kind: Deployment
-      name: gitea-memcached
-      namespace: stackspout
-    - apiVersion: apps/v1
-      kind: StatefulSet
-      name: gitea-postgresql
-      namespace: stackspout
-    - apiVersion: apps/v1
-      kind: StatefulSet
-      name: gitea
-      namespace: stackspout
+  #healthChecks:
+  #  - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  #    kind: HelmRelease
+  #    name: gitea
+  #    namespace: stackspout
+  #  - apiVersion: apps/v1
+  #    kind: Deployment
+  #    name: gitea-memcached
+  #    namespace: stackspout
+  #  - apiVersion: apps/v1
+  #    kind: StatefulSet
+  #    name: gitea-postgresql
+  #    namespace: stackspout
+  #  - apiVersion: apps/v1
+  #    kind: StatefulSet
+  #    name: gitea
+  #    namespace: stackspout
   postBuild:
     substituteFrom:
       #- kind: Secret
diff --git a/basic/clusters/production/suitecrm-kustomization.yaml b/basic/clusters/production/suitecrm-kustomization.yaml
index 0fb71a0c9aa8a56af24e37e4a0b67cb40f6a542b..b52358309176dcdfd9a39a291bbdfd6da6e739e9 100644
--- a/basic/clusters/production/suitecrm-kustomization.yaml
+++ b/basic/clusters/production/suitecrm-kustomization.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 5m
+  wait: true
   timeout: 12h
   dependsOn:
     - name: single-sign-on
@@ -14,19 +15,19 @@ spec:
     name: stackspout
   path: ./basic/apps/people
   prune: true
-  healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
-      kind: HelmRelease
-      name: suitecrm
-      namespace: stackspout
-    - apiVersion: apps/v1
-      kind: Deployment
-      name: suitecrm
-      namespace: stackspout
-    - apiVersion: apps/v1
-      kind: StatefulSet
-      name: suitecrm-mariadb
-      namespace: stackspout
+  #healthChecks:
+  #  - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  #    kind: HelmRelease
+  #    name: suitecrm
+  #    namespace: stackspout
+  #    #- apiVersion: apps/v1
+  #    #  kind: Deployment
+  #    #  name: suitecrm
+  #    #  namespace: stackspout
+  #  - apiVersion: apps/v1
+  #    kind: StatefulSet
+  #    name: suitecrm-mariadb
+  #    namespace: stackspout
   postBuild:
     substituteFrom:
       #- kind: Secret
diff --git a/basic/clusters/production/vikunja-kustomization.yaml b/basic/clusters/production/vikunja-kustomization.yaml
index 63571273e3f937a3ffde38f8a682c2bc59c971da..3493ad5172e3c6445621ba1a26b7fd542b15cd0b 100644
--- a/basic/clusters/production/vikunja-kustomization.yaml
+++ b/basic/clusters/production/vikunja-kustomization.yaml
@@ -6,7 +6,8 @@ metadata:
   namespace: flux-system
 spec:
   interval: 5m
-  timeout: 12h
+  wait: true
+  timeout: 300m
   dependsOn:
     - name: single-sign-on
   sourceRef:
@@ -14,19 +15,19 @@ spec:
     name: stackspout
   path: ./basic/apps/do
   prune: true
-  healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
-      kind: HelmRelease
-      name: vikunja
-      namespace: stackspout
-    - apiVersion: apps/v1
-      kind: Deployment
-      name: vikunja
-      namespace: stackspout
-    - apiVersion: apps/v1
-      kind: StatefulSet
-      name: gitea
-      namespace: stackspout
+  #healthChecks:
+  #  - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  #    kind: HelmRelease
+  #    name: vikunja
+  #    namespace: stackspout
+  #  - apiVersion: apps/v1
+  #    kind: Deployment
+  #    name: vikunja
+  #    namespace: stackspout
+  #  - apiVersion: apps/v1
+  #    kind: StatefulSet
+  #    name: gitea
+  #    namespace: stackspout
   postBuild:
     substituteFrom:
       #- kind: Secret