diff --git a/.gitreview b/.gitreview
index f23bc1bcf..12ed0e06b 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=airship/treasuremap.git
+defaultbranch=v2
diff --git a/tools/deployment/01_install_essentials.sh b/tools/deployment/01_install_essentials.sh
index e78a891dc..c5217f73b 100755
--- a/tools/deployment/01_install_essentials.sh
+++ b/tools/deployment/01_install_essentials.sh
@@ -14,9 +14,18 @@
 
 set -xe
 
+pkg_check() {
+  for pkg in $@; do
+    sudo dpkg -s $pkg &> /dev/null || sudo DEBIAN_FRONTEND=noninteractive apt -y install $pkg
+  done
+}
+
+pkg_check software-properties-common curl wget ca-certificates docker.io make
+
 : ${AIRSHIPCTL_PROJECT:="../airshipctl"}
 
 cd ${AIRSHIPCTL_PROJECT}
+./tools/deployment/provider_common/02_install_jq.sh
 ./tools/deployment/provider_common/03_install_pip.sh
 ./tools/deployment/provider_common/04_install_yq.sh
 ./tools/deployment/01_install_kubectl.sh
diff --git a/tools/deployment/22_test_configs.sh b/tools/deployment/22_test_configs.sh
index 04ac81601..527c8272a 100755
--- a/tools/deployment/22_test_configs.sh
+++ b/tools/deployment/22_test_configs.sh
@@ -17,8 +17,8 @@ set -xe
 : ${AIRSHIPCTL_PROJECT:="../airshipctl"}
 : ${TREASUREMAP_PROJECT:="$(pwd)"}
 
-export AIRSHIP_SITE_NAME=${AIRSHIP_SITE_NAME:-"test-site"}
-export AIRSHIP_CONFIG_METADATA_PATH=${AIRSHIP_CONFIG_METADATA_PATH:-"treasuremap/manifests/site/$AIRSHIP_SITE_NAME/metadata.yaml"}
+export SITE=${SITE:-"test-site"}
+export AIRSHIP_CONFIG_METADATA_PATH=${AIRSHIP_CONFIG_METADATA_PATH:-"treasuremap/manifests/site/$SITE/metadata.yaml"}
 export AIRSHIP_CONFIG_MANIFEST_DIRECTORY=${AIRSHIP_CONFIG_MANIFEST_DIRECTORY:-"/tmp/treasuremap"}
 
 # Primary repo options
diff --git a/tools/deployment/23_generate_secrets.sh b/tools/deployment/23_generate_secrets.sh
index 0f5d065ac..7581a28a5 100755
--- a/tools/deployment/23_generate_secrets.sh
+++ b/tools/deployment/23_generate_secrets.sh
@@ -17,8 +17,8 @@ set -xe
 : ${AIRSHIPCTL_PROJECT:="../airshipctl"}
 : ${TREASUREMAP_PROJECT:="$(pwd)"}
 
-export AIRSHIP_SITE_NAME=${AIRSHIP_SITE_NAME:-"test-site"}
-export AIRSHIP_CONFIG_METADATA_PATH=${AIRSHIP_CONFIG_METADATA_PATH:-"treasuremap/manifests/site/$AIRSHIP_SITE_NAME/metadata.yaml"}
+export SITE=${SITE:-"test-site"}
+export AIRSHIP_CONFIG_METADATA_PATH=${AIRSHIP_CONFIG_METADATA_PATH:-"treasuremap/manifests/site/$SITE/metadata.yaml"}
 # Setting the same value as targetPath that gets updated after create config step (22_test_configs.sh)
 export AIRSHIP_CONFIG_MANIFEST_DIRECTORY=${AIRSHIP_CONFIG_MANIFEST_DIRECTORY:-"/tmp/default"}
 
diff --git a/tools/deployment/31_deploy_initinfra_target_node.sh b/tools/deployment/31_deploy_initinfra_target_node.sh
index 4b0e37d78..fd8ce475b 100755
--- a/tools/deployment/31_deploy_initinfra_target_node.sh
+++ b/tools/deployment/31_deploy_initinfra_target_node.sh
@@ -15,17 +15,22 @@
 set -ex
 
 export KUBECONFIG=${KUBECONFIG:-"$HOME/.airship/kubeconfig"}
-NODENAME="node01"
 export KUBECONFIG_TARGET_CONTEXT=${KUBECONFIG_TARGET_CONTEXT:-"target-cluster"}
 : ${AIRSHIPCTL_PROJECT:="../airshipctl"}
 
+TARGET_NODE=${TARGET_NODE:-"$(airshipctl phase render controlplane-ephemeral \
+	-k BareMetalHost -l airshipit.org/k8s-role=controlplane-host \
+	2> /dev/null | \
+	yq .metadata.name | \
+	sed 's/"//g')"}
+
 cd ${AIRSHIPCTL_PROJECT}
 
 kubectl \
   --kubeconfig $KUBECONFIG \
   --context $KUBECONFIG_TARGET_CONTEXT \
   --request-timeout 10s \
-  label node $NODENAME node-type=controlplane
+  label nodes $TARGET_NODE node-type=controlplane
 
 ./tools/deployment/31_deploy_initinfra_target_node.sh
 
diff --git a/tools/deployment/34_deploy_worker_node.sh b/tools/deployment/34_deploy_worker_node.sh
index 23b59fb5d..3e71e1810 100755
--- a/tools/deployment/34_deploy_worker_node.sh
+++ b/tools/deployment/34_deploy_worker_node.sh
@@ -16,5 +16,10 @@ set -ex
 
 : ${AIRSHIPCTL_PROJECT:="../airshipctl"}
 
+export WORKER_NODE=${WORKER_NODE:-"$(airshipctl phase render workers-target \
+	-k BareMetalHost 2> /dev/null | \
+	yq .metadata.name | \
+	sed 's/"//g')"}
+
 cd ${AIRSHIPCTL_PROJECT}
 ./tools/deployment/34_deploy_worker_node.sh
diff --git a/tools/deployment/35_deploy_workload.sh b/tools/deployment/35_deploy_workload.sh
index 50ca47fb0..09f09820a 100755
--- a/tools/deployment/35_deploy_workload.sh
+++ b/tools/deployment/35_deploy_workload.sh
@@ -16,5 +16,17 @@ set -ex
 
 : ${AIRSHIPCTL_PROJECT:="../airshipctl"}
 
+export TARGET_IP=${TARGET_IP:-"$(airshipctl phase render controlplane-target \
+	-k Metal3Cluster \
+	-l airshipit.org/stage=initinfra \
+       	2> /dev/null | \
+	yq .spec.controlPlaneEndpoint.host |
+	sed 's/"//g')"}
+export TARGET_PORT=${TARGET_PORT:-"$(airshipctl phase render controlplane-target \
+	-k Metal3Cluster -l airshipit.org/stage=initinfra \
+       	2> /dev/null | \
+	yq .spec.controlPlaneEndpoint.port)"}
+
+echo $TARGET_IP $TARGET_PORT
 cd ${AIRSHIPCTL_PROJECT}
 ./tools/deployment/35_deploy_workload.sh