diff --git a/.zuul.yaml b/.zuul.yaml
index ef447f2cf..57fcb7dbb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -108,6 +108,8 @@
       - name: airship/pegleg
       - name: airship/shipyard
       - name: openstack/openstack-helm-infra
+    vars:
+      OSH_INFRA_PATH: "../../openstack/openstack-helm-infra"
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
diff --git a/tools/deployment/airskiff/developer/005-clone-dependencies.sh b/tools/deployment/airskiff/developer/005-clone-dependencies.sh
index bfe1fb799..96e7a7ab5 100755
--- a/tools/deployment/airskiff/developer/005-clone-dependencies.sh
+++ b/tools/deployment/airskiff/developer/005-clone-dependencies.sh
@@ -24,13 +24,13 @@ CURRENT_DIR="$(pwd)"
 cd ${INSTALL_PATH}
 
 # Clone Airship projects
-git clone https://git.openstack.org/openstack/airship-armada.git
-git clone https://git.openstack.org/openstack/airship-deckhand.git
-git clone https://git.openstack.org/openstack/airship-pegleg.git
-git clone https://git.openstack.org/openstack/airship-shipyard.git
+git clone https://opendev.org/airship/armada.git
+git clone https://opendev.org/airship/deckhand.git
+git clone https://opendev.org/airship/pegleg.git
+git clone https://opendev.org/airship/shipyard.git
 
 # Clone dependencies
-git clone https://git.openstack.org/openstack/openstack-helm-infra.git
+git clone https://opendev.org/openstack/openstack-helm-infra.git
 
 cd openstack-helm-infra
 git checkout "${OSH_INFRA_COMMIT}"
diff --git a/tools/deployment/airskiff/developer/100-deploy-osh.sh b/tools/deployment/airskiff/developer/100-deploy-osh.sh
index f97a07569..22dbdfc43 100755
--- a/tools/deployment/airskiff/developer/100-deploy-osh.sh
+++ b/tools/deployment/airskiff/developer/100-deploy-osh.sh
@@ -19,8 +19,8 @@ set -xe
 
 # Deploy OpenStack using Airship
 CURRENT_DIR="$(pwd)"
-: "${PL_PATH:="../airship-pegleg"}"
-: "${SY_PATH:="../airship-shipyard"}"
+: "${PL_PATH:="../pegleg"}"
+: "${SY_PATH:="../shipyard"}"
 
 # NOTE: Image to use for all Pegleg operations
 : "${PL_IMAGE:=quay.io/airshipit/pegleg:latest}"
diff --git a/tools/deployment/airskiff/manifests/airship.yaml b/tools/deployment/airskiff/manifests/airship.yaml
index c82ff34ae..5a13c80c0 100644
--- a/tools/deployment/airskiff/manifests/airship.yaml
+++ b/tools/deployment/airskiff/manifests/airship.yaml
@@ -245,7 +245,7 @@ data:
           timeout: null
   source:
     type: local
-    location: /airship-components/airship-armada
+    location: /airship-components/armada
     subpath: charts/armada
   dependencies:
     - osh-helm-toolkit
@@ -265,7 +265,7 @@ data:
   values: {}
   source:
     type: local
-    location: /airship-components/airship-deckhand
+    location: /airship-components/deckhand
     subpath: charts/deckhand
   dependencies:
     - osh-helm-toolkit
@@ -302,7 +302,7 @@ data:
           service_type: armada
   source:
     type: local
-    location: /airship-components/airship-shipyard
+    location: /airship-components/shipyard
     subpath: charts/shipyard
   dependencies:
     - osh-helm-toolkit
diff --git a/tools/gate/lint-site.sh b/tools/gate/lint-site.sh
index 213a0362f..bad6bb012 100755
--- a/tools/gate/lint-site.sh
+++ b/tools/gate/lint-site.sh
@@ -16,7 +16,7 @@
 
 set -xe
 
-: "${PEGLEG_PATH:=../airship-pegleg}"
+: "${PEGLEG_PATH:=../pegleg}"
 : "${PEGLEG_IMG:=quay.io/airshipit/pegleg:b7556bd89e99f2a6539e97d5a4ac6738751b9c55}"
 
 : "${PEGLEG:=${PEGLEG_PATH}/tools/pegleg.sh}"
diff --git a/tools/gate/playbooks/airskiff-deploy-gate.yaml b/tools/gate/playbooks/airskiff-deploy-gate.yaml
index 1b9560533..f0407e99c 100644
--- a/tools/gate/playbooks/airskiff-deploy-gate.yaml
+++ b/tools/gate/playbooks/airskiff-deploy-gate.yaml
@@ -23,6 +23,7 @@
 
     - name: Deploy Kubernetes with Minikube
       shell: |
+        export OSH_INFRA_PATH={{ OSH_INFRA_PATH }}
         ./tools/deployment/airskiff/developer/010-deploy-k8s.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
diff --git a/tools/gate/wait-for-shipyard.sh b/tools/gate/wait-for-shipyard.sh
index 5786563bc..415cba165 100755
--- a/tools/gate/wait-for-shipyard.sh
+++ b/tools/gate/wait-for-shipyard.sh
@@ -16,7 +16,7 @@
 
 set -e
 
-: "${SHIPYARD:=../airship-shipyard/tools/shipyard.sh}"
+: "${SHIPYARD:=../shipyard/tools/shipyard.sh}"
 
 ACTION=$(${SHIPYARD} get actions | grep -i "Processing" | awk '{ print $2 }')