diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index a1110cf..086738c 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -16,7 +16,7 @@
           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-20210514.121228-5.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-20210511.123715-4.oar'
+          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.5.0-SNAPSHOT/dhcpl2relay-app-2.5.0-20210517.112839-5.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-20210511.123731-3.oar'
           sadis-version: '5.4.0.SNAPSHOT'
@@ -25,10 +25,10 @@
           mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0-SNAPSHOT/mcast-app-2.4.0-20210511.123716-4.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-20210504.153949-3.oar'
-          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.3.3'
+          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.4.0'
           adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.0'
           rw-core-image: 'voltha/voltha-rw-core:2.9.1'
-          ofagent-image: 'voltha/voltha-ofagent-go:1.6.1'
+          ofagent-image: 'voltha/voltha-ofagent-go:1.6.3'
           onu-image-name: 'software-image.img'
           onu-image-url: 'http://bbsim0:50074/images'
           onu-image-version: 'v1.0.0'
@@ -56,7 +56,7 @@
           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.1.8'
-          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.2.11'
+          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.2.14'
           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'