diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 12f48d5..ef10083 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -11,22 +11,22 @@
           pipeline-script: 'voltha/master/software-upgrades.groovy'
           build-node: 'ubuntu18.04-basebuild-8c-15g'
           code-branch: 'master'
-          aaa-version: '2.5.0.SNAPSHOT'
-          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.5.0-SNAPSHOT/aaa-app-2.5.0-20210709.230755-1.oar'
-          olt-version: '5.0.0.SNAPSHOT'
-          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.0.0-SNAPSHOT/olt-app-5.0.0-20211213.185010-12.oar'
-          dhcpl2relay-version: '2.6.0.SNAPSHOT'
-          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.6.0-SNAPSHOT/dhcpl2relay-app-2.6.0-20210709.230656-1.oar'
-          igmpproxy-version: '2.4.0.SNAPSHOT'
-          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.4.0-SNAPSHOT/onos-app-igmpproxy-app-2.4.0-20210730.091648-1.oar'
-          sadis-version: '5.5.0.SNAPSHOT'
-          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.5.0-SNAPSHOT/sadis-app-5.5.0-20211217.002506-3.oar'
-          mcast-version: '2.5.0.SNAPSHOT'
-          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.5.0-SNAPSHOT/mcast-app-2.5.0-20210709.231023-1.oar'
-          kafka-version: '2.8.0.SNAPSHOT'
-          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.8.0-SNAPSHOT/kafka-2.8.0-20211119.231111-2.oar'
+          aaa-version: '2.5.0'
+          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.5.0/aaa-app-2.5.0.oar'
+          olt-version: '5.0.1'
+          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.0.1/olt-app-5.0.1.oar'
+          dhcpl2relay-version: '2.6.0'
+          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.6.0/dhcpl2relay-app-2.6.0.oar'
+          igmpproxy-version: '2.4.0'
+          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.4.0/onos-app-igmpproxy-app-2.4.0.oar'
+          sadis-version: '5.5.1'
+          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.5.1/sadis-app-5.5.1.oar'
+          mcast-version: '2.5.0'
+          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.5.0/mcast-app-2.5.0.oar'
+          kafka-version: '2.8.0'
+          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.8.0/kafka-2.8.0.oar'
           adapter-open-olt-image: 'voltha/voltha-openolt-adapter:4.1.5'
-          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:2.1.2'
+          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:2.1.3'
           rw-core-image: 'voltha/voltha-rw-core:3.0.2'
           ofagent-image: 'voltha/voltha-ofagent-go:2.0.1'
           onu-image-version: 'BBSM_IMG_00002'
@@ -57,7 +57,7 @@
           kafka-version: '2.7.0'
           kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.7.0/kafka-2.7.0.oar'
           adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.5.11'
-          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.16'
+          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.23'
           rw-core-image: 'voltha/voltha-rw-core:2.9.6'
           ofagent-image: 'voltha/voltha-ofagent-go:1.6.5'
           onu-image-version: 'BBSM_IMG_00002'