diff --git a/playbooks/airship-treasuremap-build-gate.yaml b/playbooks/airship-treasuremap-build-gate.yaml
index 77a53931c..064703193 100644
--- a/playbooks/airship-treasuremap-build-gate.yaml
+++ b/playbooks/airship-treasuremap-build-gate.yaml
@@ -39,7 +39,7 @@
     - name: install airshipctl
       shell: |
         cd {{ local_src_dir | default(zuul.project.src_dir) }}
-        ./tools/deployment/21_systemwide_executable.sh
+        ./tools/deployment/common/21_systemwide_executable.sh
     - name: make sure serve directory exists
       file:
         dest: "{{ serve_dir }}"
diff --git a/playbooks/airship-treasuremap-gate-runner.yaml b/playbooks/airship-treasuremap-gate-runner.yaml
index fef415524..0e54e3e3b 100644
--- a/playbooks/airship-treasuremap-gate-runner.yaml
+++ b/playbooks/airship-treasuremap-gate-runner.yaml
@@ -20,19 +20,19 @@
     - name: "set default gate scripts"
       set_fact:
         gate_scripts_default:
-          - ./tools/deployment/01_install_essentials.sh
-          - ./tools/deployment/22_test_configs.sh
-          - ./tools/deployment/23_pull_documents.sh
-          - ./tools/deployment/23_generate_secrets.sh
-          - ./tools/deployment/24_build_images.sh
-          - ./tools/deployment/25_deploy_ephemeral_node.sh
-          - ./tools/deployment/26_deploy_capi_ephemeral_node.sh
-          - ./tools/deployment/30_deploy_controlplane.sh
-          - ./tools/deployment/31_deploy_initinfra_target_node.sh
-          - ./tools/deployment/32_cluster_init_target_node.sh
-          - ./tools/deployment/33_cluster_move_target_node.sh
-          - ./tools/deployment/35_deploy_worker_node.sh
-          - ./tools/deployment/36_deploy_workload.sh
+          - ./tools/deployment/airship-core/01_install_essentials.sh
+          - ./tools/deployment/airship-core/22_test_configs.sh
+          - ./tools/deployment/airship-core/23_pull_documents.sh
+          - ./tools/deployment/airship-core/23_generate_secrets.sh
+          - ./tools/deployment/airship-core/24_build_images.sh
+          - ./tools/deployment/airship-core/25_deploy_ephemeral_node.sh
+          - ./tools/deployment/airship-core/26_deploy_capi_ephemeral_node.sh
+          - ./tools/deployment/airship-core/30_deploy_controlplane.sh
+          - ./tools/deployment/airship-core/31_deploy_initinfra_target_node.sh
+          - ./tools/deployment/airship-core/32_cluster_init_target_node.sh
+          - ./tools/deployment/airship-core/33_cluster_move_target_node.sh
+          - ./tools/deployment/airship-core/35_deploy_worker_node.sh
+          - ./tools/deployment/airship-core/36_deploy_workload.sh
 
     - name: "Run gate scripts"
       include_role:
