diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 6a3f507..1703838 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -333,78 +333,6 @@
           result: 'success'
 
 - job-template:
-    name: 'build_{profile}_{config-pod}_{branch}_post_actions'
-    id: post_build_actions
-    description: |
-                  Post Actions on {config-pod} triggered by build_{config-pod}_{branch}, using {Jenkinsfile} <br />
-                  Service ofagent restart required <br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
-                  Created by Kailash Khalasi - kailash@opennetworking.org <br />
-                  Copyright (c) 2017 Open Networking Foundation (ONF)
-
-    <<: *test-pipe-job-boiler-plate
-
-    parameters:
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: TestNodeName
-          default: '{build-node}'
-          description: 'DEPRECATED - use buildNode instead'
-
-      - string:
-          name: cordRepoUrl
-          default: '{gerrit-server-url}'
-          description: 'The URL of the CORD Project repository'
-
-      - string:
-          name: configBaseDir
-          default: 'pod-configs'
-          description: 'The directory inside the POD configs repository'
-
-      - string:
-          name: configDeploymentDir
-          default: 'deployment-configs'
-          description: 'The deployment configs folder'
-
-      - string:
-          name: configKubernetesDir
-          default: 'kubernetes-configs'
-          description: 'The kubernetes config folder'
-
-      - string:
-          name: configFileName
-          default: '{config-pod}'
-          description: 'The config file'
-
-      - string:
-          name: branch
-          default: '{branch}'
-
-      - string:
-          name: notificationEmail
-          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-          description: ''
-
-    concurrent: true
-
-    pipeline-scm:
-      script-path: '{Jenkinsfile}'
-      scm:
-        - git:
-            url: '{gerrit-server-url}/cord-tester'
-            branches:
-              - '{branch}'
-
-    triggers:
-      - reverse:
-          jobs: 'build_{profile}_{config-pod}_{branch}'
-          result: 'failure'
-
-- job-template:
     name: 'build_{config-pod}_seba_release_{release}'
     id: build_pod_manual_release
     description: |
@@ -845,230 +773,3 @@
             url: '{gerrit-server-url}/cord-tester'
             branches:
               - '{branch}'
