diff --git a/jjb/pipeline/voltha/bbsim-tests.groovy b/jjb/pipeline/voltha/bbsim-tests.groovy
index b1c8b17..398e32d 100644
--- a/jjb/pipeline/voltha/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/bbsim-tests.groovy
@@ -549,6 +549,7 @@
     }
 
     stages {
+
         stage('Download Code') {
             steps {
                 enter('getVolthaCode')
@@ -602,6 +603,28 @@
 
         // -----------------------------------------------------------------------
         // -----------------------------------------------------------------------
+        stage('Install kubectl')
+        {
+            steps
+            {
+                script
+                {
+                    String cmd = [
+                        'make',
+                        '--no-print-directory',
+                        '-C', "$WORKSPACE",
+                        "KUBECTL_PATH=\"$WORKSPACE/bin\"",
+                        'kubectl',
+                    ].join(' ')
+
+                    println(" ** Running: ${cmd}")
+                    sh("${cmd}")
+                } // script
+            } // steps
+        } // stage
+
+        // -----------------------------------------------------------------------
+        // -----------------------------------------------------------------------
         stage('Install Tools') {
             steps              {
                 script         {
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 53b9990..5ba9728 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -10,14 +10,14 @@
           branch-regexp: '{all-branches-regexp}'
       - 'verify-voltha-openolt-adapter-jobs-master':
           branch-regexp: '^master$'
-      - 'verify-voltha-openolt-adapter-jobs-voltha-2.12':
-          name-extension: '-voltha-2.12'
-          override-branch: 'voltha-2.12'
-          branch-regexp: '^voltha-2.12$'
-      - 'verify-voltha-openolt-adapter-jobs-voltha-2.11':
-          name-extension: '-voltha-2.11'
-          override-branch: 'voltha-2.11'
-          branch-regexp: '^voltha-2.11$'
+#      - 'verify-voltha-openolt-adapter-jobs-voltha-2.12':
+#          name-extension: '-voltha-2.12'
+#          override-branch: 'voltha-2.12'
+#          branch-regexp: '^voltha-2.12$'
+#      - 'verify-voltha-openolt-adapter-jobs-voltha-2.11':
+#          name-extension: '-voltha-2.11'
+#          override-branch: 'voltha-2.11'
+#          branch-regexp: '^voltha-2.11$'
       - 'publish-voltha-openolt-adapter-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -33,14 +33,16 @@
           unit-test-targets: 'lint sca'
           unit-test-keep-going: 'false'
           junit-allow-empty-results: true
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'voltha-1804-micro'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
       - 'make-unit-test':
           dest-gopath: "github.com/opencord"
           name-extension: "-tests"
           unit-test-targets: 'test'
           unit-test-keep-going: 'false'
           junit-allow-empty-results: true
-          build-node: 'ubuntu18.04-basebuild-2c-4g'
+          # build-node: 'ubuntu18.04-basebuild-2c-4g'
+          build-node: 'voltha-1804-micro'
 
 - job-group:
     name: 'verify-voltha-openolt-adapter-jobs-master'
@@ -57,12 +59,21 @@
           # pipeline-script: 'voltha/bbsim-tests.groovy'
           # pipeline-branch: 'voltha-2.12'
 
-- job-group:
-    name: 'verify-voltha-openolt-adapter-jobs-voltha-2.11'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.11'
+# -----------------------------------------------------------------------
+# Directory based branch test suites were removed when consultants moved
+# all testing onto master and bulk disabled failing suites to try and
+# get the job queue clean.
+#
+# Since release testing can no longer be initiated by parameterized
+# cron jobs a new set of jobs that will checkout release branch and
+# run testing to validate hotfixes will need to be created.
+# -----------------------------------------------------------------------
+#- job-group:
+#    name: 'verify-voltha-openolt-adapter-jobs-voltha-2.11'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+#          pipeline-branch: 'voltha-2.11'
 
 - job-group:
     name: 'publish-voltha-openolt-adapter-jobs'