diff --git a/tools/deployment/airship-core/01_install_essentials.sh b/tools/deployment/airship-core/01_install_essentials.sh
new file mode 120000
index 000000000..97d7dc5b2
--- /dev/null
+++ b/tools/deployment/airship-core/01_install_essentials.sh
@@ -0,0 +1 @@
+../common/01_install_essentials.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/02_install_calicoctl.sh b/tools/deployment/airship-core/02_install_calicoctl.sh
new file mode 120000
index 000000000..acd022688
--- /dev/null
+++ b/tools/deployment/airship-core/02_install_calicoctl.sh
@@ -0,0 +1 @@
+../common/02_install_calicoctl.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/21_systemwide_executable.sh b/tools/deployment/airship-core/21_systemwide_executable.sh
new file mode 120000
index 000000000..fbf43b837
--- /dev/null
+++ b/tools/deployment/airship-core/21_systemwide_executable.sh
@@ -0,0 +1 @@
+../common/21_systemwide_executable.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/22_test_configs.sh b/tools/deployment/airship-core/22_test_configs.sh
new file mode 120000
index 000000000..2b1194ea1
--- /dev/null
+++ b/tools/deployment/airship-core/22_test_configs.sh
@@ -0,0 +1 @@
+../common/22_test_configs.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/23_generate_secrets.sh b/tools/deployment/airship-core/23_generate_secrets.sh
new file mode 120000
index 000000000..690265938
--- /dev/null
+++ b/tools/deployment/airship-core/23_generate_secrets.sh
@@ -0,0 +1 @@
+../common/23_generate_secrets.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/23_pull_documents.sh b/tools/deployment/airship-core/23_pull_documents.sh
new file mode 120000
index 000000000..afb20a44f
--- /dev/null
+++ b/tools/deployment/airship-core/23_pull_documents.sh
@@ -0,0 +1 @@
+../common/23_pull_documents.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/24_build_images.sh b/tools/deployment/airship-core/24_build_images.sh
new file mode 120000
index 000000000..ab67c1772
--- /dev/null
+++ b/tools/deployment/airship-core/24_build_images.sh
@@ -0,0 +1 @@
+../common/24_build_images.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/25_deploy_ephemeral_node.sh b/tools/deployment/airship-core/25_deploy_ephemeral_node.sh
new file mode 120000
index 000000000..ea3301727
--- /dev/null
+++ b/tools/deployment/airship-core/25_deploy_ephemeral_node.sh
@@ -0,0 +1 @@
+../common/25_deploy_ephemeral_node.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/26_deploy_capi_ephemeral_node.sh b/tools/deployment/airship-core/26_deploy_capi_ephemeral_node.sh
new file mode 120000
index 000000000..787d3de94
--- /dev/null
+++ b/tools/deployment/airship-core/26_deploy_capi_ephemeral_node.sh
@@ -0,0 +1 @@
+../common/26_deploy_capi_ephemeral_node.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/30_deploy_controlplane.sh b/tools/deployment/airship-core/30_deploy_controlplane.sh
new file mode 120000
index 000000000..3c196bd80
--- /dev/null
+++ b/tools/deployment/airship-core/30_deploy_controlplane.sh
@@ -0,0 +1 @@
+../common/30_deploy_controlplane.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/31_deploy_initinfra_target_node.sh b/tools/deployment/airship-core/31_deploy_initinfra_target_node.sh
new file mode 120000
index 000000000..6d96ef432
--- /dev/null
+++ b/tools/deployment/airship-core/31_deploy_initinfra_target_node.sh
@@ -0,0 +1 @@
+../common/31_deploy_initinfra_target_node.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/32_cluster_init_target_node.sh b/tools/deployment/airship-core/32_cluster_init_target_node.sh
new file mode 120000
index 000000000..4cefb277d
--- /dev/null
+++ b/tools/deployment/airship-core/32_cluster_init_target_node.sh
@@ -0,0 +1 @@
+../common/32_cluster_init_target_node.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/33_cluster_move_target_node.sh b/tools/deployment/airship-core/33_cluster_move_target_node.sh
new file mode 120000
index 000000000..05c452bc2
--- /dev/null
+++ b/tools/deployment/airship-core/33_cluster_move_target_node.sh
@@ -0,0 +1 @@
+../common/33_cluster_move_target_node.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/34_deploy_controlplane_target.sh b/tools/deployment/airship-core/34_deploy_controlplane_target.sh
new file mode 120000
index 000000000..38a3ae942
--- /dev/null
+++ b/tools/deployment/airship-core/34_deploy_controlplane_target.sh
@@ -0,0 +1 @@
+../common/34_deploy_controlplane_target.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/35_deploy_worker_node.sh b/tools/deployment/airship-core/35_deploy_worker_node.sh
new file mode 120000
index 000000000..a9fabf211
--- /dev/null
+++ b/tools/deployment/airship-core/35_deploy_worker_node.sh
@@ -0,0 +1 @@
+../common/35_deploy_worker_node.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/36_deploy_workload.sh b/tools/deployment/airship-core/36_deploy_workload.sh
new file mode 120000
index 000000000..3c61c979d
--- /dev/null
+++ b/tools/deployment/airship-core/36_deploy_workload.sh
@@ -0,0 +1 @@
+../common/36_deploy_workload.sh
\ No newline at end of file
diff --git a/tools/deployment/airship-core/37_verify_hwcc_profiles.sh b/tools/deployment/airship-core/37_verify_hwcc_profiles.sh
new file mode 120000
index 000000000..e8410dc5c
--- /dev/null
+++ b/tools/deployment/airship-core/37_verify_hwcc_profiles.sh
@@ -0,0 +1 @@
+../common/37_verify_hwcc_profiles.sh
\ No newline at end of file
diff --git a/tools/deployment/40_deploy_lma.sh b/tools/deployment/airship-core/40_deploy_lma.sh
similarity index 99%
rename from tools/deployment/40_deploy_lma.sh
rename to tools/deployment/airship-core/40_deploy_lma.sh
index 3054c57f9..e224207ea 100755
--- a/tools/deployment/40_deploy_lma.sh
+++ b/tools/deployment/airship-core/40_deploy_lma.sh
@@ -18,4 +18,3 @@ echo "Deploying LMA stack"
 airshipctl phase run --debug lma-infra
 airshipctl phase run --debug lma-stack
 airshipctl phase run --debug lma-configs
