diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 01ee9a8..c11da23 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -9,25 +9,54 @@
       - 'software-upgrades-test':
           name: 'periodic-software-upgrade-test-bbsim'
           pipeline-script: 'voltha/master/software-upgrades.groovy'
-          onos-image: 'andreacampanella/voltha-onos:olt-required-drivers'
           build-node: 'qct-pod4-node2'
           code-branch: 'master'
-          aaa-version: '2.3.0.SNAPSHOT'
-          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.3.0-SNAPSHOT/aaa-app-2.3.0-20210322.191830-3.oar'
-          olt-version: '4.4.0.SNAPSHOT'
-          olt-oar-url: '10.128.200.1:8000/olt-app-4.4.0-SNAPSHOT.oar'
-          dhcpl2relay-version: '2.4.0.SNAPSHOT'
-          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.4.0-SNAPSHOT/dhcpl2relay-app-2.4.0-20210311.091154-2.oar'
-          igmpproxy-version: '2.2.0.SNAPSHOT'
-          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.2.0-SNAPSHOT/onos-app-igmpproxy-app-2.2.0-20210312.105254-9.oar'
-          sadis-version: '5.3.0.SNAPSHOT'
-          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.3.0-SNAPSHOT/sadis-app-5.3.0-20210311.085841-3.oar'
-          mcast-version: '2.2.0.SNAPSHOT'
-          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.2.0-SNAPSHOT/mcast-app-2.2.0-20210316.083454-5.oar'
-          kafka-version: '2.6.0.SNAPSHOT'
-          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.6.0-SNAPSHOT/kafka-2.6.0-20210311.093145-2.oar'
+          aaa-version: '2.3.0'
+          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.3.0/aaa-app-2.3.0.oar'
+          olt-version: '4.4.0'
+          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/4.4.0/olt-app-4.4.0.oar'
+          dhcpl2relay-version: '2.4.0'
+          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.4.0/dhcpl2relay-app-2.4.0.oar'
+          igmpproxy-version: '2.2.0'
+          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.2.0/onos-app-igmpproxy-app-2.2.0.oar'
+          sadis-version: '5.3.0'
+          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.3.0/sadis-app-5.3.0.oar'
+          mcast-version: '2.3.2'
+          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.3.2/mcast-app-2.3.2.oar'
+          kafka-version: '2.6.0'
+          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.6.0/kafka-2.6.0.oar'
           adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.2.0'
-          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.2.6'
+          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.2.8'
+          rw-core-image: 'voltha/voltha-rw-core:2.7.0'
+          ofagent-image: 'voltha/voltha-ofagent-go:1.5.2'
+          onu-image-name: 'software-image.img'
+          onu-image-url: 'http://bbsim0:50074/images'
+          onu-image-version: 'v1.0.0'
+          onu-image-crc: '0'
+          onu-image-local-dir: '/tmp'
+          time-trigger: "H H/23 * * *"
+
+      - 'software-upgrades-test':
+          name: 'periodic-software-upgrade-test-bbsim-2.7'
+          pipeline-script: 'voltha/master/software-upgrades.groovy'
+          build-node: 'qct-pod4-node2'
+          code-branch: 'voltha-2.7'
+          aaa-version: '2.3.0'
+          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.3.0/aaa-app-2.3.0.oar'
+          olt-version: '4.4.0'
+          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/4.4.0/olt-app-4.4.0.oar'
+          dhcpl2relay-version: '2.4.0'
+          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.4.0/dhcpl2relay-app-2.4.0.oar'
+          igmpproxy-version: '2.2.0'
+          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.2.0/onos-app-igmpproxy-app-2.2.0.oar'
+          sadis-version: '5.3.0'
+          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.3.0/sadis-app-5.3.0.oar'
+          mcast-version: '2.3.2'
+          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.3.2/mcast-app-2.3.2.oar'
+          kafka-version: '2.6.0'
+          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.6.0/kafka-2.6.0.oar'
+          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.2.0'
+          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.2.8'
           rw-core-image: 'voltha/voltha-rw-core:2.7.0'
           ofagent-image: 'voltha/voltha-ofagent-go:1.5.2'
           onu-image-name: 'software-image.img'
@@ -93,7 +122,7 @@
 
       - string:
           name: onosImg
-          default: '{onos-image}'
+          default: ''
           description: 'ONOS Image to use'
 
       - string: