diff --git a/jjb/voltha-test/voltha-release-jobs/README b/jjb/voltha-test/voltha-release-jobs/README
new file mode 100644
index 0000000..8b57f6f
--- /dev/null
+++ b/jjb/voltha-test/voltha-release-jobs/README
@@ -0,0 +1,7 @@
+This directory is used for refactoring and breakup of the kitchen sink
+JJB job yaml template that contains all versioned VOLTHA test stuies.
+
+git branches are not used, all jobs are visible.
+To support modular branch based testing naming conventions that include
+some form of voltha-X.YY will be used within configs and templates to
+support separation of jobs by release branch.
\ No newline at end of file
diff --git a/jjb/voltha-test/voltha-release-jobs/master.yaml b/jjb/voltha-test/voltha-release-jobs/master.yaml
new file mode 100644
index 0000000..5a14850
--- /dev/null
+++ b/jjb/voltha-test/voltha-release-jobs/master.yaml
@@ -0,0 +1,46 @@
+---
+# POD Build Pipeline Jobs for Voltha Releases
+# -----------------------------------------------------------------------
+# Disabled, offline -- 'qa-testvm-pod'
+# NOTE: Remove -master after ci-management/jjb/voltha-test/voltha.yaml
+# -----------------------------------------------------------------------
+- project:
+    name: voltha-release-jobs-master
+
+    project-name: '{name}'
+
+    build-timeout: '300'
+
+    with-kind: false
+    power-switch: false
+    power-cycle-olt: false
+    work-flow: 'ATT'
+    in-band-management: false
+    num-of-openonu: '1'
+    num-of-onos: '1'
+    num-of-atomix: '0'
+    reinstall-olt: true
+    test-type: ''
+    volthaSystemTestsChange: ''
+    kindVolthaChange: ''
+    cordTesterChange: ''
+    oltAdapterAppLabel: 'adapter-open-olt'
+    num-of-onus: ''
+    num-of-ponports: ''
+
+    jobs:
+      # [VOL-4939] - flex OCP pod with olt/onu - 1T4GEM tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
+          disable-job: true
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          branch: 'master'
+          release: 'master'
+          profile: '1T4GEM'
+          time: '1'
+          VolthaEtcdPort: 9999
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          pipeline-script: 'voltha/master/physical-build.groovy'
+
+# [EOF]
diff --git a/jjb/voltha-test/voltha-release-jobs/playground.yaml b/jjb/voltha-test/voltha-release-jobs/playground.yaml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/jjb/voltha-test/voltha-release-jobs/playground.yaml
diff --git a/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml b/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
new file mode 100644
index 0000000..cded815
--- /dev/null
+++ b/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
@@ -0,0 +1,45 @@
+---
+# POD Build Pipeline Jobs for Voltha Releases
+# -----------------------------------------------------------------------
+# Disabled, offline -- 'qa-testvm-pod'
+# -----------------------------------------------------------------------
+- project:
+    name: voltha-release-jobs-2.11
+
+    project-name: '{name}'
+
+    build-timeout: '300'
+
+    with-kind: false
+    power-switch: false
+    power-cycle-olt: false
+    work-flow: 'ATT'
+    in-band-management: false
+    num-of-openonu: '1'
+    num-of-onos: '1'
+    num-of-atomix: '0'
+    reinstall-olt: true
+    test-type: ''
+    volthaSystemTestsChange: ''
+    kindVolthaChange: ''
+    cordTesterChange: ''
+    oltAdapterAppLabel: 'adapter-open-olt'
+    num-of-onus: ''
+    num-of-ponports: ''
+
+    jobs:
+      # [VOL-4939] - flex OCP pod with olt/onu - 1T4GEM tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
+          disable-job: true
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          profile: '1T4GEM'
+          time: '1'
+          VolthaEtcdPort: 9999
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+
+# [EOF]
diff --git a/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml b/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
new file mode 100644
index 0000000..dd30f22
--- /dev/null
+++ b/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
@@ -0,0 +1,45 @@
+---
+# POD Build Pipeline Jobs for Voltha Releases
+# -----------------------------------------------------------------------
+# Disabled, offline -- 'qa-testvm-pod'
+# -----------------------------------------------------------------------
+- project:
+    name: voltha-release-jobs-2.12
+
+    project-name: '{name}'
+
+    build-timeout: '300'
+
+    with-kind: false
+    power-switch: false
+    power-cycle-olt: false
+    work-flow: 'ATT'
+    in-band-management: false
+    num-of-openonu: '1'
+    num-of-onos: '1'
+    num-of-atomix: '0'
+    reinstall-olt: true
+    test-type: ''
+    volthaSystemTestsChange: ''
+    kindVolthaChange: ''
+    cordTesterChange: ''
+    oltAdapterAppLabel: 'adapter-open-olt'
+    num-of-onus: ''
+    num-of-ponports: ''
+
+    jobs:
+      # [VOL-4939] - flex OCP pod with olt/onu - 1T4GEM tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
+          disable-job: true
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.12'
+          branch: 'voltha-2.12'
+          profile: '1T4GEM'
+          time: '1'
+          VolthaEtcdPort: 9999
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
+
+# [EOF]
diff --git a/jjb/voltha-test/voltha-release-jobs/voltha-2.8.yaml b/jjb/voltha-test/voltha-release-jobs/voltha-2.8.yaml
new file mode 100644
index 0000000..cf4a57b
--- /dev/null
+++ b/jjb/voltha-test/voltha-release-jobs/voltha-2.8.yaml
@@ -0,0 +1,45 @@
+---
+# POD Build Pipeline Jobs for Voltha Releases
+# -----------------------------------------------------------------------
+# Disabled, offline -- 'qa-testvm-pod'
+# -----------------------------------------------------------------------
+- project:
+    name: voltha-release-jobs-2.8
+
+    project-name: '{name}'
+
+    build-timeout: '300'
+
+    with-kind: false
+    power-switch: false
+    power-cycle-olt: false
+    work-flow: 'ATT'
+    in-band-management: false
+    num-of-openonu: '1'
+    num-of-onos: '1'
+    num-of-atomix: '0'
+    reinstall-olt: true
+    test-type: ''
+    volthaSystemTestsChange: ''
+    kindVolthaChange: ''
+    cordTesterChange: ''
+    oltAdapterAppLabel: 'adapter-open-olt'
+    num-of-onus: ''
+    num-of-ponports: ''
+
+    jobs:
+      # [VOL-4939] - flex OCP pod with olt/onu - 1T4GEM tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
+          disable-job: true
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.8'
+          branch: 'voltha-2.8'
+          profile: '1T4GEM'
+          time: '1'
+          VolthaEtcdPort: 9999
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
+
+# [EOF]
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 2186099..8b8c70f 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -41,7 +41,7 @@
           profile: 'TP'
           name-extension: '_TT'
           work-flow: 'TT'
