diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index d2240d1..2d80769 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -862,11 +862,6 @@
           default: 'you@opennetworking.org, suchitra@opennetworking.org'
           description: ''
 
-      - string:
-          name: onosVersion
-          default: '{onos-version}'
-          description: 'ONOS version that needs to be configured'
-
       - bool:
           name: released
           default: '{released}'
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index dabe712..2f15a5a 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -8,7 +8,6 @@
 
     build-timeout: '300'
 
-    onos-version: '1.13.9'
     with-kind: false
 
     jobs:
@@ -58,7 +57,6 @@
           config-pod: 'flex-ocp-cord'
           release: 'master'
           branch: 'master'
-          onos-version: '2.2'
           released: false
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
@@ -84,7 +82,6 @@
           release: 'master'
           branch: 'master'
           released: false
-          onos-version: '2.2'
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
           oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
@@ -132,7 +129,6 @@
           config-pod: 'onf-demo-pod'
           release: 'master'
           branch: 'master'
-          onos-version: '1.13.10'
           released: false
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
@@ -181,7 +177,6 @@
           config-pod: 'onf-demo-pod'
           release: 'master'
           branch: 'master'
-          onos-version: '1.13.10'
           released: false
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
@@ -206,7 +201,6 @@
           config-pod: 'onf-demo-pod'
           release: 'master'
           branch: 'master'
-          onos-version: '1.13.10'
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
           oltDebVersion: 'openolt_asfvolt16.deb'
@@ -291,4 +285,3 @@
           released: true
           test-repo: 'voltha-system-tests'
           profile: 'Default'
-
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 9754d0d..9699b23 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -193,8 +193,3 @@
     # maintainers
     # Used to notify users in supported tests
     maintainers: 'zdw@opennetworking.org'
-
-    # onos version
-    # is used by the voltha-bbsim-tests.groovy and physical pod pipelines to
-    # know which sadis config needs to be pushed
-    onos-version: '1.13.9'
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 86b88ef..c82501b 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -151,20 +151,6 @@
       }
     }
 
-    stage('ONOS Config') {
-      steps {
-        sh '''
-          if [[ ${onosVersion} == "1.13.10" ]]; then
-            sshpass -p karaf ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 "cfg set org.opencord.olt.impl.OltFlowService enableDhcpOnProvisioning true"
-            sshpass -p karaf ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 "cfg set org.opencord.olt.impl.OltFlowService enableDhcpV4 true"
-            sshpass -p karaf ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 "cfg set org.opencord.olt.impl.OltFlowService enableEapol true"
-        else
-            echo "Using kind-voltha defaults"
-        fi
-        '''
-      }
-    }
-
     stage('Run E2E Tests') {
       steps {
         sh '''
@@ -182,10 +168,6 @@
              TEST_TAGS=sanityORfunctional
            fi
 
-           if [[ ${onosVersion} == "1.13.10" ]]; then
-              ROBOT_MISC_ARGS+=" -v sadis.file:../data/onos-sadis-bbsim-new-apps.json"
-           fi
-
            make -C $WORKSPACE/voltha/voltha-system-tests single-kind || true
            '''
       }
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index 9f1672d..7d426ca 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -6,18 +6,13 @@
     project: '{name}'
 
     jobs:
-      - 'verify-voltha-onos-jobs-common':
+      - 'verify-voltha-onos-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'verify-voltha-onos-jobs-master':
-          branch-regexp: 'master'
-      - 'verify-voltha-onos-jobs-branches':
-          branch-regexp: '^(onos-1.13.10|onos-2.2)$'
-          name-extension: '-branches'
       - 'publish-voltha-onos-jobs':
-        branch-regexp: '{all-branches-regexp}'
+          branch-regexp: '{all-branches-regexp}'
 
 - job-group:
-    name: 'verify-voltha-onos-jobs-common'
+    name: 'verify-voltha-onos-jobs'
     jobs:
       - 'verify-licensed'
       - 'tag-collision-reject':
@@ -25,21 +20,10 @@
       - 'make-unit-test':
           unit-test-targets: 'build'
           junit-allow-empty-results: true
-
-- job-group:
-    name: 'verify-voltha-onos-jobs-master'
-    jobs:
       - 'voltha-patch-test':
           pipeline-script: 'voltha-bbsim-tests.groovy'
 
 - job-group:
-    name: 'verify-voltha-onos-jobs-branches'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha-bbsim-tests.groovy'
-          onos-version: '1.13.10'
-
-- job-group:
     name: 'publish-voltha-onos-jobs'
     jobs:
       - 'docker-publish':
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 751f267..8b8fff0 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -216,11 +216,6 @@
           default: '{extra-helm-flags}'
           description: 'Helm flags to pass to ./voltha up'
 
-      - string:
-          name: onosVersion
-          default: '{onos-version}'
-          description: 'ONOS version that needs to be configured'
-
     project-type: pipeline
     concurrent: true