diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index c0f957c..ac9258d 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -836,7 +836,7 @@
               - '{branch}'
 
 - job-template:
-    name: 'build_{config-pod}_{profile}_voltha_{release}'
+    name: 'build_{config-pod}_{profile}{name-extension}_voltha_{release}'
     id: build_voltha_pod_release
     description: |
                   <!-- Managed by Jenkins Job Builder -->
@@ -938,6 +938,11 @@
           default: '{with-kind}'
           description: "The pods uses kind and a physical fabric thus port forward to the management is needed"
 
+      - bool:
+          name: ofagentGo
+          default: '{use-ofagent-go}'
+          description: "Installs POD with go version when true"
+
     concurrent: true
 
     pipeline-scm:
@@ -954,7 +959,7 @@
                  H {time} * * *
 
 - job-template:
-    name: 'build_{config-pod}_{profile}_voltha_{release}_test'
+    name: 'build_{config-pod}_{profile}_voltha{name-extension}_{release}_test'
     id: build_voltha_pod_test
     description: |
                   <!-- Managed by Jenkins Job Builder -->
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index e94c8a0..192e4df 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -9,6 +9,7 @@
     build-timeout: '300'
 
     with-kind: false
+    use-ofagent-go: false
     onos-version: '2.2'
     power-switch: False
 
@@ -189,12 +190,66 @@
           profile: '1T4GEM-bal31'
           time: '4'
 
+      # Menlo pod test job - master test job uses tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          build-node: 'menlo-demo-pod'
+          config-pod: 'onf-demo-pod'
+          release: 'master'
+          branch: 'master'
+          released: false
+          test-repo: 'voltha-system-tests'
+          profile: '1T4GEM-bal31'
+
+      # Menlo pod with olt/onu - Uses GO Version - Default tech profile and timer based job
+      - 'build_voltha_pod_release':
+          build-node: 'menlo-demo-pod'
+          config-pod: 'onf-demo-pod'
+          release: 'master'
+          branch: 'master'
+          name-extension: '_GO'
+          use-ofagent-go: true
+          released: false
+          test-repo: 'voltha-system-tests'
+          Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
+          oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
+          configurePod: true
+          profile: 'Default'
+          time: '6'
+
       # Menlo pod test job - uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           build-node: 'menlo-demo-pod'
           config-pod: 'onf-demo-pod'
           release: 'master'
           branch: 'master'
+          name-extension: '_GO'
+          released: false
+          test-repo: 'voltha-system-tests'
+          profile: 'Default'
+
+      # Menlo pod with olt/onu - Uses GO Version - Default tech profile and timer based job
+      - 'build_voltha_pod_release':
+          build-node: 'menlo-demo-pod'
+          config-pod: 'onf-demo-pod'
+          release: 'master'
+          branch: 'master'
+          name-extension: '_GO'
+          use-ofagent-go: true
+          released: false
+          test-repo: 'voltha-system-tests'
+          Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
+          oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
+          configurePod: true
+          profile: '1T4GEM-bal31'
+          time: '8'
+
+      # Menlo pod test job - uses tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          build-node: 'menlo-demo-pod'
+          config-pod: 'onf-demo-pod'
+          release: 'master'
+          branch: 'master'
+          name-extension: '_GO'
           released: false
           test-repo: 'voltha-system-tests'
           profile: '1T4GEM-bal31'