diff --git a/.taskfiles/Bootstrap/Taskfile.yaml b/.taskfiles/Bootstrap/Taskfile.yaml
index b041f730ad..d52ea020bd 100644
--- a/.taskfiles/Bootstrap/Taskfile.yaml
+++ b/.taskfiles/Bootstrap/Taskfile.yaml
@@ -36,7 +36,7 @@ tasks:
 
   deploy:
     desc: Deploy a cluster
-    cmd: bash infrastructur/setup/deploy-cluster.sh {{.cluster}}
+    cmd: bash infrastructure/setup/deploy-cluster.sh {{.cluster}}
     requires:
       vars:
         - cluster
diff --git a/kubernetes/main/apps/kustomization.yaml b/kubernetes/main/apps/kustomization.bootstrap
similarity index 67%
rename from kubernetes/main/apps/kustomization.yaml
rename to kubernetes/main/apps/kustomization.bootstrap
index 5231608dec..3b04fa8934 100644
--- a/kubernetes/main/apps/kustomization.yaml
+++ b/kubernetes/main/apps/kustomization.bootstrap
@@ -6,13 +6,12 @@ resources:
   - cert-manager
   - kube-system
   - flux-system
+  - networking
+  - security/namespace.yaml
+  - security/external-secrets/install.yaml
   # Step 2
-  # - networking
-  # - security/namespace.yaml
-  # - security/external-secrets/install.yaml
-  # Step 3
   # - system
-  # Step 4
+  # Step 3
   # - rook-ceph
-  # Step 5
+  # Step 4
   # - dbms
diff --git a/kubernetes/main/apps/rook-ceph/rook-ceph/install.yaml b/kubernetes/main/apps/rook-ceph/rook-ceph/install.yaml
index ddfddf75ee..c2ae03edf4 100644
--- a/kubernetes/main/apps/rook-ceph/rook-ceph/install.yaml
+++ b/kubernetes/main/apps/rook-ceph/rook-ceph/install.yaml
@@ -59,7 +59,7 @@ spec:
   wait: false
   interval: 30m
   retryInterval: 1m
-  timeout: 5m
+  timeout: 30m
 ---
 # yaml-language-server: $schema=https://kubernetes-schemas.zinn.ca/kustomize.toolkit.fluxcd.io/kustomization_v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
@@ -82,4 +82,4 @@ spec:
   wait: false
   interval: 30m
   retryInterval: 1m
-  timeout: 5m
+  timeout: 30m
diff --git a/kubernetes/main/cluster/apps.yaml b/kubernetes/main/cluster/apps.yaml
index b0276f1d75..16f43c5b94 100644
--- a/kubernetes/main/cluster/apps.yaml
+++ b/kubernetes/main/cluster/apps.yaml
@@ -12,7 +12,6 @@ spec:
     kind: GitRepository
     name: homelab-kubernetes
   interval: 10m
-  timeout: 5m
   decryption:
     provider: sops
     secretRef: