diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index 9429d6b..4ada7c6 100644
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -44,7 +44,7 @@
 //   per-script to be sure latest repository changes are being used.
 // -----------------------------------------------------------------------
 String pipelineVer() {
-    String version = '5addce3fac89095d103ac5c6eedff2bb02e9ec63'
+    String version = 'e9725b199be034061750c6e9c4c3ac46cf2d0f68'
     return(version)
 }
 
diff --git a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
index adf0808..5b765c1 100644
--- a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
@@ -44,7 +44,7 @@
 //   per-script to be sure latest repository changes are being used.
 // -----------------------------------------------------------------------
 String pipelineVer() {
-    String version = '5addce3fac89095d103ac5c6eedff2bb02e9ec63'
+    String version = 'e9725b199be034061750c6e9c4c3ac46cf2d0f68'
     return(version)
 }
 
diff --git a/jjb/voltha-test/voltha-pod-jobs/master.yaml b/jjb/voltha-test/voltha-pod-jobs/master.yaml
index 1554dd5..46f7c8a 100644
--- a/jjb/voltha-test/voltha-pod-jobs/master.yaml
+++ b/jjb/voltha-test/voltha-pod-jobs/master.yaml
@@ -63,4 +63,23 @@
           power-switch: true
           power-cycle-olt: true
 
+      # -----------------------------------------------------------------------
+      # flex pod1 test job - released versions: uses tech profile on voltha branch
+      # md5sum(master): a616cd61a22b0acde95efb1c71b4b980
+      # -----------------------------------------------------------------------
+      - 'build_voltha_pod_test':
+          disable-job: true                     # Reason: qa-testvm-pod offline
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: 'master'
+          branch: 'master'
+          name-extension: '_TT'
+          work-flow: 'TT'
+          power-switch: true
+          power-cycle-olt: true
+          pipeline-script: 'voltha/master/voltha-tt-physical-functional-tests.groovy'
+          test-repo: 'voltha-system-tests'
+          profile: 'TP'
+          timeout: 360
+          
 # [EOF]
diff --git a/jjb/voltha-test/voltha-pod-jobs/voltha-2.11.yaml b/jjb/voltha-test/voltha-pod-jobs/voltha-2.11.yaml
index f78ec88..2edfd2f 100644
--- a/jjb/voltha-test/voltha-pod-jobs/voltha-2.11.yaml
+++ b/jjb/voltha-test/voltha-pod-jobs/voltha-2.11.yaml
@@ -42,22 +42,6 @@
           profile: '1T4GEM'
 
       # -----------------------------------------------------------------------
-      # [VOL-4939] - flex pod1 test job - released versions: uses tech profile on voltha branch
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test':
-          disable-job: true
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          release: '2.11'
-          branch: 'voltha-2.11'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          power-switch: true
-          pipeline-script: 'voltha/voltha-2.11/voltha-tt-physical-functional-tests.groovy'
-          test-repo: 'voltha-system-tests'
-          profile: 'TP'
-
-      # -----------------------------------------------------------------------
       # flex pod1 test job - uses tech profile on voltha branch
       # md5sum(master): 9293b0f6d3c00a28c8d1a65ef0e8826e
       # -----------------------------------------------------------------------
@@ -89,5 +73,22 @@
           profile: '1T8GEM'
           pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
           power-switch: true
+
+      # -----------------------------------------------------------------------
+      # flex pod1 test job - released versions: uses tech profile on voltha branch 
+      # md5sum(master): a616cd61a22b0acde95efb1c71b4b980
+      # -----------------------------------------------------------------------
+      - 'build_voltha_pod_test': 
+          disable-job: true                     # Reason: qa-testvm-pod offline
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          name-extension: '_TT'
+          work-flow: 'TT'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.11/voltha-tt-physical-functional-tests.groovy'
+          test-repo: 'voltha-system-tests'
+          profile: 'TP'
           
 # [EOF]