-
-- job-template:
-    name: 'build_{config-pod}_{profile}{name-extension}_voltha_{release}'
-    id: build_voltha_pod_release
-    description: |
-                  Manual Build on POD {config-pod}, using {Jenkinsfile} <br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
-                  Created by QA (Suchitra Vemuri - suchitra@opennetworking.org ) <br />
-                  Copyright (c) 2018 Open Networking Foundation (ONF)
-
-    <<: *test-pipe-job-boiler-plate
-    VolthaEtcdPort: '2379'
-
-    parameters:
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: TestNodeName
-          default: '{build-node}'
-          description: 'DEPRECATED - use buildNode instead'
-
-      - string:
-          name: cordRepoUrl
-          default: '{gerrit-server-url}'
-          description: 'The URL of the CORD Project repository'
-
-      - string:
-          name: configBaseDir
-          default: 'pod-configs'
-          description: 'The directory inside the POD configs repository'
-
-      - string:
-          name: configDeploymentDir
-          default: 'deployment-configs'
-          description: 'The deployment configs folder'
-
-      - string:
-          name: configKubernetesDir
-          default: 'kubernetes-configs'
-          description: 'The kubernetes config folder'
-
-      - string:
-          name: configToscaDir
-          default: 'tosca-configs'
-          description: 'The tosca config folder'
-
-      - string:
-          name: configFileName
-          default: '{config-pod}'
-          description: 'The config file'
-
-      - string:
-          name: profile
-          default: '{profile}'
-          description: 'Technology Profile pushed to the ETCD'
-
-      - string:
-          name: helmRepoUrl
-          default: 'https://charts.opencord.org'
-          description: 'URL where helm-charts are published'
-
-      - string:
-          name: branch
-          default: '{branch}'
-
-      - string:
-          name: notificationEmail
-          default: 'you@opennetworking.org, suchitra@opennetworking.org'
-          description: ''
-
-      - string:
-          name: workFlow
-          default: '{work-flow}'
-          description: 'Installs and uses the specified work flow on the POD'
-
-      - string:
-          name: NumOfOpenOnu
-          default: '{num-of-openonu}'
-          description: 'Installs the specified Number of OpenOnu Adapters'
-
-      - string:
-          name: NumOfOnos
-          default: '{num-of-onos}'
-          description: 'Installs the specified Number of ONOS instances'
-
-      - string:
-          name: NumOfAtomix
-          default: '{num-of-atomix}'
-          description: 'Installs the specified Number of Atomix Instances'
-
-      - bool:
-          name: configurePod
-          default: true
-          description: "Configure POD via TOSCA post build"
-
-      - bool:
-          name: reinstallOlt
-          default: '{reinstall-olt}'
-          description: "Re-install olt software bringing up CORD"
-
-      - bool:
-          name: withKind
-          default: '{with-kind}'
-          description: "The pods uses kind and a physical fabric thus port forward to the management is needed"
-
-      - string:
-          name: VolthaEtcdPort
-          default: '{VolthaEtcdPort}'
-          description: 'Localhost port that is forwarded to VOLTHA etcd'
-
-      - bool:
-          name: inBandManagement
-          default: '{in-band-management}'
-          description: 'Indicates whether POD is configured for in band management'
-
-    concurrent: true
-
-    pipeline-scm:
-      script-path: '{Jenkinsfile}'
-      scm:
-        - git:
-            url: '{gerrit-server-url}/voltha-system-tests'
-            branches:
-              - '{branch}'
-
-    triggers:
-      - timed: |
-                 TZ=America/Los_Angeles
-                 H {time} * * *
-
-- job-template:
-    name: 'build_{config-pod}_{profile}_voltha{name-extension}_{release}_test'
-    id: build_voltha_pod_test
-    description: |
-                  Post Tests on {config-pod} triggered by build_{config-pod}_{branch}, using {pipeline-script}<br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
-                  Created by Suchitra Vemuri, suchitra@opennetworking.org <br />
-                  Copyright (c) 2017 Open Networking Foundation (ONF)
-
-    <<: *test-pipe-job-boiler-plate
-    pipeline-script: 'voltha-physical-functional-tests.groovy'
-    manifest-url: 'https://gerrit.opencord.org/voltha-test-manifest.git'
-    manifest-branch: 'master'
-
-    parameters:
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: TestNodeName
-          default: '{build-node}'
-          description: 'DEPRECATED - use buildNode instead'
-
-      - string:
-          name: cordRepoUrl
-          default: '{gerrit-server-url}'
-          description: 'The URL of the CORD Project repository'
-
-      - string:
-          name: configBaseDir
-          default: 'pod-configs'
-          description: 'The directory inside the POD configs repository'
-
-      - string:
-          name: configDeploymentDir
-          default: 'deployment-configs'
-          description: 'The deployment configs folder'
-
-      - string:
-          name: configKubernetesDir
-          default: 'kubernetes-configs'
-          description: 'The kubernetes config folder'
-
-      - string:
-          name: configToscaDir
-          default: 'tosca-configs'
-          description: 'The tosca config folder'
-
-      - string:
-          name: configFileName
-          default: '{config-pod}'
-          description: 'The config file'
-
-      - string:
-          name: profile
-          default: '{profile}'
-          description: 'Technology Profile pushed to the ETCD'
-
-      - string:
-          name: branch
-          default: '{branch}'
-          description: 'Branch of the test libraries to check out'
-
-      - string:
-          name: manifestUrl
-          default: '{manifest-url}'
-          description: 'Repo manifest URL for code checkout (so we can display changes in Jenkins)'
-
-      - string:
-          name: manifestBranch
-          default: '{manifest-branch}'
-          description: 'Repo manifest branch for code checkout (so we can display changes in Jenkins)'
-
-      - string:
-          name: workFlow
-          default: '{work-flow}'
-          description: 'Installs and uses the specified work flow on the POD'
-
-      - bool:
-          name: powerSwitch
-          default: '{power-switch}'
-          description: "Indicate whether POD has power switch to reboot ONUs/OLT remotely"
-
-    concurrent: true
-
-    project-type: pipeline
-    dsl: !include-raw-escape: ../pipeline/{pipeline-script}
-
-    triggers:
-      - reverse:
-          jobs: 'build_{config-pod}_{profile}{name-extension}_voltha_{release}'
-          result: 'success'
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index cad57d9..73f9d3c 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -60,7 +60,7 @@
           Jenkinsfile: 'Jenkinsfile-voltha-test'
 
       # flex OCP pod with olt/onu - Default tech profile and timer based job
