diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 65991c5..906b625 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -12,22 +12,22 @@
           build-node: 'ubuntu18.04-basebuild-8c-15g'
           code-branch: 'master'
           aaa-version: '2.6.0.SNAPSHOT'
-          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.6.0-SNAPSHOT/aaa-app-2.6.0-20220318.145620-3.oar'
+          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.6.0-SNAPSHOT/aaa-app-2.6.0-20220527.132039-4.oar'
           olt-version: '5.1.0.SNAPSHOT'
-          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.1.0-SNAPSHOT/olt-app-5.1.0-20220503.122002-14.oar'
+          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.1.0-SNAPSHOT/olt-app-5.1.0-20220621.091558-19.oar'
           dhcpl2relay-version: '2.7.0.SNAPSHOT'
-          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.7.0-SNAPSHOT/dhcpl2relay-app-2.7.0-20220318.145606-4.oar'
+          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.7.0-SNAPSHOT/dhcpl2relay-app-2.7.0-20220527.132023-5.oar'
           igmpproxy-version: '2.5.0.SNAPSHOT'
           igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.5.0-SNAPSHOT/onos-app-igmpproxy-app-2.5.0-20220318.145612-3.oar'
           sadis-version: '5.6.0.SNAPSHOT'
-          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.6.0-SNAPSHOT/sadis-app-5.6.0-20220318.103602-7.oar'
+          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.6.0-SNAPSHOT/sadis-app-5.6.0-20220614.170917-8.oar'
           mcast-version: '2.6.0.SNAPSHOT'
           mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.6.0-SNAPSHOT/mcast-app-2.6.0-20220318.145711-3.oar'
           kafka-version: '2.9.0.SNAPSHOT'
-          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.9.0-SNAPSHOT/kafka-2.9.0-20220324.143019-4.oar'
-          openolt-adapter-deploy-base-tag: '4.2.2'
-          openonu-adapter-deploy-base-tag: '2.2.3'
-          rw-core-deploy-base-tag: '3.1.2'
+          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.9.0-SNAPSHOT/kafka-2.9.0-20220609.001209-5.oar'
+          openolt-adapter-deploy-base-tag: '4.2.4'
+          openonu-adapter-deploy-base-tag: '2.2.7'
+          rw-core-deploy-base-tag: '3.1.4'
           ofagent-deploy-base-tag: '2.1.2'
           onu-image-version: 'BBSM_IMG_00002'
           onu-image-url: 'http://bbsim0:50074/images/software-image.img'
@@ -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.12'
-          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.27'
+          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.28'
           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'