diff --git a/jjb/voltha-test/voltha-pod-jobs/voltha-2.12.yaml b/jjb/voltha-test/voltha-pod-jobs/voltha-2.12.yaml
index a2ced4b..c780228 100644
--- a/jjb/voltha-test/voltha-pod-jobs/voltha-2.12.yaml
+++ b/jjb/voltha-test/voltha-pod-jobs/voltha-2.12.yaml
@@ -74,5 +74,22 @@
           profile: '1T8GEM'
           pipeline-script: 'voltha/voltha-2.12/voltha-dt-physical-functional-tests.groovy'
           power-switch: true
-          
+
+      # -----------------------------------------------------------------------
+      # flex pod1 test job - released versions: uses tech profile on voltha branch 
+      # md5sum(master): a616cd61a22b0acde95efb1c71b4b980
+      # -----------------------------------------------------------------------
+      - 'build_voltha_pod_test':
+          disable-job: true                     # Reason: qa-testvm-pod offline
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.12'
+          branch: 'voltha-2.12'
+          name-extension: '_TT'
+          work-flow: 'TT'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.12/voltha-tt-physical-functional-tests.groovy'
+          test-repo: 'voltha-system-tests'
+          profile: 'TP'
+
 # [EOF]
diff --git a/jjb/voltha-test/voltha-pod-jobs/voltha-2.8.yaml b/jjb/voltha-test/voltha-pod-jobs/voltha-2.8.yaml
index 77cef3b..3765c9c 100644
--- a/jjb/voltha-test/voltha-pod-jobs/voltha-2.8.yaml
+++ b/jjb/voltha-test/voltha-pod-jobs/voltha-2.8.yaml
@@ -47,4 +47,21 @@
           power-switch: true
           power-cycle-olt: true
 
+      # -----------------------------------------------------------------------
+      # flex pod1 test job - released versions: uses tech profile on voltha branch 
+      # md5sum(master): a616cd61a22b0acde95efb1c71b4b980
+      # -----------------------------------------------------------------------
+      - 'build_voltha_pod_test':
+          disable-job: true                     # Reason: qa-testvm-pod offline
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.8'
+          branch: 'voltha-2.8'
+          name-extension: '_TT'
+          work-flow: 'TT'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.8/voltha-tt-physical-functional-tests.groovy'
+          test-repo: 'voltha-system-tests'
+          profile: 'TP'
+
 # [EOF]
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 836dccb..fa71f5c 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -56,53 +56,6 @@
           test-repo: 'voltha-system-tests'
           pipeline-script: 'voltha/master/voltha-tt-physical-functional-tests.groovy'
 
-      # flex pod1 test job - released versions: uses tech profile on voltha branch
-      - 'build_voltha_pod_test':
-          disable-job: false
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          release: 'master'
-          branch: 'master'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          power-switch: true
-          power-cycle-olt: true
-          pipeline-script: 'voltha/master/voltha-tt-physical-functional-tests.groovy'
-          test-repo: 'voltha-system-tests'
-          profile: 'TP'
-          timeout: 360
-
-      # -----------------------------------------------------------------------
-      # flex pod1 test job - released versions: uses tech profile on voltha branch
-      # -----------------------------------------------------------------------
-#      - 'build_voltha_pod_test':
-#          disable-job: true
-#          build-node: 'qa-testvm-pod'
-#          config-pod: 'flex-ocp-cord'
-#          release: '2.8'
-#          branch: 'voltha-2.8'
-#          name-extension: '_TT'
-#          work-flow: 'TT'
-#          power-switch: true
-#          pipeline-script: 'voltha/voltha-2.8/voltha-tt-physical-functional-tests.groovy'
-#          test-repo: 'voltha-system-tests'
-#          profile: 'TP'
-
-      # [VOL-4939] - flex pod1 test job - released versions: uses tech profile on voltha branch
-      - 'build_voltha_pod_test':
-          disable-job: true
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          release: '2.12'
-          branch: 'voltha-2.12'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          power-switch: true
-          pipeline-script: 'voltha/voltha-2.12/voltha-tt-physical-functional-tests.groovy'
-          test-repo: 'voltha-system-tests'
-          profile: 'TP'
-
-      # [CORD-4941] - flex pod1 test job - released versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           disable-job: true
           build-node: 'qa-testvm-pod'