-      - 'build_voltha_pod_release':
+      - 'build_voltha_pod_release_timer':
           build-node: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
           release: 'master'
@@ -85,7 +85,7 @@
           profile: 'Default'
 
       # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
-      - 'build_voltha_pod_release':
+      - 'build_voltha_pod_release_timer':
           build-node: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
           release: '2.4'
@@ -110,7 +110,7 @@
           profile: '1T4GEM'
 
      # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
-      - 'build_voltha_pod_release':
+      - 'build_voltha_pod_release_timer':
           build-node: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
           release: '2.4'
@@ -140,7 +140,7 @@
           profile: 'TP'
 
     # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
-      - 'build_voltha_pod_release':
+      - 'build_voltha_pod_release_timer':
           build-node: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
           release: 'master'
@@ -169,8 +169,36 @@
           test-repo: 'voltha-system-tests'
           profile: 'TP'
 
+      # Menlo pod with olt/onu - Default tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
+          build-node: 'menlo-demo-pod'
+          config-pod: 'onf-demo-pod-gpon'
+          release: 'master'
+          branch: 'master'
+          num-of-openonu: '2'
+          name-extension: '_DT_GPON'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          Jenkinsfile: 'Jenkinsfile-voltha-build'
+          configurePod: true
+          profile: '1T8GEM'
+          time: '22'
+          VolthaEtcdPort: '9999'
+
+      # Menlo pod test job - uses tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          build-node: 'menlo-demo-pod'
+          config-pod: 'onf-demo-pod-gpon'
+          release: 'master'
+          branch: 'master'
+          name-extension: '_DT_GPON'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
+
       # Menlo pod with olt/onu - 1T4GEM tech profile and timer based job
-      - 'build_voltha_pod_release':
+      - 'build_voltha_pod_release_dependent':
           build-node: 'menlo-demo-pod'
           config-pod: 'onf-demo-pod'
           release: 'master'
@@ -182,10 +210,10 @@
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           configurePod: true
           profile: '1T4GEM'
-          time: '1'
           in-band-management: true
           VolthaEtcdPort: '9999'
           reinstall-olt: false
+          trigger-after: build_onf-demo-pod_Default_voltha_2.4_test
 
       # Menlo pod test job - master test job uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -198,7 +226,7 @@
           power-switch: True
 
       # Menlo pod with olt/onu - master branch,  Default tech profile and timer based job
-      - 'build_voltha_pod_release':
+      - 'build_voltha_pod_release_dependent':
           build-node: 'menlo-demo-pod'
           config-pod: 'onf-demo-pod'
           release: 'master'
@@ -210,10 +238,10 @@
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           configurePod: true
           profile: '1T8GEM'
-          time: '4'
           VolthaEtcdPort: '9999'
           in-band-management: true
           reinstall-olt: false
+          trigger-after: build_onf-demo-pod_1T4GEM_voltha_master_test
 
       # Menlo pod test job - uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -230,7 +258,7 @@
 
 
       # Menlo pod with olt/onu - voltha-2.4  branch,  Default tech profile and timer based job
-      - 'build_voltha_pod_release':
+      - 'build_voltha_pod_release_dependent':
           build-node: 'menlo-demo-pod'
           config-pod: 'onf-demo-pod'
           release: '2.4'
@@ -244,10 +272,10 @@
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           configurePod: true
           profile: '1T8GEM'
-          time: '7'
           VolthaEtcdPort: '9999'
           reinstall-olt: false
           in-band-management: true
+          trigger-after: build_onf-demo-pod_1T8GEM_DT_voltha_master_test
 
       # Menlo pod test job - uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -262,35 +290,6 @@
           pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
           power-switch: True
 
