diff --git a/jjb/pipeline/voltha/voltha-2.8/physical-build.groovy b/jjb/pipeline/voltha/voltha-2.8/physical-build.groovy
index 5952828..774df4b 100644
--- a/jjb/pipeline/voltha/voltha-2.8/physical-build.groovy
+++ b/jjb/pipeline/voltha/voltha-2.8/physical-build.groovy
@@ -128,14 +128,8 @@
             // adding user specified helm flags at the end so they'll have priority over everything else
             localHelmFlags = localHelmFlags + " ${extraHelmFlags}"
 
-            def numberOfAdaptersToWait = 2
-
-            if(openoltAdapterChart != "onf/voltha-adapter-openolt") {
-              localHelmFlags = localHelmFlags + " --set voltha-adapter-openolt.enabled=false"
-              // We skip waiting for adapters in the volthaDeploy step because it's already waiting for
-              // both of them after the deployment of the custom olt adapter. See line 156.
-              numberOfAdaptersToWait = 0
-            }
+            // in VOLTHA-2.8 there is no need to wait for the adapters
+            def numberOfAdaptersToWait = 0
 
             volthaDeploy([
               workflow: workFlow.toLowerCase(),
@@ -154,7 +148,7 @@
               extraHelmFlags = extraHelmFlags + " --set global.log_level=${logLevel}"
               deploy_custom_oltAdapterChart(volthaNamespace, oltAdapterReleaseName, openoltAdapterChart, extraHelmFlags)
               waitForAdapters([
-                adaptersToWait: 2
+                adaptersToWait: 0 // in VOLTHA-2.8 there is no need to wait for the adapters
               ])
             }
           }
diff --git a/jjb/voltha-test/voltha-certification.yaml b/jjb/voltha-test/voltha-certification.yaml
index e7a2252..da06bfa 100644
--- a/jjb/voltha-test/voltha-certification.yaml
+++ b/jjb/voltha-test/voltha-certification.yaml
@@ -86,7 +86,7 @@
       - 'build_voltha_pod_release_timer':
           build-node: 'menlo-certification-pod-3'
           config-pod: 'menlo-certification-pod-radisys-3200g'
-          disable-job: false
+          disable-job: true
           reinstall-olt: true
           name-extension: '_DT'
           work-flow: 'DT'
@@ -99,7 +99,7 @@
           timeout: 330
           build-node: 'menlo-certification-pod-3'
           config-pod: 'menlo-certification-pod-radisys-3200g'
-          disable-job: false
+          disable-job: true
           release: 'master'
           branch: 'master'
           name-extension: '_DT'
@@ -200,7 +200,7 @@
       - 'build_voltha_pod_release_timer':
             build-node: 'menlo-certification-pod-3'
             config-pod: 'menlo-certification-pod-radisys-3200g'
-            disable-job: false
+            disable-job: true
             reinstall-olt: true
             work-flow: 'ATT'
             profile: '1T4GEM'
@@ -210,7 +210,7 @@
       - 'build_voltha_pod_test':
             build-node: 'menlo-certification-pod-3'
             config-pod: 'menlo-certification-pod-radisys-3200g'
-            disable-job: false
+            disable-job: true
             release: 'master'
             branch: 'master'
             work-flow: 'ATT'
@@ -223,7 +223,7 @@
       - 'build_voltha_pod_release_timer':
             build-node: 'menlo-certification-pod-3'
             config-pod: 'menlo-certification-pod-radisys-3200g'
-            disable-job: false
+            disable-job: true
             reinstall-olt: true
             work-flow: 'ATT'
             profile: '1T4GEM-unencrypted'
@@ -233,7 +233,7 @@
       - 'build_voltha_pod_test':
             build-node: 'menlo-certification-pod-3'
             config-pod: 'menlo-certification-pod-radisys-3200g'
-            disable-job: false
+            disable-job: true
             release: 'master'
             branch: 'master'
             work-flow: 'ATT'