-
+# ZZ
       # flex pod1 test job - using voltha branch
       - 'build_voltha_pod_manual_test':
           disable-job: false
@@ -66,7 +66,7 @@
           VolthaEtcdPort: 9999
           num-of-onos: '3'
           num-of-atomix: '3'
-
+# ZZ
       # flex pod1 test job - uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           disable-job: false
@@ -80,32 +80,33 @@
           profile: 'Default'
 
       # [VOL-4939] - flex OCP pod with olt/onu - 1T4GEM tech profile and timer based job
-      - 'build_voltha_pod_release_timer':
-          disable-job: true
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          release: '2.11'
-          branch: 'voltha-2.11'
-          profile: '1T4GEM'
-          time: '1'
-          VolthaEtcdPort: 9999
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+#      - 'build_voltha_pod_release_timer':
+#          disable-job: true
+#          build-node: 'qa-testvm-pod'
+#          config-pod: 'flex-ocp-cord'
+#          release: '2.11'
+#          branch: 'voltha-2.11'
+#          profile: '1T4GEM'
+#          time: '1'
+#          VolthaEtcdPort: 9999
+#          num-of-onos: '3'
+#          num-of-atomix: '3'
+#          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
 
+    ## ZZ
       # [VOL-4939] - flex OCP pod with olt/onu - 1T4GEM tech profile and timer based job
-      - 'build_voltha_pod_release_timer':
-          disable-job: true
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          release: '2.8'
-          branch: 'voltha-2.8'
-          profile: '1T4GEM'
-          time: '1'
-          VolthaEtcdPort: 9999
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
+#      - 'build_voltha_pod_release_timer':
+#          disable-job: true
+#          build-node: 'qa-testvm-pod'
+#          config-pod: 'flex-ocp-cord'
+#          release: '2.8'
+#          branch: 'voltha-2.8'
+#          profile: '1T4GEM'
+#          time: '1'
+#          VolthaEtcdPort: 9999
+#          num-of-onos: '3'
+#          num-of-atomix: '3'
+#          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
 
       # flex pod1 test job - released versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':