-
diff --git a/tools/deployment/airship-core/40_deploy_network_policies.sh b/tools/deployment/airship-core/40_deploy_network_policies.sh
new file mode 120000
index 000000000..039e8b862
--- /dev/null
+++ b/tools/deployment/airship-core/40_deploy_network_policies.sh
@@ -0,0 +1 @@
+../common/40_deploy_network_policies.sh
\ No newline at end of file
diff --git a/tools/deployment/01_install_essentials.sh b/tools/deployment/common/01_install_essentials.sh
similarity index 100%
rename from tools/deployment/01_install_essentials.sh
rename to tools/deployment/common/01_install_essentials.sh
diff --git a/tools/deployment/02_install_calicoctl.sh b/tools/deployment/common/02_install_calicoctl.sh
similarity index 100%
rename from tools/deployment/02_install_calicoctl.sh
rename to tools/deployment/common/02_install_calicoctl.sh
diff --git a/tools/deployment/21_systemwide_executable.sh b/tools/deployment/common/21_systemwide_executable.sh
similarity index 100%
rename from tools/deployment/21_systemwide_executable.sh
rename to tools/deployment/common/21_systemwide_executable.sh
diff --git a/tools/deployment/22_test_configs.sh b/tools/deployment/common/22_test_configs.sh
similarity index 100%
rename from tools/deployment/22_test_configs.sh
rename to tools/deployment/common/22_test_configs.sh
diff --git a/tools/deployment/23_generate_secrets.sh b/tools/deployment/common/23_generate_secrets.sh
similarity index 100%
rename from tools/deployment/23_generate_secrets.sh
rename to tools/deployment/common/23_generate_secrets.sh
diff --git a/tools/deployment/23_pull_documents.sh b/tools/deployment/common/23_pull_documents.sh
similarity index 100%
rename from tools/deployment/23_pull_documents.sh
rename to tools/deployment/common/23_pull_documents.sh
diff --git a/tools/deployment/24_build_images.sh b/tools/deployment/common/24_build_images.sh
similarity index 100%
rename from tools/deployment/24_build_images.sh
rename to tools/deployment/common/24_build_images.sh
diff --git a/tools/deployment/25_deploy_ephemeral_node.sh b/tools/deployment/common/25_deploy_ephemeral_node.sh
similarity index 100%
rename from tools/deployment/25_deploy_ephemeral_node.sh
rename to tools/deployment/common/25_deploy_ephemeral_node.sh
diff --git a/tools/deployment/26_deploy_capi_ephemeral_node.sh b/tools/deployment/common/26_deploy_capi_ephemeral_node.sh
similarity index 100%
rename from tools/deployment/26_deploy_capi_ephemeral_node.sh
rename to tools/deployment/common/26_deploy_capi_ephemeral_node.sh
diff --git a/tools/deployment/30_deploy_controlplane.sh b/tools/deployment/common/30_deploy_controlplane.sh
similarity index 100%
rename from tools/deployment/30_deploy_controlplane.sh
rename to tools/deployment/common/30_deploy_controlplane.sh
diff --git a/tools/deployment/31_deploy_initinfra_target_node.sh b/tools/deployment/common/31_deploy_initinfra_target_node.sh
similarity index 100%
rename from tools/deployment/31_deploy_initinfra_target_node.sh
rename to tools/deployment/common/31_deploy_initinfra_target_node.sh
diff --git a/tools/deployment/32_cluster_init_target_node.sh b/tools/deployment/common/32_cluster_init_target_node.sh
similarity index 100%
rename from tools/deployment/32_cluster_init_target_node.sh
rename to tools/deployment/common/32_cluster_init_target_node.sh
diff --git a/tools/deployment/33_cluster_move_target_node.sh b/tools/deployment/common/33_cluster_move_target_node.sh
similarity index 100%
rename from tools/deployment/33_cluster_move_target_node.sh
rename to tools/deployment/common/33_cluster_move_target_node.sh
diff --git a/tools/deployment/34_deploy_controlplane_target.sh b/tools/deployment/common/34_deploy_controlplane_target.sh
similarity index 100%
rename from tools/deployment/34_deploy_controlplane_target.sh
rename to tools/deployment/common/34_deploy_controlplane_target.sh
diff --git a/tools/deployment/35_deploy_worker_node.sh b/tools/deployment/common/35_deploy_worker_node.sh
similarity index 100%
rename from tools/deployment/35_deploy_worker_node.sh
rename to tools/deployment/common/35_deploy_worker_node.sh
diff --git a/tools/deployment/36_deploy_workload.sh b/tools/deployment/common/36_deploy_workload.sh
similarity index 100%
rename from tools/deployment/36_deploy_workload.sh
rename to tools/deployment/common/36_deploy_workload.sh
diff --git a/tools/deployment/37_verify_hwcc_profiles.sh b/tools/deployment/common/37_verify_hwcc_profiles.sh
similarity index 100%
rename from tools/deployment/37_verify_hwcc_profiles.sh
rename to tools/deployment/common/37_verify_hwcc_profiles.sh
diff --git a/tools/deployment/40_deploy_network_policies.sh b/tools/deployment/common/40_deploy_network_policies.sh
similarity index 100%
rename from tools/deployment/40_deploy_network_policies.sh
rename to tools/deployment/common/40_deploy_network_policies.sh
diff --git a/tools/deployment/multi-tenant/01_install_essentials.sh b/tools/deployment/multi-tenant/01_install_essentials.sh
new file mode 120000
index 000000000..97d7dc5b2
--- /dev/null
+++ b/tools/deployment/multi-tenant/01_install_essentials.sh
@@ -0,0 +1 @@
+../common/01_install_essentials.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/02_install_calicoctl.sh b/tools/deployment/multi-tenant/02_install_calicoctl.sh
new file mode 120000
index 000000000..acd022688
--- /dev/null
+++ b/tools/deployment/multi-tenant/02_install_calicoctl.sh
@@ -0,0 +1 @@
+../common/02_install_calicoctl.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/21_systemwide_executable.sh b/tools/deployment/multi-tenant/21_systemwide_executable.sh
new file mode 120000
index 000000000..fbf43b837
--- /dev/null
+++ b/tools/deployment/multi-tenant/21_systemwide_executable.sh
@@ -0,0 +1 @@
+../common/21_systemwide_executable.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/22_test_configs.sh b/tools/deployment/multi-tenant/22_test_configs.sh
new file mode 120000
index 000000000..2b1194ea1
--- /dev/null
+++ b/tools/deployment/multi-tenant/22_test_configs.sh
@@ -0,0 +1 @@
+../common/22_test_configs.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/23_generate_secrets.sh b/tools/deployment/multi-tenant/23_generate_secrets.sh
new file mode 120000
index 000000000..690265938
--- /dev/null
+++ b/tools/deployment/multi-tenant/23_generate_secrets.sh
@@ -0,0 +1 @@
+../common/23_generate_secrets.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/23_pull_documents.sh b/tools/deployment/multi-tenant/23_pull_documents.sh
new file mode 120000
index 000000000..afb20a44f
--- /dev/null
+++ b/tools/deployment/multi-tenant/23_pull_documents.sh
@@ -0,0 +1 @@
+../common/23_pull_documents.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/24_build_images.sh b/tools/deployment/multi-tenant/24_build_images.sh
new file mode 120000
index 000000000..ab67c1772
--- /dev/null
+++ b/tools/deployment/multi-tenant/24_build_images.sh
@@ -0,0 +1 @@
+../common/24_build_images.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/25_deploy_ephemeral_node.sh b/tools/deployment/multi-tenant/25_deploy_ephemeral_node.sh
new file mode 120000
index 000000000..ea3301727
--- /dev/null
+++ b/tools/deployment/multi-tenant/25_deploy_ephemeral_node.sh
@@ -0,0 +1 @@
+../common/25_deploy_ephemeral_node.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/26_deploy_capi_ephemeral_node.sh b/tools/deployment/multi-tenant/26_deploy_capi_ephemeral_node.sh
new file mode 120000
index 000000000..787d3de94
--- /dev/null
+++ b/tools/deployment/multi-tenant/26_deploy_capi_ephemeral_node.sh
@@ -0,0 +1 @@
+../common/26_deploy_capi_ephemeral_node.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/30_deploy_controlplane.sh b/tools/deployment/multi-tenant/30_deploy_controlplane.sh
new file mode 120000
index 000000000..3c196bd80
--- /dev/null
+++ b/tools/deployment/multi-tenant/30_deploy_controlplane.sh
@@ -0,0 +1 @@
+../common/30_deploy_controlplane.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/31_deploy_initinfra_target_node.sh b/tools/deployment/multi-tenant/31_deploy_initinfra_target_node.sh
new file mode 120000
index 000000000..6d96ef432
--- /dev/null
+++ b/tools/deployment/multi-tenant/31_deploy_initinfra_target_node.sh
@@ -0,0 +1 @@
+../common/31_deploy_initinfra_target_node.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/32_cluster_init_target_node.sh b/tools/deployment/multi-tenant/32_cluster_init_target_node.sh
new file mode 120000
index 000000000..4cefb277d
--- /dev/null
+++ b/tools/deployment/multi-tenant/32_cluster_init_target_node.sh
@@ -0,0 +1 @@
+../common/32_cluster_init_target_node.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/33_cluster_move_target_node.sh b/tools/deployment/multi-tenant/33_cluster_move_target_node.sh
new file mode 120000
index 000000000..05c452bc2
--- /dev/null
+++ b/tools/deployment/multi-tenant/33_cluster_move_target_node.sh
@@ -0,0 +1 @@
+../common/33_cluster_move_target_node.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/34_deploy_controlplane_target.sh b/tools/deployment/multi-tenant/34_deploy_controlplane_target.sh
new file mode 120000
index 000000000..38a3ae942
--- /dev/null
+++ b/tools/deployment/multi-tenant/34_deploy_controlplane_target.sh
@@ -0,0 +1 @@
+../common/34_deploy_controlplane_target.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/35_deploy_worker_node.sh b/tools/deployment/multi-tenant/35_deploy_worker_node.sh
new file mode 120000
index 000000000..a9fabf211
--- /dev/null
+++ b/tools/deployment/multi-tenant/35_deploy_worker_node.sh
@@ -0,0 +1 @@
+../common/35_deploy_worker_node.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/36_deploy_workload.sh b/tools/deployment/multi-tenant/36_deploy_workload.sh
new file mode 120000
index 000000000..3c61c979d
--- /dev/null
+++ b/tools/deployment/multi-tenant/36_deploy_workload.sh
@@ -0,0 +1 @@
+../common/36_deploy_workload.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/37_verify_hwcc_profiles.sh b/tools/deployment/multi-tenant/37_verify_hwcc_profiles.sh
new file mode 120000
index 000000000..e8410dc5c
--- /dev/null
+++ b/tools/deployment/multi-tenant/37_verify_hwcc_profiles.sh
@@ -0,0 +1 @@
+../common/37_verify_hwcc_profiles.sh
\ No newline at end of file
diff --git a/tools/deployment/multi-tenant/40_deploy_network_policies.sh b/tools/deployment/multi-tenant/40_deploy_network_policies.sh
new file mode 120000
index 000000000..039e8b862
--- /dev/null
+++ b/tools/deployment/multi-tenant/40_deploy_network_policies.sh
@@ -0,0 +1 @@
+../common/40_deploy_network_policies.sh
\ No newline at end of file
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 328580034..e425f3910 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -27,10 +27,10 @@
     nodeset: airship-treasuremap-single-node
     vars:
       gate_scripts:
