diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index a67d32a..28f3e83 100644
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -33,7 +33,7 @@
         }
 
         def localCharts = false
-        if (gerritProject == "voltha-helm-charts") {
+        if (gerritProject == "voltha-helm-charts" || branch != "master") {
           localCharts = true
         }
 
diff --git a/jjb/pipeline/voltha/voltha-2.7/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.7/bbsim-tests.groovy
index c72c0f9..da6e82f 100644
--- a/jjb/pipeline/voltha/voltha-2.7/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.7/bbsim-tests.groovy
@@ -70,11 +70,16 @@
       }
 
       def localCharts = false
-      if (gerritProject == "voltha-helm-charts") {
+      if (gerritProject == "voltha-helm-charts" || branch != "master") {
         localCharts = true
       }
 
-      volthaDeploy([workflow: name, extraHelmFlags: extraHelmFlags, localCharts: localCharts])
+      volthaDeploy([
+        workflow: name,
+        extraHelmFlags: extraHelmFlags,
+        localCharts: localCharts,
+        dockerRegistry: "mirror.registry.opennetworking.org"
+      ])
       // start logging
       sh """
       mkdir -p $WORKSPACE/${name}