diff --git a/.zuul.yaml b/.zuul.yaml
index b3403527..a6036e70 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -107,13 +107,9 @@
     run: tools/gate/playbooks/airskiff-deploy.yaml
     post-run: tools/gate/playbooks/debug-report.yaml
     required-projects:
-      - airship/armada
-      - airship/deckhand
-      - airship/pegleg
       - airship/treasuremap
-      - openstack/openstack-helm-infra
     vars:
-      OSH_INFRA_PATH: "../../openstack/openstack-helm-infra"
+      CLONE_SHIPYARD: false
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
diff --git a/tools/gate/playbooks/airskiff-deploy.yaml b/tools/gate/playbooks/airskiff-deploy.yaml
index 1691957e..3b67e426 100644
--- a/tools/gate/playbooks/airskiff-deploy.yaml
+++ b/tools/gate/playbooks/airskiff-deploy.yaml
@@ -21,6 +21,13 @@
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
       become: yes
 
+    - name: Clone Required Repositories
+      shell: |
+        export CLONE_SHIPYARD={{ CLONE_SHIPYARD }}
+        ./tools/deployment/airskiff/developer/005-clone-dependencies.sh
+      args:
+        chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
+
     - name: Build Shipyard and Airflow with submitted changes
       shell: |
         make
@@ -30,7 +37,6 @@
 
     - name: Deploy Kubernetes with Minikube
       shell: |
-        export OSH_INFRA_PATH={{ OSH_INFRA_PATH }}
         ./tools/deployment/airskiff/developer/010-deploy-k8s.sh
       args:
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"