-        - ./tools/deployment/01_install_essentials.sh
-        - ./tools/deployment/21_systemwide_executable.sh
-        - ./tools/deployment/22_test_configs.sh
-        - ./tools/deployment/23_pull_documents.sh
+        - ./tools/deployment/common/01_install_essentials.sh
+        - ./tools/deployment/common/21_systemwide_executable.sh
+        - ./tools/deployment/common/22_test_configs.sh
+        - ./tools/deployment/common/23_pull_documents.sh
         - ./tools/validate_docs
 
 - job:
@@ -70,19 +70,19 @@
     vars:
       site_name: test-site
       gate_scripts:
-        - ./tools/deployment/01_install_essentials.sh
-        - ./tools/deployment/22_test_configs.sh
-        - ./tools/deployment/23_pull_documents.sh
-        - ./tools/deployment/23_generate_secrets.sh
-        - ./tools/deployment/24_build_images.sh
-        - ./tools/deployment/25_deploy_ephemeral_node.sh
-        - ./tools/deployment/26_deploy_capi_ephemeral_node.sh
-        - ./tools/deployment/30_deploy_controlplane.sh
-        - ./tools/deployment/31_deploy_initinfra_target_node.sh
-        - ./tools/deployment/32_cluster_init_target_node.sh
-        - ./tools/deployment/33_cluster_move_target_node.sh
-        - ./tools/deployment/35_deploy_worker_node.sh
-        - ./tools/deployment/36_deploy_workload.sh
+        - ./tools/deployment/airship-core/01_install_essentials.sh
+        - ./tools/deployment/airship-core/22_test_configs.sh
+        - ./tools/deployment/airship-core/23_pull_documents.sh
+        - ./tools/deployment/airship-core/23_generate_secrets.sh
+        - ./tools/deployment/airship-core/24_build_images.sh
+        - ./tools/deployment/airship-core/25_deploy_ephemeral_node.sh
+        - ./tools/deployment/airship-core/26_deploy_capi_ephemeral_node.sh
+        - ./tools/deployment/airship-core/30_deploy_controlplane.sh
+        - ./tools/deployment/airship-core/31_deploy_initinfra_target_node.sh
+        - ./tools/deployment/airship-core/32_cluster_init_target_node.sh
+        - ./tools/deployment/airship-core/33_cluster_move_target_node.sh
+        - ./tools/deployment/airship-core/35_deploy_worker_node.sh
+        - ./tools/deployment/airship-core/36_deploy_workload.sh
       serve_dir: /srv/images
       serve_port: 8099
     voting: true
