diff --git a/jjb/bbsim-validation.yaml b/jjb/bbsim-validation.yaml
index 831ba42..7b58804 100644
--- a/jjb/bbsim-validation.yaml
+++ b/jjb/bbsim-validation.yaml
@@ -7,11 +7,82 @@
     project-name: '{name}'
 
     jobs:
-      - 'bbsim-validation'
+      - 'bbsim-validation-voltha-1.6'
+      - 'bbsim-validation-master'
 
 - job-template:
-    id: 'bbsim-validation'
-    name: 'BBSIM-Validation'
+    id: 'bbsim-validation-voltha-1.6'
+    name: 'BBSIM-Validation-Voltha-1.6'
+
+    description: |
+      <!-- Managed by Jenkins Job Builder -->
+      Created by {id} job-template from ci-management/jjb/bbsim-validation.yaml  <br /><br />
+      Tests run for validation of BBSIM. Tests reside in the helm chart template
+
+    properties:
+      - cord-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+          artifact-num-to-keep: '{artifact-num-to-keep}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    parameters:
+      - string:
+         name: executorNode
+         default: 'qct-pod2-node1'
+         description: 'Name of the Jenkins node to run the job on'
+
+      - string:
+         name: manifestUrl
+         default: '{gerrit-server-url}/{cord-repo-manifest}'
+         description: 'URL to the repo manifest'
+
+      - string:
+         name: manifestBranch
+         default: 'master'
+         description: 'Name of the repo branch to use'
+
+      - string:
+         name: deploymentConfig
+         default: 'bbsim-voltha-1.6.yml'
+         description: 'kubernetes configurations file'
+
+      - string:
+         name: OnuCount
+         default: '16'
+         description: 'Number of ONUs per pon port'
+
+      - string:
+         name: EmulationMode
+         default: '--set emulation_mode=default'
+         description: 'Emulation for BBSIM (both|aaa|default)'
+
+      - string:
+         name: TestTags
+         default: ''
+         description: 'Tests to include/exclude. eg "-e serviceinstances"'
+
+      - string:
+         name: TestTimeout
+         default: '300s'
+         description: 'timeout for each test case (increase as you scale up)'
+
+      - string:
+         name: ArchiveLogs
+         default: false
+         description: 'Archive all pod logs after test run. Default to false as logs are very large'
+
+    project-type: pipeline
+    concurrent: false
+
+    dsl: !include-raw-escape: pipeline/bbsim-validation.groovy
+
+- job-template:
+    id: 'bbsim-validation-master'
+    name: 'BBSIM-Validation-Voltha-master'
 
     description: |
       <!-- Managed by Jenkins Job Builder -->
@@ -60,10 +131,20 @@
          description: 'Emulation for BBSIM (both|aaa|default)'
 
       - string:
+         name: TestTags
+         default: ''
+         description: 'Tests to include/exclude. eg "-e serviceinstances"'
+
+      - string:
          name: TestTimeout
          default: '300s'
          description: 'timeout for each test case (increase as you scale up)'
 
+      - string:
+         name: ArchiveLogs
+         default: false
+         description: 'Archive all pod logs after test run. Default to false as logs are very large'
+
     project-type: pipeline
     concurrent: false