diff --git a/bin/ovb-instack b/bin/ovb-instack
index eca86e4..871c8db 100755
--- a/bin/ovb-instack
+++ b/bin/ovb-instack
@@ -33,7 +33,11 @@ git clone https://git.openstack.org/openstack-infra/tripleo-ci git-tripleo-ci
 echo '#!/bin/bash' > tripleo.sh
 echo 'git-tripleo-ci/scripts/tripleo.sh $@' >> tripleo.sh
 chmod +x tripleo.sh
-git clone https://github.com/cybertron/openstack-virtual-baremetal
+if [ ! -d overcloud-templates ]
+then
+    git clone https://github.com/cybertron/openstack-virtual-baremetal
+    cp -r openstack-virtual-baremetal/overcloud-templates .
+fi
 
 export OVERCLOUD_PINGTEST_OLD_HEATCLIENT=0
 export TRIPLEOSH=/home/centos/tripleo.sh
@@ -102,7 +106,7 @@ timer
 export OVERCLOUD_DEPLOY_ARGS="--libvirt-type qemu -e /usr/share/openstack-tripleo-heat-templates/environments/disable-telemetry.yaml"
 if [ ${VERSION:-1} -eq 2 ]
 then
-    OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e /home/centos/openstack-virtual-baremetal/overcloud-templates/network-templates-v2/network-isolation-absolute.yaml -e /home/centos/openstack-virtual-baremetal/overcloud-templates/network-templates-v2/network-environment.yaml"
+    OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e /home/centos/overcloud-templates/network-templates-v2/network-isolation-absolute.yaml -e /home/centos/overcloud-templates/network-templates-v2/network-environment.yaml"
 fi
 openstack overcloud deploy --templates $OVERCLOUD_DEPLOY_ARGS
 
diff --git a/bin/test-job-v2 b/bin/test-job-v2
index 397f3ac..e7fa6e3 100755
--- a/bin/test-job-v2
+++ b/bin/test-job-v2
@@ -34,6 +34,7 @@ cd $TEMPDIR
 
 cp -r $BIN_DIR/../templates .
 cp -r $BIN_DIR/../environments .
+cp -r $BIN_DIR/../overcloud-templates .
 cp environments/base.yaml ./env.yaml
 sed -i "s/bmc_image: .*/bmc_image: $BMC_IMAGE/" env.yaml
 sed -i "s/bmc_flavor: .*/bmc_flavor: $BMC_FLAVOR/" env.yaml
@@ -59,6 +60,7 @@ SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLeve
 until ssh -t -t $SSH_OPTS centos@$UNDERCLOUD_IP ls; do sleep 1; done
 scp $SSH_OPTS bin/ovb-instack centos@$UNDERCLOUD_IP:/tmp
 scp $SSH_OPTS nodes.json centos@$UNDERCLOUD_IP:~/instackenv.json
+scp $SSH_OPTS -r overcloud-templates centos@$UNDERCLOUD_IP:~
 ssh -t -t $SSH_OPTS centos@$UNDERCLOUD_IP LOCAL=$LOCAL VERSION=2 /tmp/ovb-instack
 heat stack-delete -y $STACK_NAME