diff --git a/flux2/cluster/base/core.yaml b/flux2/cluster/base/core.yaml
index 8420863f265b788da90a4cb990b340098ab0a052..dd63077296f28daa3c917f4857fe0f98daa2eda0 100644
--- a/flux2/cluster/base/core.yaml
+++ b/flux2/cluster/base/core.yaml
@@ -8,6 +8,7 @@ spec:
   dependsOn:
     - name: infrastructure
   interval: 1h
+  timeout: 20m
   sourceRef:
     kind: GitRepository
     name: stackspin
diff --git a/flux2/cluster/base/infrastructure.yaml b/flux2/cluster/base/infrastructure.yaml
index bcd11891ab4a5429d88ed2a55be40292665cdb95..b52e9a870d0c12d4ac86ff9fcfddf3cc0cd53ea3 100644
--- a/flux2/cluster/base/infrastructure.yaml
+++ b/flux2/cluster/base/infrastructure.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 1h
+  timeout: 20m
   sourceRef:
     kind: GitRepository
     name: stackspin
diff --git a/flux2/cluster/optional/monitoring/monitoring-config.yaml b/flux2/cluster/optional/monitoring/monitoring-config.yaml
index 9952710d37e5cd607262f12bb9cdecaea0fe3514..7f6add7634a57a74262827b1e90f6603762140a3 100644
--- a/flux2/cluster/optional/monitoring/monitoring-config.yaml
+++ b/flux2/cluster/optional/monitoring/monitoring-config.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 1h
+  timeout: 20m
   dependsOn:
     - name: monitoring
   sourceRef:
diff --git a/flux2/cluster/optional/monitoring/monitoring.yaml b/flux2/cluster/optional/monitoring/monitoring.yaml
index 90e5f5b1e5724bbf6db5d694fe1a13492d326619..19b750de3943e0aa28368b202fb21dd5a0ae9350 100644
--- a/flux2/cluster/optional/monitoring/monitoring.yaml
+++ b/flux2/cluster/optional/monitoring/monitoring.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 1h
+  timeout: 20m
   dependsOn:
     - name: core
     - name: infrastructure
diff --git a/flux2/cluster/optional/nextcloud/nextcloud.yaml b/flux2/cluster/optional/nextcloud/nextcloud.yaml
index a8dc35479dc16bcfd1a3e15814c8fe19ab084fd4..72d189959fc53ea336c995927f2b83ff295ed38c 100644
--- a/flux2/cluster/optional/nextcloud/nextcloud.yaml
+++ b/flux2/cluster/optional/nextcloud/nextcloud.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 1h
+  timeout: 20m
   dependsOn:
     - name: core
     - name: infrastructure
diff --git a/flux2/cluster/optional/rocketchat/rocketchat.yaml b/flux2/cluster/optional/rocketchat/rocketchat.yaml
index 8e2924f24acdcee9acdfd7c414ba384bb376d33a..4599b34744eb9a913527a5c5bde2d7a3fbe3c8c2 100644
--- a/flux2/cluster/optional/rocketchat/rocketchat.yaml
+++ b/flux2/cluster/optional/rocketchat/rocketchat.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 1h
+  timeout: 20m
   dependsOn:
     - name: core
     - name: infrastructure
diff --git a/flux2/cluster/optional/velero/velero.yaml b/flux2/cluster/optional/velero/velero.yaml
index 1893f524e7268f1edafbec6625ecccece721ca5a..f01a68b6c1e9b7e9235e53c5c854cb70b34ea8f4 100644
--- a/flux2/cluster/optional/velero/velero.yaml
+++ b/flux2/cluster/optional/velero/velero.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 1h
+  timeout: 20m
   dependsOn:
     - name: core
     - name: infrastructure
diff --git a/flux2/cluster/optional/wekan/wekan.yaml b/flux2/cluster/optional/wekan/wekan.yaml
index c231ba7f3ed79763ef0349667f66ac96c0e5558c..566a4173b1a36a7791fa6bd2d42d58819be19426 100644
--- a/flux2/cluster/optional/wekan/wekan.yaml
+++ b/flux2/cluster/optional/wekan/wekan.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 1h
+  timeout: 20m
   dependsOn:
     - name: core
     - name: infrastructure
diff --git a/flux2/cluster/optional/wordpress/wordpress.yaml b/flux2/cluster/optional/wordpress/wordpress.yaml
index 54510a83cac42a7f9aa3698eb6c8b93a2158834e..f610f0078cdd24c5ee72af26f62b8f22462e6538 100644
--- a/flux2/cluster/optional/wordpress/wordpress.yaml
+++ b/flux2/cluster/optional/wordpress/wordpress.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 1h
+  timeout: 20m
   dependsOn:
     - name: core
     - name: infrastructure
diff --git a/flux2/cluster/optional/zulip/zulip.yaml b/flux2/cluster/optional/zulip/zulip.yaml
index 47bf28fa0077e5f8f70668fa2119678441f640a0..ae67f3ca34747170d10db09def3b70b4c9d085c2 100644
--- a/flux2/cluster/optional/zulip/zulip.yaml
+++ b/flux2/cluster/optional/zulip/zulip.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 1h
+  timeout: 20m
   dependsOn:
     - name: core
     - name: infrastructure