-      # Menlo pod with olt/onu - master branch, 1T8GEM tech profile and timer based job
-      -   'build_voltha_pod_release':
-              build-node: 'menlo-demo-pod'
-              config-pod: 'onf-demo-pod-gpon'
-              release: 'master'
-              branch: 'master'
-              num-of-openonu: '2'
-              name-extension: '_DT_GPON'
-              work-flow: 'DT'
-              test-repo: 'voltha-system-tests'
-              Jenkinsfile: 'Jenkinsfile-voltha-build'
-              configurePod: true
-              profile: '1T8GEM'
-              time: '22'
-              VolthaEtcdPort: '9999'
-
-      # Menlo pod test job - uses 1T8GEM tech profile on master voltha branch
-      -   'build_voltha_pod_test':
-              build-node: 'menlo-demo-pod'
-              config-pod: 'onf-demo-pod-gpon'
-              release: 'master'
-              branch: 'master'
-              name-extension: '_DT_GPON'
-              work-flow: 'DT'
-              test-repo: 'voltha-system-tests'
-              profile: '1T8GEM'
-              pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
-
-
       # Menlo DEMO-POD - 1 1TCONT 4 4GEMs TechProfile - Manual build and test job
       - 'build_pod_manual':
           build-node: 'menlo-demo-pod'
@@ -340,6 +339,7 @@
           Jenkinsfile: 'Jenkinsfile-voltha-test'
 
       # ONF Menlo Soak POD build job - voltha-master branch
+      # FIXME once the soak-pod is back use 'build_voltha_pod_release_timer'
       - 'build_pod_manual':
           build-node: 'menlo-soak-pod'
           config-pod: 'onf-soak-pod'
@@ -351,6 +351,7 @@
           profile: 'Default'
 
       # ONF Menlo Soak POD test job - voltha-master branch
+      # FIXME once the soak-pod is back use 'build_voltha_pod_test'
       - 'build_pod_test':
           build-node: 'menlo-soak-pod'
           config-pod: 'onf-soak-pod'
@@ -360,7 +361,7 @@
           Jenkinsfile: 'Jenkinsfile-voltha-test'
 
       # Infosys pod with olt/onu - Default tech profile and timer based job
-      - 'build_voltha_pod_release':
+      - 'build_voltha_pod_release_timer':
           build-node: 'infosys-test-pod'
           config-pod: 'infosys-pod'
           release: 'master'
@@ -381,7 +382,7 @@
           profile: 'Default'
 
      # Infosys pod with olt/onu - voltha-2.4 Default tech profile and timer based job
-      - 'build_voltha_pod_release':
+      - 'build_voltha_pod_release_timer':
           build-node: 'infosys-test-pod'
           config-pod: 'infosys-pod'
           release: '2.4'
@@ -422,7 +423,7 @@
           Jenkinsfile: 'Jenkinsfile-voltha-test'
 
       # Berlin pod with olt/onu - master versions Default tech profile and timer based job
-      - 'build_voltha_pod_release':
+      - 'build_voltha_pod_release_timer':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod'
           release: 'master'
@@ -449,7 +450,7 @@
           power-switch: True
 
      # Berlin pod with olt/onu - voltha-2.4 Default tech profile and timer based job
-      - 'build_voltha_pod_release':
+      - 'build_voltha_pod_release_timer':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod'
           release: '2.4'
@@ -476,7 +477,7 @@
           power-switch: True
 
       # Berlin pod with gpon olt/onu - master 1T8GEM tech profile and timer based job
-      - 'build_voltha_pod_release':
+      - 'build_voltha_pod_release_timer':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod-gpon'
           release: 'master'
@@ -508,7 +509,7 @@
           pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
 
      # Berlin pod with gpon olt/onu - voltha-2.4 1T8GEM tech profile and timer based job
-      - 'build_voltha_pod_release':
+      - 'build_voltha_pod_release_timer':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod-gpon'
           release: '2.4'
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 7b240bc..d0c9795 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -230,7 +230,7 @@
           ofAgentImg: ''
           openoltAdapterImg: matteoscandolo/voltha-openolt-adapter:per-gem-lock
           openonuAdapterImg: ''
