diff --git a/manifests/function/ingress/kustomization.yaml b/manifests/function/ingress/kustomization.yaml
index cf1390a86..6ec3ac5d9 100644
--- a/manifests/function/ingress/kustomization.yaml
+++ b/manifests/function/ingress/kustomization.yaml
@@ -2,3 +2,4 @@ resources:
   - helmrelease.yaml
   - helmrepository.yaml
   - namespace.yaml
+namespace: ingress
diff --git a/manifests/site/test-site/target/initinfra/kustomization.yaml b/manifests/site/test-site/target/initinfra/kustomization.yaml
index 5669403d8..ae76b9713 100644
--- a/manifests/site/test-site/target/initinfra/kustomization.yaml
+++ b/manifests/site/test-site/target/initinfra/kustomization.yaml
@@ -3,5 +3,4 @@ resources:
   - ../catalogues
 transformers:
   - ../../../../type/airship-core/target/initinfra/replacements
-  - ../../../../../../airshipctl/manifests/function/flux/source-controller/replacements
-  - ../../../../../../airshipctl/manifests/function/flux/helm-controller/replacements
+  - ../../../../../../airshipctl/manifests/composite/flux-helm/replacements
diff --git a/manifests/site/test-site/target/workers/kustomization.yaml b/manifests/site/test-site/target/workers/kustomization.yaml
index e168397b1..400284a42 100644
--- a/manifests/site/test-site/target/workers/kustomization.yaml
+++ b/manifests/site/test-site/target/workers/kustomization.yaml
@@ -1,4 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+  - ../catalogues
+  - ../../../../function/workers-capm3
   - nodes
+transformers:
+  - ../../../../function/workers-capm3/replacements
diff --git a/manifests/site/test-site/target/workers/nodes/kustomization.yaml b/manifests/site/test-site/target/workers/nodes/kustomization.yaml
index 512dc07c8..af9467527 100644
--- a/manifests/site/test-site/target/workers/nodes/kustomization.yaml
+++ b/manifests/site/test-site/target/workers/nodes/kustomization.yaml
@@ -5,4 +5,4 @@ generators:
   - ../hostgenerator
 
 commonLabels:
-  airshipit.org/k8s-role: controlplane-host
+  airshipit.org/k8s-role: worker
diff --git a/playbooks/airship-treasuremap-build-gate.yaml b/playbooks/airship-treasuremap-build-gate.yaml
index b9ce249f1..77a53931c 100644
--- a/playbooks/airship-treasuremap-build-gate.yaml
+++ b/playbooks/airship-treasuremap-build-gate.yaml
@@ -89,12 +89,12 @@
             ephemeral_vm_cfg: "{{ ephemeral_vm_cfg }}"
             ephemeral_vm_memory_mb: 6144
             ephemeral_vm_vcpus: 4
-            target_disk_size: 20G
+            target_disk_size: 25G
             target_vm_cfg: "{{ target_vm_cfg }}"
             target_vm_memory_mb: 7168
             target_vm_vcpus: 2
             target_vms_count: 1
-            worker_disk_size: 20G
+            worker_disk_size: 30G
             worker_vm_cfg: "{{ worker_vm_cfg }}"
             worker_vm_memory_mb: 7168
             worker_vm_vcpus: 2
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 473f96574..328580034 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -47,7 +47,7 @@
 - job:
     name: airship-treasuremap-deploy-test-site
     attempts: 1
-    timeout: 9500
+    timeout: 10800
     required-projects:
       - airship/airshipctl
     roles:
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 2d46bccff..54d44ff4f 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -14,7 +14,7 @@
     vars:
       # NOTE(drewwalters96): Set AIRSHIPCTL_REF to a commit SHA in order to pin
       # the cloned version of airshipctl to a known/compatible reference.
-      AIRSHIPCTL_REF: "e12b1e2fa639e02a54cb982d372dcdd8e3ee39de"
+      AIRSHIPCTL_REF: "c7d65d4114bf0f97bfbce3f02b6bf3d80d5ffe3e"
       sphinx_build_dir: docs/build
     check:
       jobs: