diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index 3cc9064..63d2582 100644
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -55,7 +55,7 @@
       return "--set images.bbsim.tag=citest,images.bbsim.pullPolicy=Never,images.bbsim.registry='' "
     break
     default:
-    break
+      return ""
   }
 
   return "--set ${chart}.images.${image}.tag=citest,${chart}.images.${image}.pullPolicy=Never,${chart}.images.${image}.registry='' "
diff --git a/vars/volthaDeploy.groovy b/vars/volthaDeploy.groovy
index 5b0adc3..17f9e5d 100644
--- a/vars/volthaDeploy.groovy
+++ b/vars/volthaDeploy.groovy
@@ -27,13 +27,13 @@
     def cfg = defaultConfig + config
 
     if (cfg.dockerRegistry != "") {
-      extraHelmFlags += " --set global.image_registry=${cfg.dockerRegistry}/ "
-      extraHelmFlags += " --set etcd.image.registry=${cfg.dockerRegistry} "
-      extraHelmFlags += " --set kafka.image.registry=${cfg.dockerRegistry} "
-      extraHelmFlags += " --set kafka.zookeper.image.registry=${cfg.dockerRegistry} "
-      extraHelmFlags += " --set onos-classic.image.repository=${cfg.dockerRegistry}/voltha/voltha-onos "
-      extraHelmFlags += " --set onos-classic.atomix.image.repository=${cfg.dockerRegistry}/atomix/atomix "
-      extraHelmFlags += " --set freeradius.images.radius.registry=${cfg.dockerRegistry}/ "
+      cfg.extraHelmFlags += " --set global.image_registry=${cfg.dockerRegistry}/ "
+      cfg.extraHelmFlags += " --set etcd.image.registry=${cfg.dockerRegistry} "
+      cfg.extraHelmFlags += " --set kafka.image.registry=${cfg.dockerRegistry} "
+      cfg.extraHelmFlags += " --set kafka.zookeper.image.registry=${cfg.dockerRegistry} "
+      cfg.extraHelmFlags += " --set onos-classic.image.repository=${cfg.dockerRegistry}/voltha/voltha-onos "
+      cfg.extraHelmFlags += " --set onos-classic.atomix.image.repository=${cfg.dockerRegistry}/atomix/atomix "
+      cfg.extraHelmFlags += " --set freeradius.images.radius.registry=${cfg.dockerRegistry}/ "
     }
 
     println "Deploying VOLTHA with the following parameters: ${cfg}."