diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index c11da23..1d2b17f 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -11,23 +11,23 @@
           pipeline-script: 'voltha/master/software-upgrades.groovy'
           build-node: 'qct-pod4-node2'
           code-branch: 'master'
-          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'
+          aaa-version: '2.4.0.SNAPSHOT'
+          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.4.0-SNAPSHOT/aaa-app-2.4.0-20210330.115023-1.oar'
+          olt-version: '4.5.0.SNAPSHOT'
+          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/4.5.0-SNAPSHOT/olt-app-4.5.0-20210330.115335-1.oar'
+          dhcpl2relay-version: '2.5.0.SNAPSHOT'
+          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.5.0-SNAPSHOT/dhcpl2relay-app-2.5.0-20210401.173400-2.oar'
+          igmpproxy-version: '2.3.0.SNAPSHOT'
+          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.3.0-SNAPSHOT/onos-app-igmpproxy-app-2.3.0-20210330.123148-1.oar'
+          sadis-version: '5.4.0.SNAPSHOT'
+          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.4.0-SNAPSHOT/sadis-app-5.4.0-20210330.080559-1.oar'
+          mcast-version: '2.4.0.SNAPSHOT'
+          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0-SNAPSHOT/mcast-app-2.4.0-20210330.215302-2.oar'
+          kafka-version: '2.7.0.SNAPSHOT'
+          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.7.0-SNAPSHOT/kafka-2.7.0-20210330.193240-1.oar'
+          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.2.1'
+          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.2.10'
+          rw-core-image: 'voltha/voltha-rw-core:2.8.2'
           ofagent-image: 'voltha/voltha-ofagent-go:1.5.2'
           onu-image-name: 'software-image.img'
           onu-image-url: 'http://bbsim0:50074/images'
@@ -55,7 +55,7 @@
           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-olt-image: 'voltha/voltha-openolt-adapter:3.1.8'
           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'