@@ -92,6 +92,20 @@
     parent: airship-treasuremap-deploy-test-site
     vars:
       site_name: virtual-network-cloud
+      gate_scripts:
+        - ./tools/deployment/multi-tenant/01_install_essentials.sh
+        - ./tools/deployment/multi-tenant/22_test_configs.sh
+        - ./tools/deployment/multi-tenant/23_pull_documents.sh
+        - ./tools/deployment/multi-tenant/23_generate_secrets.sh
+        - ./tools/deployment/multi-tenant/24_build_images.sh
+        - ./tools/deployment/multi-tenant/25_deploy_ephemeral_node.sh
+        - ./tools/deployment/multi-tenant/26_deploy_capi_ephemeral_node.sh
+        - ./tools/deployment/multi-tenant/30_deploy_controlplane.sh
+        - ./tools/deployment/multi-tenant/31_deploy_initinfra_target_node.sh
+        - ./tools/deployment/multi-tenant/32_cluster_init_target_node.sh
+        - ./tools/deployment/multi-tenant/33_cluster_move_target_node.sh
+        - ./tools/deployment/multi-tenant/35_deploy_worker_node.sh
+        - ./tools/deployment/multi-tenant/36_deploy_workload.sh
     files:
       - ^manifests/site/virtual-network-cloud/.*$
       - ^manifests/type/multi-tenant/.*$