diff --git a/tools/gate/playbooks/armada-fullstack-deploy.yaml b/tools/gate/playbooks/armada-fullstack-deploy.yaml
index 6afd6ec4cb..354c8f848a 100644
--- a/tools/gate/playbooks/armada-fullstack-deploy.yaml
+++ b/tools/gate/playbooks/armada-fullstack-deploy.yaml
@@ -27,13 +27,13 @@
         set xe;
         ./tools/deployment/armada/010-armada-host-setup.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Build armada
       shell: |
         set xe;
         ./tools/deployment/armada/015-armada-build.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Render all Armada manifests
       vars:
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path }}"
@@ -42,7 +42,7 @@
         set -xe;
         ./tools/deployment/armada/020-armada-render-manifests.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Validate all Armada manifests
       vars:
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path }}"
@@ -51,7 +51,7 @@
         set -xe;
         ./tools/deployment/armada/025-armada-validate-manifests.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Apply all Armada manifests
       vars:
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path }}"
@@ -60,4 +60,4 @@
         set -xe;
         ./tools/deployment/armada/030-armada-apply-manifests.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
diff --git a/tools/gate/playbooks/dev-deploy-ceph.yaml b/tools/gate/playbooks/dev-deploy-ceph.yaml
index 411f724939..04447449a6 100644
--- a/tools/gate/playbooks/dev-deploy-ceph.yaml
+++ b/tools/gate/playbooks/dev-deploy-ceph.yaml
@@ -22,7 +22,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Required packages
       shell: |
         set -xe;
@@ -31,7 +31,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Setup OS and K8s Clients
       shell: |
         set -xe;
@@ -40,7 +40,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Ingress
       shell: |
         set -xe;
@@ -49,7 +49,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Ceph
       shell: |
         set -xe;
@@ -58,7 +58,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Ceph NS Activate
       shell: |
         set -xe;
@@ -67,7 +67,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Mariadb
       shell: |
         set -xe;
@@ -76,7 +76,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy RabbitMQ
       shell: |
         set -xe;
@@ -85,7 +85,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Memcached
       shell: |
         set -xe;
@@ -94,7 +94,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Keystone
       shell: |
         set -xe;
@@ -103,7 +103,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Heat
       shell: |
         set -xe;
@@ -112,13 +112,13 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     # - name: Deploy Horizon
     #   shell: |
     #     set -xe;
     #     ./tools/deployment/developer/ceph/100-horizon.sh
     #   args:
-    #     chdir: "{{ zuul.project.src_dir }}"
+    #     chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Keystone Endpoints and User management for CephRGW
       shell: |
         set -xe;
@@ -127,7 +127,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Glance
       shell: |
         set -xe;
@@ -137,7 +137,7 @@
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
         GLANCE_BACKEND: "{{ zuul_glance_backend | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Cinder
       shell: |
         set -xe;
@@ -146,7 +146,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy OpenvSwitch
       when: osh_neutron_backend == 'openvswitch'
       shell: |
@@ -156,7 +156,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Libvirt
       shell: |
         set -xe;
@@ -165,7 +165,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy VM Compute Kit
       shell: |
         set -xe;
@@ -174,7 +174,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Setup Gateway
       shell: |
         set -xe;
@@ -183,7 +183,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy use the cloud
       shell: |
         set -xe;
@@ -192,4 +192,4 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
diff --git a/tools/gate/playbooks/dev-deploy-nfs.yaml b/tools/gate/playbooks/dev-deploy-nfs.yaml
index ad45c4011b..d6784fde22 100644
--- a/tools/gate/playbooks/dev-deploy-nfs.yaml
+++ b/tools/gate/playbooks/dev-deploy-nfs.yaml
@@ -22,7 +22,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Required packages
       shell: |
         set -xe;
@@ -31,7 +31,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Setup OS and K8s Clients
       shell: |
         set -xe;
@@ -40,7 +40,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Ingress
       shell: |
         set -xe;
@@ -49,7 +49,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy NFS
       shell: |
         set -xe;
@@ -58,7 +58,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Mariadb
       shell: |
         set -xe;
@@ -67,7 +67,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy RabbitMQ
       shell: |
         set -xe;
@@ -76,7 +76,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Memcached
       shell: |
         set -xe;
@@ -85,7 +85,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Keystone
       when: idp_backend is not defined
       shell: |
@@ -95,7 +95,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Keystone with LDAP
       when: idp_backend is defined and idp_backend == "ldap"
       shell: |
@@ -105,7 +105,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Heat
       shell: |
         set -xe;
@@ -114,7 +114,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Horizon
       shell: |
         set -xe;
@@ -123,7 +123,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Glance
       shell: |
         set -xe;
@@ -132,7 +132,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy OpenvSwitch
       when: osh_neutron_backend == 'openvswitch'
       shell: |
@@ -142,7 +142,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Libvirt
       shell: |
         set -xe;
@@ -151,7 +151,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy VM Compute Kit
       shell: |
         set -xe;
@@ -160,7 +160,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Setup Gateway
       shell: |
         set -xe;
@@ -169,7 +169,7 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy use the cloud
       shell: |
         set -xe;
