diff --git a/.zuul.yaml b/.zuul.yaml
index 66310703..fd1bd9e1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -62,6 +62,12 @@
       - name: primary
         label: ubuntu-bionic
 
+- nodeset:
+    name: deckhand-single-node-airskiff
+    nodes:
+      - name: primary
+        label: ubuntu-xenial
+
 - job:
     name: deckhand-tox-py27-postgresql
     parent: openstack-tox-py27
@@ -226,7 +232,7 @@
 
 - job:
     name: deckhand-airskiff-deployment
-    nodeset: deckhand-single-node
+    nodeset: deckhand-single-node-airskiff
     description: |
       Deploy Memcached using Airskiff and submitted Deckhand changes.
     timeout: 9600
@@ -237,13 +243,9 @@
     run: tools/gate/playbooks/airskiff-deploy.yaml
     post-run: tools/gate/playbooks/debug-report.yaml
     required-projects:
-      - airship/armada
-      - airship/pegleg
-      - airship/shipyard
       - airship/treasuremap
-      - openstack/openstack-helm-infra
     vars:
-      OSH_INFRA_PATH: "../../openstack/openstack-helm-infra"
+      CLONE_DECKHAND: false
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
diff --git a/tools/gate/playbooks/airskiff-deploy.yaml b/tools/gate/playbooks/airskiff-deploy.yaml
index e312c011..ad45205a 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_DECKHAND={{ CLONE_DECKHAND }}
+        ./tools/deployment/airskiff/developer/005-clone-dependencies.sh
+      args:
+        chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
+
     - name: Build Deckhand 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 }}"