-          onosImg: andreacampanella/voltha-onos:eapol-retry
+          onosImg: ''
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-voltha-2.4-2-16-32-dt-subscribers'
@@ -257,7 +257,7 @@
           ofAgentImg: ''
           openoltAdapterImg: matteoscandolo/voltha-openolt-adapter:per-gem-lock
           openonuAdapterImg: ''
-          onosImg: andreacampanella/voltha-onos:eapol-retry
+          onosImg: ''
 
       # development pipeline
       - 'voltha-scale-measurements-dev':
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
new file mode 100644
index 0000000..5ed127a
--- /dev/null
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -0,0 +1,279 @@
+---
+# list of parameters for the VOLTHA Jobs,
+# used as anchor so that can be shared across multiple jobs
+# to use in a job: `parameters: *voltha-build-job-parameters`
+- voltha-build-job-parameters: &voltha-build-job-parameters
+    name: voltha-build-job-parameters
+    parameters:
+      - string:
+          name: buildNode
+          default: '{build-node}'
+          description: 'Name of the Jenkins executor node to run the job on'
+
+      - string:
+          name: TestNodeName
+          default: '{build-node}'
+          description: 'DEPRECATED - use buildNode instead'
+
+      - string:
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
+
+      - string:
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
+
+      - string:
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
+
+      - string:
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
+
+      - string:
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
+
+      - string:
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
+
+      - string:
+          name: profile
+          default: '{profile}'
+          description: 'Technology Profile pushed to the ETCD'
+
+      - string:
+          name: helmRepoUrl
+          default: 'https://charts.opencord.org'
+          description: 'URL where helm-charts are published'
+
+      - string:
+          name: branch
+          default: '{branch}'
+
+      - string:
+          name: notificationEmail
+          default: 'you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
+
+      - string:
+          name: workFlow
+          default: '{work-flow}'
+          description: 'Installs and uses the specified work flow on the POD'
+
+      - string:
+          name: NumOfOpenOnu
+          default: '{num-of-openonu}'
+          description: 'Installs the specified Number of OpenOnu Adapters'
+
+      - string:
+          name: NumOfOnos
+          default: '{num-of-onos}'
+          description: 'Installs the specified Number of ONOS instances'
+
+      - string:
+          name: NumOfAtomix
+          default: '{num-of-atomix}'
+          description: 'Installs the specified Number of Atomix Instances'
+
+      - bool:
+          name: configurePod
+          default: true
+          description: "Configure POD via TOSCA post build"
+
+      - bool:
+          name: reinstallOlt
+          default: '{reinstall-olt}'
+          description: "Re-install olt software bringing up CORD"
+
+      - bool:
+          name: withKind
+          default: '{with-kind}'
+          description: "The pods uses kind and a physical fabric thus port forward to the management is needed"
+
+      - string:
+          name: VolthaEtcdPort
+          default: '{VolthaEtcdPort}'
+          description: 'Localhost port that is forwarded to VOLTHA etcd'
+
+      - bool:
+          name: inBandManagement
+          default: '{in-band-management}'
+          description: 'Indicates whether POD is configured for in band management'
+
+# defualt properties for the VOLTHA scale jobs
+- voltha-pipe-job-boiler-plate: &voltha-pipe-job-boiler-plate
+    name: voltha-pipe-job-boiler-plate
+
+    project-type: pipeline
+
+    sandbox: true
+
+    properties:
+      - cord-infra-properties:
+          build-days-to-keep: 30
+          artifact-num-to-keep: 15
+
+# VOLTHA Build Jobs
+- job-template:
+    name: 'build_{config-pod}_{profile}{name-extension}_voltha_{release}'
+    id: build_voltha_pod_release_timer
+    description: |
+                  Manual Build on POD {config-pod}, using {Jenkinsfile} in {gerrit-server-url}/voltha-system-tests' <br /><br />
+                  Created from job-template {id} from ci-management/jjb/voltha-test/voltha-nightly-jobs.yaml <br />
+                  Created by QA (Suchitra Vemuri - suchitra@opennetworking.org ) <br />
+                  Copyright (c) 2018 Open Networking Foundation (ONF)
+
+    <<: *voltha-pipe-job-boiler-plate
+    VolthaEtcdPort: '2379'
+
+    <<: *voltha-build-job-parameters
+
+    concurrent: true
+
+    pipeline-scm:
+      script-path: '{Jenkinsfile}'
+      scm:
+        - git:
+            url: '{gerrit-server-url}/voltha-system-tests'
+            branches:
+              - '{branch}'
+
+    triggers:
+      - timed: |
+                 TZ=America/Los_Angeles
+                 H {time} * * *
+
+- job-template:
+    name: 'build_{config-pod}_{profile}{name-extension}_voltha_{release}'
+    id: build_voltha_pod_release_dependent
+    description: |
+                  Automatic Build on POD {config-pod}, using {Jenkinsfile} in {gerrit-server-url}/voltha-system-tests' <br /><br />
+                  Created from job-template {id} from ci-management/jjb/voltha-test/voltha-nightly-jobs.yaml <br />
+                  Created by QA (Suchitra Vemuri - suchitra@opennetworking.org ) <br />
+                  This job is triggered upon completion of a dependent _test job <br />
+                  Copyright (c) 2020 Open Networking Foundation (ONF)
+
+    <<: *voltha-pipe-job-boiler-plate
+    VolthaEtcdPort: '2379'
+
+    <<: *voltha-build-job-parameters
+
+    concurrent: true
+
+    pipeline-scm:
+      script-path: '{Jenkinsfile}'
+      scm:
+        - git:
+            url: '{gerrit-server-url}/voltha-system-tests'
+            branches:
+              - '{branch}'
+    triggers:
+      - reverse:
+          jobs: '{trigger-after}'
+          result: 'success'
+
+# VOLTHA Test Job
+# This job is automatically triggered after a build job has successfully completed
+- job-template:
+    name: 'build_{config-pod}_{profile}_voltha{name-extension}_{release}_test'
+    id: build_voltha_pod_test
+    description: |
+                  Post Tests on {config-pod} triggered by build_{config-pod}_{branch}, using {pipeline-script}<br /><br />
+                  Created from job-template {id} from ci-management/jjb/voltha-test/voltha-nightly-jobs.yaml <br />
+                  Created by Suchitra Vemuri, suchitra@opennetworking.org <br />
+                  Copyright (c) 2017 Open Networking Foundation (ONF)
+
+    <<: *voltha-pipe-job-boiler-plate
+    pipeline-script: 'voltha-physical-functional-tests.groovy'
+    manifest-url: 'https://gerrit.opencord.org/voltha-test-manifest.git'
+    manifest-branch: 'master'
+
+    parameters:
+      - string:
+          name: buildNode
+          default: '{build-node}'
+          description: 'Name of the Jenkins executor node to run the job on'
+
+      - string:
+          name: TestNodeName
+          default: '{build-node}'
+          description: 'DEPRECATED - use buildNode instead'
+
+      - string:
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
+
+      - string:
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
+
+      - string:
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
+
+      - string:
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
+
+      - string:
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
+
+      - string:
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
+
+      - string:
+          name: profile
+          default: '{profile}'
+          description: 'Technology Profile pushed to the ETCD'
+
+      - string:
+          name: branch
+          default: '{branch}'
+          description: 'Branch of the test libraries to check out'
+
+      - string:
+          name: manifestUrl
+          default: '{manifest-url}'
+          description: 'Repo manifest URL for code checkout (so we can display changes in Jenkins)'
+
+      - string:
+          name: manifestBranch
+          default: '{manifest-branch}'
+          description: 'Repo manifest branch for code checkout (so we can display changes in Jenkins)'
+
+      - string:
+          name: workFlow
+          default: '{work-flow}'
+          description: 'Installs and uses the specified work flow on the POD'
+
+      - bool:
+          name: powerSwitch
+          default: '{power-switch}'
+          description: "Indicate whether POD has power switch to reboot ONUs/OLT remotely"
+
+    concurrent: true
+
+    project-type: pipeline
+    dsl: !include-raw-escape: ../pipeline/{pipeline-script}
+
+    triggers:
+      - reverse:
+          jobs: 'build_{config-pod}_{profile}{name-extension}_voltha_{release}'
+          result: 'success'