@@ -178,4 +178,4 @@
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
diff --git a/tools/gate/playbooks/ironic-deploy.yaml b/tools/gate/playbooks/ironic-deploy.yaml
index ec1ccbb19f..682fd24f61 100644
--- a/tools/gate/playbooks/ironic-deploy.yaml
+++ b/tools/gate/playbooks/ironic-deploy.yaml
@@ -19,100 +19,100 @@
         set -xe;
         ./tools/deployment/baremetal/000-install-packages.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Setup Nodes
       shell: |
         set -xe;
         ./tools/deployment/baremetal/005-setup-nodes.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy clients
       shell: |
         set -xe;
         ./tools/deployment/baremetal/010-setup-client.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy ingress
       shell: |
         set -xe;
         ./tools/deployment/baremetal/020-ingress.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Ceph
       shell: |
         set -xe;
         ./tools/deployment/baremetal/030-ceph.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Setup openstack namespace for ceph
       shell: |
         set -xe;
         ./tools/deployment/baremetal/035-ceph-ns-activate.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy MariaDB
       shell: |
         set -xe;
         ./tools/deployment/baremetal/040-mariadb.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy RabbitMQ
       shell: |
         set -xe;
         ./tools/deployment/baremetal/050-rabbitmq.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Memcached
       shell: |
         set -xe;
         ./tools/deployment/baremetal/060-memcached.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Keystone
       shell: |
         set -xe;
         ./tools/deployment/baremetal/080-keystone.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Glance
       shell: |
         set -xe;
         ./tools/deployment/baremetal/090-glance.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Hea
       shell: |
         set -xe;
         ./tools/deployment/baremetal/100-heat.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Compute Kit
       shell: |
         set -xe;
         ./tools/deployment/baremetal/110-compute-kit.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Create baremetal host aggregate
       shell: |
         set -xe;
         ./tools/deployment/baremetal/800-create-baremetal-host-aggregate.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Register baremetal nodes
       shell: |
         set -xe;
         ./tools/deployment/baremetal/810-register-baremetal-nodes.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Create baremetal flavor
       shell: |
         set -xe;
         ./tools/deployment/baremetal/820-create-baremetal-flavor.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Node
       shell: |
         set -xe;
         ./tools/deployment/baremetal/900-use-it.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
diff --git a/tools/gate/playbooks/multinode-deploy.yaml b/tools/gate/playbooks/multinode-deploy.yaml
index 7be1f78410..61639b9046 100644
--- a/tools/gate/playbooks/multinode-deploy.yaml
+++ b/tools/gate/playbooks/multinode-deploy.yaml
@@ -19,142 +19,142 @@
         set -xe;
         ./tools/deployment/multinode/010-setup-client.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Ingress
       shell: |
         set -xe;
         ./tools/deployment/multinode/020-ingress.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Ceph
       shell: |
         set -xe;
         ./tools/deployment/multinode/030-ceph.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Setup openstack namespace for ceph
       shell: |
         set -xe;
         ./tools/deployment/multinode/040-ceph-ns-activate.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy MariaDB
       shell: |
         set -xe;
         ./tools/deployment/multinode/050-mariadb.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy RabbitMQ
       shell: |
         set -xe;
         ./tools/deployment/multinode/060-rabbitmq.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Memcached
       shell: |
         set -xe;
         ./tools/deployment/multinode/070-memcached.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Keystone
       shell: |
         set -xe;
         ./tools/deployment/multinode/080-keystone.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Keystone RadosGW endpoints and user
       shell: |
         set -xe;
         ./tools/deployment/multinode/090-ceph-radosgateway.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Glance
       shell: |
         set -xe;
         ./tools/deployment/multinode/100-glance.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Cinder
       shell: |
         set -xe;
         ./tools/deployment/multinode/110-cinder.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy OpenVswitch
       shell: |
         set -xe;
         ./tools/deployment/multinode/120-openvswitch.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Libvirt
       shell: |
         set -xe;
         ./tools/deployment/multinode/130-libvirt.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy ComputeKit
       shell: |
         set -xe;
         ./tools/deployment/multinode/140-compute-kit.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Heat
       shell: |
         set -xe;
         ./tools/deployment/multinode/150-heat.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Barbican
       shell: |
         set -xe;
         ./tools/deployment/multinode/160-barbican.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Senlin
       shell: |
         set -xe;
         ./tools/deployment/multinode/170-senlin.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Mistral
       shell: |
         set -xe;
         ./tools/deployment/multinode/180-mistral.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Magnum
       shell: |
         set -xe;
         ./tools/deployment/multinode/190-magnum.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Congress
       shell: |
         set -xe;
         ./tools/deployment/multinode/200-congress.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Postgresql
       shell: |
         set -xe;
         ./tools/deployment/multinode/210-postgresql.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Gnocchi
       shell: |
         set -xe;
         ./tools/deployment/multinode/220-gnocchi.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy MongoDB
       shell: |
         set -xe;
         ./tools/deployment/multinode/230-mongodb.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Deploy Ceilometer
       shell: |
         set -xe;
         ./tools/deployment/multinode/240-ceilometer.sh
       args:
-        chdir: "{{ zuul.project.src_dir }}"
+        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"