diff --git a/jjb/pipeline/voltha/master/physical-build.groovy b/jjb/pipeline/voltha/master/physical-build.groovy
index 11e3e9e..1026b4a 100644
--- a/jjb/pipeline/voltha/master/physical-build.groovy
+++ b/jjb/pipeline/voltha/master/physical-build.groovy
@@ -127,7 +127,7 @@
             // adding user specified helm flags at the end so they'll have priority over everything else
             localHelmFlags = localHelmFlags + " ${extraHelmFlags}"
 
-            if(openoltAdapterChart != "") {
+            if(openoltAdapterChart != "onf/voltha-adapter-openolt") {
               localHelmFlags = localHelmFlags + " --set voltha-adapter-openolt.enabled=false"
             }
 
@@ -143,7 +143,7 @@
               bbsimReplica: bbsimReplicas.toInteger(),
               ])
 
-              if(openoltAdapterChart != ""){
+              if(openoltAdapterChart != "onf/voltha-adapter-openolt"){
                 deploy_custom_oltAdapterChart(volthaNamespace, oltAdapterReleaseName, openoltAdapterChart, extraHelmFlags)
               }
           }
diff --git a/jjb/pipeline/voltha/voltha-2.8/physical-build.groovy b/jjb/pipeline/voltha/voltha-2.8/physical-build.groovy
index fb860ea..e7a37fe 100644
--- a/jjb/pipeline/voltha/voltha-2.8/physical-build.groovy
+++ b/jjb/pipeline/voltha/voltha-2.8/physical-build.groovy
@@ -127,7 +127,7 @@
             // adding user specified helm flags at the end so they'll have priority over everything else
             localHelmFlags = localHelmFlags + " ${extraHelmFlags}"
 
-            if(openoltAdapterChart != "") {
+            if(openoltAdapterChart != "onf/voltha-adapter-openolt") {
               localHelmFlags = localHelmFlags + " --set voltha-adapter-openolt.enabled=false"
             }
 
@@ -143,7 +143,7 @@
               bbsimReplica: bbsimReplicas.toInteger(),
               ])
 
-              if(openoltAdapterChart != ""){
+              if(openoltAdapterChart != "onf/voltha-adapter-openolt"){
                 deploy_custom_oltAdapterChart(volthaNamespace, oltAdapterReleaseName, openoltAdapterChart, extraHelmFlags)
               }
           }
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index 5d4a1fd..978aaf4 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -7,6 +7,8 @@
 
     openoltAdapterChart: onf/voltha-adapter-openolt
 
+    oltAdapterReleaseName: open-olt
+
     parameters:
       - string:
           name: buildNode
@@ -168,7 +170,12 @@
       - string:
           name: openoltAdapterChart
           default: '{openoltAdapterChart}'
-          description: 'OpenOLT chart name (or location on file system)'
+          description: 'Olt adapter chart name (or location on file system)'
+
+      - string:
+          name: oltAdapterReleaseName
+          default: '{oltAdapterReleaseName}'
+          description: 'Olt adapter release name'
 
 # defualt properties for the VOLTHA scale jobs
 - voltha-pipe-job-boiler-plate: &voltha-pipe-job-boiler-plate