diff --git a/jjb/pipeline/voltha/physical-build.groovy b/jjb/pipeline/voltha/physical-build.groovy
index 6ed3a8f..99871c5 100755
--- a/jjb/pipeline/voltha/physical-build.groovy
+++ b/jjb/pipeline/voltha/physical-build.groovy
@@ -122,8 +122,8 @@
           installVoltctl("${branch}")
 
           sh """
-          sed -i -e "s/server: .*/server: voltha-${cluster}:443/" \
-              -e "s/kvstore: .*/kvstore: voltha-infra-${cluster}:443/" \
+          sed -i -e "s/server: .*/server: voltha.${cluster}:443/" \
+              -e "s/kvstore: .*/kvstore: voltha-infra.${cluster}:443/" \
               /home/jenkins/.volt/config
           """
 
@@ -183,6 +183,7 @@
               bbsimReplica: bbsimReplicas.toInteger(),
               withFttb: withFttb.toBoolean(),
               adaptersToWait: numberOfAdaptersToWait,
+              cluster: cluster,
               ])
 
             if(openoltAdapterChart != "onf/voltha-adapter-openolt"){