diff --git a/basic/clusters/production/gitea-kustomization.yaml b/basic/clusters/production/gitea-kustomization.yaml
index 73fc9d9abf4d013bdae2dacf89e0086df18113f8..64701a6238e2730de25c3401e202f013e2b312a2 100644
--- a/basic/clusters/production/gitea-kustomization.yaml
+++ b/basic/clusters/production/gitea-kustomization.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 5m
-  timeout: 30m
+  timeout: 12h
   dependsOn:
     - name: single-sign-on
   sourceRef:
@@ -14,8 +14,6 @@ spec:
     name: stackspout
   path: ./basic/apps/dev
   prune: true
-  # TODO what does this mean?
-  #validation: client
   healthChecks:
     - apiVersion: helm.toolkit.fluxcd.io/v2beta1
       kind: HelmRelease
@@ -23,6 +21,14 @@ spec:
       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:
diff --git a/basic/clusters/production/suitecrm-kustomization.yaml b/basic/clusters/production/suitecrm-kustomization.yaml
index 6509b9866008fefd1491dacfaf51b2d8c2eb60b1..0fb71a0c9aa8a56af24e37e4a0b67cb40f6a542b 100644
--- a/basic/clusters/production/suitecrm-kustomization.yaml
+++ b/basic/clusters/production/suitecrm-kustomization.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 5m
-  timeout: 30m
+  timeout: 12h
   dependsOn:
     - name: single-sign-on
   sourceRef:
@@ -14,8 +14,6 @@ spec:
     name: stackspout
   path: ./basic/apps/people
   prune: true
-  # TODO what does this mean?
-  #validation: client
   healthChecks:
     - apiVersion: helm.toolkit.fluxcd.io/v2beta1
       kind: HelmRelease
@@ -25,13 +23,15 @@ spec:
       kind: Deployment
       name: suitecrm
       namespace: stackspout
+    - apiVersion: apps/v1
+      kind: StatefulSet
+      name: suitecrm-mariadb
+      namespace: stackspout
   postBuild:
     substituteFrom:
-      - kind: Secret
-        name: stackspin-suitecrm-variables
-        optional: true
-      - kind: Secret
-        name: stackspin-suitecrm-oauth-variables
-        optional: true
+      #- kind: Secret
+      #  name: stackspin-suitecrm-variables
+      #- kind: Secret
+      #  name: stackspin-suitecrm-oauth-variables
       - kind: Secret
         name: stackspin-cluster-variables
diff --git a/basic/clusters/production/vikunja-kustomization.yaml b/basic/clusters/production/vikunja-kustomization.yaml
index a1db9673ec0af444b17e9d61727259853ccc328b..63571273e3f937a3ffde38f8a682c2bc59c971da 100644
--- a/basic/clusters/production/vikunja-kustomization.yaml
+++ b/basic/clusters/production/vikunja-kustomization.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 5m
-  timeout: 30m
+  timeout: 12h
   dependsOn:
     - name: single-sign-on
   sourceRef:
@@ -14,8 +14,6 @@ spec:
     name: stackspout
   path: ./basic/apps/do
   prune: true
-  # TODO what does this mean?
-  #validation: client
   healthChecks:
     - apiVersion: helm.toolkit.fluxcd.io/v2beta1
       kind: HelmRelease
@@ -25,6 +23,10 @@ spec:
       kind: Deployment
       name: vikunja
       namespace: stackspout
+    - apiVersion: apps/v1
+      kind: StatefulSet
+      name: gitea
+      namespace: stackspout
   postBuild:
     substituteFrom:
       #- kind: Secret