diff --git a/jjb/cloud-infra/cloud-infra-deploy.sh b/jjb/cloud-infra/cloud-infra-deploy.sh
index a73f3f6..51ae5a3 100644
--- a/jjb/cloud-infra/cloud-infra-deploy.sh
+++ b/jjb/cloud-infra/cloud-infra-deploy.sh
@@ -32,8 +32,21 @@
 # infra/swconfig so it needs to be handled here in order to ensure $WORKSPACE contains
 # the actual engine repo clone. This will be added later on.
 
+# PDF and IDF are determined based on the deployment type
+#   If DEPLOY_TYPE is virtual, we always use nordix-vpod1 PDF and IDF.
+#   If DEPLOY_TYPE is baremetal, we use variable NODE_NAME injected by Jenkins to the job
+#     in order to set PDF and IDF for the POD the job is running against.
+
+if [[ $DEPLOY_TYPE == "baremetal" ]]; then
+  PDF="https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/${NODE_NAME}-pdf.yml"
+  IDF="https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/${NODE_NAME}-idf.yml"
+else
+  PDF="https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-pdf.yml"
+  IDF="https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-idf.yml"
+fi
+
 # execute cloud engine deploy.sh script
 cd $WORKSPACE
-./engine/deploy.sh
+./engine/deploy.sh -d kubespray -s $DEPLOY_SCENARIO -p $PDF -i $IDF -c
 
 # vim: set ts=2 sw=2 expandtab: