diff --git a/.gitreview b/.gitreview
index 33e487a..74ed635 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,3 +3,4 @@
 port=29418
 project=ci-management.git
 defaultremote=origin
+defaultbranch=master
diff --git a/jjb/pipeline/voltha/bbsim-tests.groovy b/jjb/pipeline/voltha/bbsim-tests.groovy
index bb16bc5..df4ad02 100644
--- a/jjb/pipeline/voltha/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/bbsim-tests.groovy
@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-// Copyright 2021-2024 Open Networking Foundation Contributors
+// Copyright 2021-2025 Open Networking Foundation Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -37,10 +37,10 @@
 //   as a guarantee release jobs are running in an expected sandbox.
 // -----------------------------------------------------------------------
 String branchName() {
-    String br = 'master'
+    def validBranches = ["master", "voltha-2.13"]
 
     // "${branch}" is assigned by jenkins
-    if (br != branch) {
+    if (!validBranches.contains(branch)) {
         String err = [
             'ERROR: Detected invalid branch',
             "(expected=[${br}] != found=[${branch}])"
@@ -48,7 +48,7 @@
         throw new Exception(err) // groovylint-disable-line ThrowException
     }
 
-    return (br)
+    return (branch)
 }
 
 // -----------------------------------------------------------------------
diff --git a/jjb/repos/voltha-helm-charts.yaml b/jjb/repos/voltha-helm-charts.yaml
index 2a63d1c..ce896ab 100644
--- a/jjb/repos/voltha-helm-charts.yaml
+++ b/jjb/repos/voltha-helm-charts.yaml
@@ -10,6 +10,10 @@
     jobs:
       - 'verify-voltha-helm-charts-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-voltha-helm-charts-jobs-voltha-2.13':
+          name-extension: '-voltha-2.13'
+          override-branch: 'voltha-2.13'
+          branch-regexp: '^voltha-2.13$'
       - 'verify-voltha-helm-charts-jobs-voltha-2.12':
           name-extension: '-voltha-2.12'
           override-branch: 'voltha-2.12'
@@ -36,6 +40,13 @@
       - 'voltha-patch-test'
 
 - job-group:
+    name: 'verify-voltha-helm-charts-jobs-voltha-2.13'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/bbsim-tests.groovy'
+          pipeline-branch: 'voltha-2.13'
+
+- job-group:
     name: 'verify-voltha-helm-charts-jobs-voltha-2.12'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 7f2dd34..0a1d28d 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -30,30 +30,66 @@
     project-name: '{name}'
 
     jobs:
-      - 'software-upgrades-test-master':
+      - 'software-upgrades-test':
           name: 'periodic-software-upgrade-test-bbsim'
           pipeline-script: 'voltha/software-upgrades.groovy'
           pipeline-branch: 'master'
           build-node: 'ubuntu18.04-basebuild-8c-15g'
           code-branch: 'master'
-          aaa-version: '2.10.3'
+          aaa-version: '2.11.2'
           aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.10.3/aaa-app-2.10.3.oar'
-          olt-version: '5.2.4'
+          olt-version: '5.2.8'
           olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.2.4/olt-app-5.2.4.oar'
-          dhcpl2relay-version: '2.10.0'
+          dhcpl2relay-version: '2.11.2'
           dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.10.0/dhcpl2relay-app-2.10.0.oar'
-          igmpproxy-version: '2.8.0'
+          igmpproxy-version: '2.9.1'
           igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.8.0/onos-app-igmpproxy-app-2.8.0.oar'
-          sadis-version: '5.11.1'
+          sadis-version: '5.12.3'
           sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.11.1/sadis-app-5.11.1.oar'
-          mcast-version: '2.9.0'
+          mcast-version: '2.9.3'
           mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.9.0/mcast-app-2.9.0.oar'
-          kafka-version: '2.12.0'
+          kafka-version: '2.13.3'
           kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.12.0/kafka-2.12.0.oar'
-          openolt-adapter-deploy-base-tag: '4.4.9'
-          openonu-adapter-deploy-base-tag: '2.11.8'
-          rw-core-deploy-base-tag: '3.5.2'
-          ofagent-deploy-base-tag: '2.12.0'
+          openolt-adapter-deploy-base-tag: '4.5.6'
+          openonu-adapter-deploy-base-tag: '2.12.14'
+          rw-core-deploy-base-tag: '3.6.6'
+          ofagent-deploy-base-tag: '2.13.0'
+          onu-image-version: 'BBSM_IMG_00002'
+          onu-image-url: 'http://bbsim0:50074/images/software-image.img'
+          onu-image-vendor: 'BBSM'
+          onu-image-activate-on-success: 'false'
+          onu-image-commit-on-success: 'false'
+          onu-image-crc: '0'
+          time-trigger: "H H/23 * * *"
+
+# -----------------------------------------------------------------------
+# voltha 2.13 release
+# -----------------------------------------------------------------------
+
+      - 'software-upgrades-test':
+          name: 'periodic-software-upgrade-test-bbsim-2.13'
+          pipeline-script: 'voltha/voltha-2.13/software-upgrades.groovy'
+          pipeline-branch: 'voltha-2.13'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          code-branch: 'voltha-2.13'
+          aaa-version: '2.11.2'
+          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.10.3/aaa-app-2.10.3.oar'
+          olt-version: '5.2.8'
+          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.2.4/olt-app-5.2.4.oar'
+          dhcpl2relay-version: '2.11.2'
+          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.10.0/dhcpl2relay-app-2.10.0.oar'
+          igmpproxy-version: '2.9.1'
+          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.8.0/onos-app-igmpproxy-app-2.8.0.oar'
+          sadis-version: '5.12.3'
+          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.11.1/sadis-app-5.11.1.oar'
+          mcast-version: '2.9.3'
+          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.9.0/mcast-app-2.9.0.oar'
+          kafka-version: '2.13.3'
+          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.12.0/kafka-2.12.0.oar'
+          openolt-adapter-deploy-base-tag: '4.5.6'
+          openonu-adapter-deploy-base-tag: '2.12.14'
+          rw-core-deploy-base-tag: '3.6.6'
+          ofagent-deploy-base-tag: '2.13.0'
           onu-image-version: 'BBSM_IMG_00002'
           onu-image-url: 'http://bbsim0:50074/images/software-image.img'
           onu-image-vendor: 'BBSM'
@@ -66,7 +102,7 @@
 # https://docs.voltha.org/master/release_notes/voltha_2.12.html#id7
 # https://wiki.opennetworking.org/display/VOLTHA/v2.12+Deployments
 # -----------------------------------------------------------------------
-      - 'software-upgrades-test-voltha-2.12':
+      - 'software-upgrades-test':
           name: 'periodic-software-upgrade-test-bbsim-2.12'
           pipeline-script: 'voltha/voltha-2.12/software-upgrades.groovy'
           pipeline-branch: 'voltha-2.12'
@@ -101,7 +137,7 @@
 # -----------------------------------------------------------------------
 # https://docs.voltha.org/master/release_notes/voltha_2.11.html#onos-apps
 # -----------------------------------------------------------------------
-      - 'software-upgrades-test-voltha-2.11':
+      - 'software-upgrades-test':
           name: 'periodic-software-upgrade-test-bbsim-2.11'
           pipeline-script: 'voltha/voltha-2.11/software-upgrades.groovy'
           pipeline-branch: 'voltha-2.11'
@@ -137,7 +173,7 @@
 # to be used for voltha releases 2.9 onwards
 # -----------------------------------------------------------------------
 - job-template:
-    id: 'software-upgrades-test-master'
+    id: 'software-upgrades-test'
     name: '{name}'
     sandbox: true
     volthaSystemTestsChange: ''
@@ -338,413 +374,4 @@
                  TZ=America/Los_Angeles
                  {time-trigger}
 
-# -----------------------------------------------------------------------
-# -----------------------------------------------------------------------
-- job-template:
-    id: 'software-upgrades-test-voltha-2.12'
-    name: '{name}'
-    sandbox: true
-    volthaSystemTestsChange: ''
-    volthaHelmChartsChange: ''
-    kindVolthaChange: ''
-    logLevel: 'DEBUG'
-    logging: true
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/software-upgrades.yaml  <br /><br />
-      E2E Validation for Voltha 2.X
-    properties:
-      - onf-infra-volthadevs-permissions
-      - 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: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins node to run the job on'
-
-      - string:
-          name: extraHelmFlags
-          default: ''
-          description: 'Helm flags to pass to every helm install command'
-
-      - string:
-          name: volthaSystemTestsChange
-          default: ''
-          description: 'Download a change for gerrit in the voltha-system-tests repo, example value: "refs/changes/79/18779/13"'
-
-      - string:
-          name: volthaHelmChartsChange
-          default: ''
-          description: 'Download a change for gerrit in the voltha-helm-charts repo, example value: "refs/changes/79/18779/13"'
-
-      - string:
-          name: branch
-          default: '{code-branch}'
-          description: 'Name of the branch to use'
-
-      - string:
-          name: onosImg
-          default: ''
-          description: 'ONOS Image to use'
-
-      - string:
-          name: aaaVer
-          default: '{aaa-version}'
-          description: 'ONOS AAA App Version to Test Upgrade'
-
-      - string:
-          name: aaaOarUrl
-          default: '{aaa-oar-url}'
-          description: 'ONOS AAA App OAR File Url'
-
-      - string:
-          name: oltVer
-          default: '{olt-version}'
-          description: 'ONOS OLT App Version to Test Upgrade'
-
-      - string:
-          name: oltOarUrl
-          default: '{olt-oar-url}'
-          description: 'ONOS OLT App OAR File Url'
-
-      - string:
-          name: dhcpl2relayVer
-          default: '{dhcpl2relay-version}'
-          description: 'ONOS DHCP L2 Relay App Version to Test Upgrade'
-
-      - string:
-          name: dhcpl2relayOarUrl
-          default: '{dhcpl2relay-oar-url}'
-          description: 'ONOS DHCP L2 Relay App OAR File Url'
-
-      - string:
-          name: igmpproxyVer
-          default: '{igmpproxy-version}'
-          description: 'ONOS Igmp Proxy App Version to Test Upgrade'
-
-      - string:
-          name: igmpproxyOarUrl
-          default: '{igmpproxy-oar-url}'
-          description: 'ONOS Igmp Proxy App OAR File Url'
-
-      - string:
-          name: sadisVer
-          default: '{sadis-version}'
-          description: 'ONOS Sadis App Version to Test Upgrade'
-
-      - string:
-          name: sadisOarUrl
-          default: '{sadis-oar-url}'
-          description: 'ONOS Sadis App OAR File Url'
-
-      - string:
-          name: mcastVer
-          default: '{mcast-version}'
-          description: 'ONOS MCast App Version to Test Upgrade'
-
-      - string:
-          name: mcastOarUrl
-          default: '{mcast-oar-url}'
-          description: 'ONOS MCast App OAR File Url'
-
-      - string:
-          name: kafkaVer
-          default: '{kafka-version}'
-          description: 'ONOS Kafka App Version to Test Upgrade'
-
-      - string:
-          name: kafkaOarUrl
-          default: '{kafka-oar-url}'
-          description: 'ONOS Kafka App OAR File Url'
-
-      - string:
-          name: openoltAdapterDeployBaseTag
-          default: '{openolt-adapter-deploy-base-tag}'
-          description: 'Minimum Version of OpenOLT Adapter to be used for Deployment'
-
-      - string:
-          name: openonuAdapterDeployBaseTag
-          default: '{openonu-adapter-deploy-base-tag}'
-          description: 'Minimum Version of OpenONU Adapter to be used for Deployment'
-
-      - string:
-          name: rwCoreDeployBaseTag
-          default: '{rw-core-deploy-base-tag}'
-          description: 'Minimum Version of RW Core to be used for Deployment'
-
-      - string:
-          name: ofagentDeployBaseTag
-          default: '{ofagent-deploy-base-tag}'
-          description: 'Minimum Version of Ofagent to be used for Deployment'
-
-      - string:
-          name: onuImageVersion
-          default: '{onu-image-version}'
-          description: 'Version of ONU Image to Upgrade'
-
-      - string:
-          name: onuImageUrl
-          default: '{onu-image-url}'
-          description: 'Url of ONU Image to Upgrade'
-
-      - string:
-          name: onuImageVendor
-          default: '{onu-image-vendor}'
-          description: 'Vendor of ONU Image to Upgrade'
-
-      - string:
-          name: onuImageActivateOnSuccess
-          default: '{onu-image-activate-on-success}'
-          description: 'Activate ONU Image'
-
-      - string:
-          name: onuImageCommitOnSuccess
-          default: '{onu-image-commit-on-success}'
-          description: 'Commit ONU Image'
-
-      - string:
-          name: onuImageCrc
-          default: '{onu-image-crc}'
-          description: 'CRC of ONU Image to Upgrade'
-
-      - string:
-          name: logLevel
-          default: '{logLevel}'
-          description: 'Log level for all the components'
-
-      - bool:
-          name: logging
-          default: '{logging}'
-          description: 'Option to collect voltha components logs per test case'
-
-    project-type: pipeline
-    concurrent: true
-
-    pipeline-scm:
-      scm:
-        - git:
-            url: https://gerrit.opencord.org/ci-management
-            branches:
-              - origin/{pipeline-branch}
-      script-path: jjb/pipeline/{pipeline-script}
-
-    triggers:
-      - timed: |
-                 TZ=America/Los_Angeles
-                 {time-trigger}
-
-# -----------------------------------------------------------------------
-# to be used for voltha releases 2.9 onwards
-# -----------------------------------------------------------------------
-- job-template:
-    id: 'software-upgrades-test-voltha-2.11'
-    name: '{name}'
-    sandbox: true
-    volthaSystemTestsChange: ''
-    volthaHelmChartsChange: ''
-    kindVolthaChange: ''
-    logLevel: 'DEBUG'
-    logging: true
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/software-upgrades.yaml  <br /><br />
-      E2E Validation for Voltha 2.X
-    properties:
-      - onf-infra-volthadevs-permissions
-      - 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: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins node to run the job on'
-
-      - string:
-          name: extraHelmFlags
-          default: ''
-          description: 'Helm flags to pass to every helm install command'
-
-      - string:
-          name: volthaSystemTestsChange
-          default: ''
-          description: 'Download a change for gerrit in the voltha-system-tests repo, example value: "refs/changes/79/18779/13"'
-
-      - string:
-          name: volthaHelmChartsChange
-          default: ''
-          description: 'Download a change for gerrit in the voltha-helm-charts repo, example value: "refs/changes/79/18779/13"'
-
-      - string:
-          name: branch
-          default: '{code-branch}'
-          description: 'Name of the branch to use'
-
-      - string:
-          name: onosImg
-          default: ''
-          description: 'ONOS Image to use'
-
-      - string:
-          name: aaaVer
-          default: '{aaa-version}'
-          description: 'ONOS AAA App Version to Test Upgrade'
-
-      - string:
-          name: aaaOarUrl
-          default: '{aaa-oar-url}'
-          description: 'ONOS AAA App OAR File Url'
-
-      - string:
-          name: oltVer
-          default: '{olt-version}'
-          description: 'ONOS OLT App Version to Test Upgrade'
-
-      - string:
-          name: oltOarUrl
-          default: '{olt-oar-url}'
-          description: 'ONOS OLT App OAR File Url'
-
-      - string:
-          name: dhcpl2relayVer
-          default: '{dhcpl2relay-version}'
-          description: 'ONOS DHCP L2 Relay App Version to Test Upgrade'
-
-      - string:
-          name: dhcpl2relayOarUrl
-          default: '{dhcpl2relay-oar-url}'
-          description: 'ONOS DHCP L2 Relay App OAR File Url'
-
-      - string:
-          name: igmpproxyVer
-          default: '{igmpproxy-version}'
-          description: 'ONOS Igmp Proxy App Version to Test Upgrade'
-
-      - string:
-          name: igmpproxyOarUrl
-          default: '{igmpproxy-oar-url}'
-          description: 'ONOS Igmp Proxy App OAR File Url'
-
-      - string:
-          name: sadisVer
-          default: '{sadis-version}'
-          description: 'ONOS Sadis App Version to Test Upgrade'
-
-      - string:
-          name: sadisOarUrl
-          default: '{sadis-oar-url}'
-          description: 'ONOS Sadis App OAR File Url'
-
-      - string:
-          name: mcastVer
-          default: '{mcast-version}'
-          description: 'ONOS MCast App Version to Test Upgrade'
-
-      - string:
-          name: mcastOarUrl
-          default: '{mcast-oar-url}'
-          description: 'ONOS MCast App OAR File Url'
-
-      - string:
-          name: kafkaVer
-          default: '{kafka-version}'
-          description: 'ONOS Kafka App Version to Test Upgrade'
-
-      - string:
-          name: kafkaOarUrl
-          default: '{kafka-oar-url}'
-          description: 'ONOS Kafka App OAR File Url'
-
-      - string:
-          name: openoltAdapterDeployBaseTag
-          default: '{openolt-adapter-deploy-base-tag}'
-          description: 'Minimum Version of OpenOLT Adapter to be used for Deployment'
-
-      - string:
-          name: openonuAdapterDeployBaseTag
-          default: '{openonu-adapter-deploy-base-tag}'
-          description: 'Minimum Version of OpenONU Adapter to be used for Deployment'
-
-      - string:
-          name: rwCoreDeployBaseTag
-          default: '{rw-core-deploy-base-tag}'
-          description: 'Minimum Version of RW Core to be used for Deployment'
-
-      - string:
-          name: ofagentDeployBaseTag
-          default: '{ofagent-deploy-base-tag}'
-          description: 'Minimum Version of Ofagent to be used for Deployment'
-
-      - string:
-          name: onuImageVersion
-          default: '{onu-image-version}'
-          description: 'Version of ONU Image to Upgrade'
-
-      - string:
-          name: onuImageUrl
-          default: '{onu-image-url}'
-          description: 'Url of ONU Image to Upgrade'
-
-      - string:
-          name: onuImageVendor
-          default: '{onu-image-vendor}'
-          description: 'Vendor of ONU Image to Upgrade'
-
-      - string:
-          name: onuImageActivateOnSuccess
-          default: '{onu-image-activate-on-success}'
-          description: 'Activate ONU Image'
-
-      - string:
-          name: onuImageCommitOnSuccess
-          default: '{onu-image-commit-on-success}'
-          description: 'Commit ONU Image'
-
-      - string:
-          name: onuImageCrc
-          default: '{onu-image-crc}'
-          description: 'CRC of ONU Image to Upgrade'
-
-      - string:
-          name: logLevel
-          default: '{logLevel}'
-          description: 'Log level for all the components'
-
-      - bool:
-          name: logging
-          default: '{logging}'
-          description: 'Option to collect voltha components logs per test case'
-
-    project-type: pipeline
-    concurrent: true
-
-    pipeline-scm:
-      scm:
-        - git:
-            url: https://gerrit.opencord.org/ci-management
-            branches:
-              - origin/{pipeline-branch}
-      script-path: jjb/pipeline/{pipeline-script}
-
-    triggers:
-      - timed: |
-                 TZ=America/Los_Angeles
-                 {time-trigger}
-
 # [EOF]
diff --git a/jjb/verify/bbsim-sadis-server.yaml b/jjb/verify/bbsim-sadis-server.yaml
index f6cd01f..f7b67e6 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -30,6 +30,9 @@
     jobs:
       - 'verify-bbsim-sadis-server-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-bbsim-sadis-server-jobs-voltha-2.13':
+          name-extension: '-voltha-2.13'
+          branch-regexp: '^voltha-2.13$'
       - 'verify-bbsim-sadis-server-jobs-voltha-2.12':
           name-extension: '-voltha-2.12'
           branch-regexp: '^voltha-2.12$'
@@ -60,6 +63,13 @@
             --set onos-classic.image.tag=master
 
 - job-group:
+    name: 'verify-bbsim-sadis-server-jobs-voltha-2.13'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/bbsim-tests.groovy'
+          pipeline-branch: 'voltha-2.13'
+
+- job-group:
     name: 'verify-bbsim-sadis-server-jobs-voltha-2.12'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index 1104b64..e09b0e6 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -31,6 +31,10 @@
     jobs:
       - 'verify-bbsim-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-bbsim-jobs-voltha-2.13':
+          name-extension: '-voltha-2.13'
+          override-branch: 'voltha-2.13'
+          branch-regexp: '^voltha-2.13$'
       - 'verify-bbsim-jobs-voltha-2.12':
           name-extension: '-voltha-2.12'
           override-branch: 'voltha-2.12'
@@ -78,6 +82,25 @@
               logging: true
 
 - job-group:
+    name: 'verify-bbsim-jobs-voltha-2.13'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/bbsim-tests.groovy'
+          pipeline-branch: 'voltha-2.13'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+          testTargets: |
+            - target: sanity-bbsim-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: sanity-bbsim-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+
+- job-group:
     name: 'verify-bbsim-jobs-voltha-2.12'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index 15cf065..52974d4 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -10,6 +10,10 @@
           branch-regexp: '{all-branches-regexp}'
       - 'verify-ofagent-jobs-master':
           branch-regexp: '^master$'
+      - 'verify-ofagent-jobs-voltha-2.13':
+          name-extension: '-voltha-2.13'
+          override-branch: 'voltha-2.13'
+          branch-regexp: '{kind-voltha-regexp}'
       - 'verify-ofagent-jobs-voltha-2.12':
           name-extension: '-voltha-2.12'
           override-branch: 'voltha-2.12'
@@ -46,6 +50,13 @@
           pipeline-branch: 'voltha-2.11'
 
 - job-group:
+    name: 'verify-ofagent-jobs-voltha-2.13'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/bbsim-tests.groovy'
+          pipeline-branch: 'voltha-2.13'
+
+- job-group:
     name: 'verify-ofagent-jobs-voltha-2.12'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index 02f9104..41c6ff3 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -10,6 +10,10 @@
           branch-regexp: '{all-branches-regexp}'
       - 'verify-voltha-go-jobs-master':
           branch-regexp: '^master$'
+      - 'verify-voltha-go-jobs-voltha-2.13':
+          name-extension: '-voltha-2.13'
+          override-branch: 'voltha-2.13'
+          branch-regexp: '^voltha-2.13$'
       - 'verify-voltha-go-jobs-voltha-2.12':
           name-extension: '-voltha-2.12'
           override-branch: 'voltha-2.12'
@@ -42,6 +46,13 @@
           unit-test-keep-going: 'false'
 
 - job-group:
+    name: 'verify-voltha-go-jobs-voltha-2.13'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/bbsim-tests.groovy'
+          pipeline-branch: 'voltha-2.13'
+
+- job-group:
     name: 'verify-voltha-go-jobs-voltha-2.12'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index 5ed7188..e82eb97 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -10,6 +10,10 @@
           branch-regexp: '{all-branches-regexp}'
       - 'verify-voltha-onos-jobs-master':
           branch-regexp: '^master$'
+      - 'verify-voltha-onos-jobs-voltha-2.13':
+          name-extension: '-voltha-2.13'
+          override-branch: 'voltha-2.13'
+          branch-regexp: '^voltha-2.13$'
       - 'verify-voltha-onos-jobs-voltha-2.12':
           name-extension: '-voltha-2.12'
           override-branch: 'voltha-2.12'
@@ -27,6 +31,13 @@
       - 'verify-licensed'
 
 - job-group:
+    name: 'verify-voltha-onos-jobs-voltha-2.13'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/bbsim-tests.groovy'
+          pipeline-branch: 'voltha-2.13'
+
+- job-group:
     name: 'verify-voltha-onos-jobs-voltha-2.12'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index c335c9b..35ed232 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -10,6 +10,10 @@
           branch-regexp: '{all-branches-regexp}'
       - 'verify-voltha-openolt-adapter-jobs-master':
           branch-regexp: '^master$'
+      - 'verify-voltha-openolt-adapter-jobs-voltha-2.13':
+          name-extension: '-voltha-2.13'
+          override-branch: 'voltha-2.13'
+          branch-regexp: '^voltha-2.13$'
       - 'verify-voltha-openolt-adapter-jobs-voltha-2.12':
           name-extension: '-voltha-2.12'
           override-branch: 'voltha-2.12'
@@ -44,6 +48,13 @@
             --set global.image_tag=master --set onos-classic.image.tag=master
 
 - job-group:
+    name: 'verify-voltha-openolt-adapter-jobs-voltha-2.13'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/bbsim-tests.groovy'
+          pipeline-branch: 'master'
+
+- job-group:
     name: 'verify-voltha-openolt-adapter-jobs-voltha-2.12'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index 5a920d4..31425df 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -10,6 +10,10 @@
           branch-regexp: '{all-branches-regexp}'
       - 'verify-voltha-openonu-adapter-go-jobs-master':
           branch-regexp: '^master$'
+      - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.13':
+          name-extension: '-voltha-2.13'
+          override-branch: 'voltha-2.13'
+          branch-regexp: '^voltha-2.13$'
       - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.12':
           name-extension: '-voltha-2.12'
           override-branch: 'voltha-2.12'
@@ -41,6 +45,13 @@
           build-node: 'ubuntu18.04-basebuild-2c-4g'
 
 - job-group:
+    name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.13'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/bbsim-tests.groovy'
+          pipeline-branch: 'voltha-2.13'
+
+- job-group:
     name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.12'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index c5fe36b..8972e0a 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -17,6 +17,11 @@
           name-extension: '-py312'
           override-branch: 'python312-update'
           branch-regexp: '^python312-update$'
+      - 'verify-voltha-system-tests-jobs-voltha-2.13':
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          name-extension: '-voltha-2.13'
+          override-branch: 'voltha-2.13'
+          branch-regexp: '^voltha-2.13$'
       - 'verify-voltha-system-tests-jobs-voltha-2.12':
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           name-extension: '-voltha-2.12'
@@ -45,6 +50,13 @@
           pipeline-branch: 'python312-update'
 
 - job-group:
+    name: 'verify-voltha-system-tests-jobs-voltha-2.13'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/bbsim-tests.groovy'
+          pipeline-branch: 'voltha-2.13'
+
+- job-group:
     name: 'verify-voltha-system-tests-jobs-voltha-2.12'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index ad40e75..701dbe0 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -23,6 +23,13 @@
 # Intent: voltha 2.0 tests, end-2-end pipeline jobs.
 # -----------------------------------------------------------------------
 
+- _voltha_213_common: &voltha_213_common
+    name: voltha-2.13-common
+    pipeline-script: 'voltha/bbsim-tests.groovy'
+    pipeline-branch: 'voltha-2.13'
+    code-branch: 'voltha-2.13'
+    time-trigger: "H H/23 * * *"
+
 - project:
     name: voltha-e2e
 
@@ -45,6 +52,485 @@
     jobs:
 
       # -----------------------------------------------------------------------
+      # voltha-2.13 Jobs
+      # -----------------------------------------------------------------------
+
+      - 'voltha-periodic-test':
+          <<: *voltha_213_common
+          name: 'periodic-voltha-multiple-olts-test-bbsim-2.13'
+          olts: 2
+          extraHelmFlags: '--set onu=2,pon=2'
+          testTargets: |
+            - target: functional-multi-olt
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-multiolt-failurescenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-multiolt-errorscenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-multiolt-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+
+      - 'voltha-periodic-test':
+          <<: *voltha_213_common
+          name: 'periodic-voltha-multi-uni-test-bbsim-2.13'
+          extraHelmFlags: '--set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
+          testTargets: |
+            - target: functional-single-kind-multiuni-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-multiuni-failurescenarios-att
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-multiuni-errorscenarios-att
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+
+      - 'voltha-periodic-test':
+          <<: *voltha_213_common
+          name: 'periodic-voltha-multi-uni-multiple-olts-test-bbsim-2.13'
+          olts: 2
+          extraHelmFlags: '--set onu=2,pon=2 --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
+          testTargets: |
+            - target: functional-multiuni-multiolt-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-multiuni-multiolt-failurescenarios-att
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-multiuni-multiolt-errorscenarios-att
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+          timeout: 180
+
+      - 'voltha-periodic-test':
+          <<: *voltha_213_common
+          name: 'periodic-voltha-openonu-go-test-bbsim-2.13'
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: 1t1gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t4gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t8gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: mib-upload-templating-openonu-go-adapter-test
+              workflow: att
+              flags: "--set pon=2,onu=2,controlledActivation=only-onu,injectOmciUnknownAttributes=true,injectOmciUnknownMe=true --set global.extended_omci_support.enabled=true "
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-test-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-test-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-uni-test-tt
+              workflow: tt
+              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
+              teardown: true
+              logging: true
+            - target: openonu-go-adapter-omci-hardening-passed-test
+              workflow: att
+              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
+              teardown: true
+              logging: true
+            - target: openonu-go-adapter-omci-hardening-failed-test
+              workflow: att
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,omci_response_rate=7"
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-att
+              workflow: att
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-dt
+              workflow: dt
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-tt
+              workflow: tt
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+            - target: onu-robustness-test-single-kind-dt
+              workflow: dt
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1"
+              teardown: true
+              logging: true
+            - target: onu-robustness-test-multi-uni-kind-tt
+              workflow: tt
+              flags: "--set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF,kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1"
+              teardown: true
+              logging: true
+          timeout: 240
+
+      - 'voltha-periodic-test':
+          <<: *voltha_213_common
+          name: 'patchset-voltha-2.13-openonu-go-test-bbsim'
+          trigger-comment: "voltha 2.13 test openonu singleolt"
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: 1t1gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t4gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t8gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: mib-upload-templating-openonu-go-adapter-test
+              workflow: att
+              flags: "--set pon=2,onu=2,controlledActivation=only-onu,injectOmciUnknownAttributes=true,injectOmciUnknownMe=true --set global.extended_omci_support.enabled=true "
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-test-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-test-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-uni-test-tt
+              workflow: tt
+              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
+              teardown: true
+              logging: true
+            - target: openonu-go-adapter-omci-hardening-passed-test
+              workflow: att
+              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
+              teardown: true
+              logging: true
+            - target: openonu-go-adapter-omci-hardening-failed-test
+              workflow: att
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,omci_response_rate=7"
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-att
+              workflow: att
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-dt
+              workflow: dt
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-tt
+              workflow: tt
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+          timeout: 210
+
+      - 'voltha-periodic-test':
+          <<: *voltha_213_common
+          name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim-2.13'
+          extraHelmFlags: '--set onu=2,pon=2'
+          olts: 2
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: 1t1gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t4gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t8gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-test-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-test-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-multi-uni-test-tt
+              workflow: tt
+              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+          time-trigger: "H H/23 * * *"
+          timeout: 270
+
+      - 'voltha-periodic-test':
+          <<: *voltha_213_common
+          name: 'patchset-voltha-2.13-multiple-olts-openonu-go-test-bbsim'
+          trigger-comment: "voltha 2.13 test openonu multiolt"
+          extraHelmFlags: '--set onu=2,pon=2'
+          olts: 2
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: 1t1gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t4gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t8gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-test-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-test-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-multi-uni-test-tt
+              workflow: tt
+              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+          timeout: 270
+
+      - 'voltha-periodic-test':
+          <<: *voltha_213_common
+          name: 'periodic-voltha-test-DMI-2.13'
+          testTargets: |
+            - target: bbsim-dmi-hw-management-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+
+      - 'voltha-periodic-test':
+          <<: *voltha_213_common
+          name: 'periodic-voltha-etcd-test-2.13'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          extraHelmFlags: '--set onu=2,pon=2'
+          testTargets: |
+            - target: sanity-multi-kind
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+
+      - 'voltha-periodic-test':
+          <<: *voltha_213_common
+          name: 'periodic-voltha-unitag-subscriber-tt-test-bbsim-2.13'
+          extraHelmFlags: '--set onos-classic.replicas=3,onos-classic.atomix.replicas=3 --set voltha.onos_classic.replicas=3 '
+          logLevel: 'DEBUG'
+          robot-args: '-v unitag_sub:True'
+          testTargets: |
+            - target: functional-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-failurescenarios-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: functional-single-kind-multiuni-tt
+              workflow: tt
+              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
+              teardown: true
+              logging: true
+
+      - 'voltha-periodic-test':
+          <<: *voltha_213_common
+          name: 'periodic-voltha-memory-leak-test-bbsim-2.13'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          withMonitoring: true
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: memory-leak-test-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+          timeout: 230
+
+      # -----------------------------------------------------------------------
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-test-bbsim'
diff --git a/jjb/voltha-e2e/voltha-2.13.yaml b/jjb/voltha-e2e/voltha-2.13.yaml
new file mode 100644
index 0000000..42de96d
--- /dev/null
+++ b/jjb/voltha-e2e/voltha-2.13.yaml
@@ -0,0 +1,141 @@
+---
+# voltha 2.x tests
+# [NOTE]
+#   o md5sum(master) can be used to locate branch/release variants of a job.
+
+- project:
+    name: voltha-e2e-2.13
+
+    project-name: '{name}'
+    manualBranch: ''
+    olts: 1
+    onus: 1
+    pons: 1
+    withAlarms: true
+    make-target-failtest: bbsim-failurescenarios
+    make-target-errortest: bbsim-errorscenarios
+    make-target-alarmtest: bbsim-alarms-kind
+    make-target-multipleolt: bbsim-multiolt-kind
+    make-target-1t4gemtest: 1t4gem-openonu-go-adapter-test
+    make-target-1t8gemtest: 1t8gem-openonu-go-adapter-test
+    make-target-reconciledttest: reconcile-openonu-go-adapter-test-dt
+    make-target-reconciletttest: reconcile-openonu-go-adapter-test-tt
+
+# source: voltha-e2e.yaml
+    jobs:
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-pm-data-test-bbsim-2.13'
+          pipeline-script: 'voltha/bbsim-tests.groovy'
+          pipeline-branch: 'voltha-2.13'
+          code-branch: 'voltha-2.13'
+          extraHelmFlags: '--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
+          time-trigger: "H H/23 * * *"
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: voltha-pm-data-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-pm-data-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+          timeout: 140
+
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim-2.13'
+          pipeline-script: 'voltha/bbsim-tests.groovy'
+          pipeline-branch: 'voltha-2.13'
+          code-branch: 'voltha-2.13'
+          extraHelmFlags: '--set onu=2,pon=2 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
+          olts: 2
+          timeout: 180
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: voltha-pm-data-multiolt-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-pm-data-multiolt-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+          time-trigger: "H H/23 * * *"
+
+      # -----------------------------------------------------------------------
+      # md5sum(master): c606493da6ee7cbb18ca8aee97ea2957
+      # -----------------------------------------------------------------------
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-test-bbsim-2.13'
+          code-branch: 'voltha-2.13'
+          logLevel: 'DEBUG'                      # force job to regenerate
+          pipeline-script: 'voltha/bbsim-tests.groovy'
+          pipeline-branch: 'voltha-2.13'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: functional-single-kind
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-alarms-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-failurescenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-errorscenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: onos-ha-test
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-dt-test-bbsim-2.13'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          pipeline-script: 'voltha/bbsim-tests.groovy'
+          pipeline-branch: 'voltha-2.13'
+          code-branch: 'voltha-2.13'
+          time-trigger : '@daily'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master '
+          testTargets: |
+            - target: functional-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-failurescenarios-dt
+              workflow: dt
+              flags: ""
+              teardown: false
+              logging: true
+
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-dt-fttb-test-bbsim-2.13'
+          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          code-branch: 'voltha-2.13'
+          time-trigger: "H H/23 * * *"
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF --set onu=2'
+          testTargets: |
+            - target: sanity-kind-dt-fttb
+              workflow: dt-fttb
+              flags: ""
+              teardown: true
+              logging: true
+
+# [EOF]
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 07735e4..0f5e30a 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -1,6 +1,24 @@
 ---
 # VOLTHA 2.x scale measurements
 
+- _voltha_213_common: &voltha_213_common
+    name: voltha-2.13-common
+    pipeline-branch: 'voltha-2.13'
+    time-trigger: "H H/4 * * *"
+    olts: 2
+    pons: 16
+    onus: 32
+    withFlows: true
+    provisionSubscribers: true
+    bbsimImg: ''
+    rwCoreImg: ''
+    ofAgentImg: ''
+    openoltAdapterImg: ''
+    openonuAdapterImg: ''
+    openonuAdapterGoImg: ''
+    onosImg: ''
+    release: voltha-2.13
+
 - project:
     name: voltha-scale
 
@@ -293,6 +311,68 @@
           extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml"
 
       # -----------------------------------------------------------------------
+      # voltha-2.13 Jobs
+      # -----------------------------------------------------------------------
+
+      - 'voltha-scale-measurements':
+          <<: *voltha_213_common
+          name: 'voltha-scale-measurements-voltha-2.13-2-16-32-dt-subscribers'
+          pipeline-script: 'voltha/voltha-2.13/voltha-scale-test.groovy'
+          build-node: 'voltha-scale-1'
+          workflow: dt
+          withEapol: false
+          withDhcp: false
+          onosImg: 'voltha/voltha-onos:5.0.4'
+          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
+
+      - 'voltha-scale-measurements':
+          <<: *voltha_213_common
+          name: 'voltha-scale-measurements-voltha-2.13-2-16-32-tt-subscribers'
+          pipeline-script: 'voltha/voltha-2.13/voltha-scale-test.groovy'
+          build-node: 'voltha-scale-1'
+          workflow: tt
+          withEapol: false
+          withDhcp: true
+          withIgmp: true
+          extraHelmFlags: "--set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
+
+      - 'voltha-scale-measurements':
+          <<: *voltha_213_common
+          name: 'voltha-scale-measurements-2.13-10-stacks-2-16-32-dt-subscribers'
+          build-node: 'voltha-scale-2'
+          pipeline-script: 'voltha/voltha-2.13/voltha-scale-multi-stack.groovy'
+          withMonitoring: false
+          logLevel: WARN
+          onosReplicas: 1
+          atomixReplicas: 0
+          kafkaReplicas: 1
+          etcdReplicas: 1
+          volthaStacks: 10
+          workflow: dt
+          withEapol: false
+          withDhcp: false
+          withIgmp: false
+          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
+
+      - 'voltha-scale-measurements':
+          <<: *voltha_213_common
+          name: 'voltha-scale-measurements-2.13-10-stacks-2-16-32-tt-subscribers'
+          build-node: 'voltha-scale-2'
+          pipeline-script: 'voltha/voltha-2.13/voltha-scale-multi-stack.groovy'
+          withMonitoring: false
+          logLevel: WARN
+          onosReplicas: 1
+          atomixReplicas: 0
+          kafkaReplicas: 1
+          etcdReplicas: 1
+          volthaStacks: 10
+          workflow: tt
+          withEapol: false
+          withDhcp: true
+          withIgmp: true
+          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
+
+      # -----------------------------------------------------------------------
       # voltha-2.12 Jobs
       # -----------------------------------------------------------------------
       - 'voltha-scale-measurements':