diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 61a4711..3591992 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -25,10 +25,10 @@
           mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0/mcast-app-2.4.0.oar'
           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.6.2'
-          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.4.0'
-          rw-core-image: 'voltha/voltha-rw-core:2.9.3'
-          ofagent-image: 'voltha/voltha-ofagent-go:1.6.5'
+          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:4.0.0'
+          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:2.0.1'
+          rw-core-image: 'voltha/voltha-rw-core:3.0.0'
+          ofagent-image: 'voltha/voltha-ofagent-go:2.0.0'
           onu-image-version: 'BBSM_IMG_00002'
           onu-image-url: 'http://bbsim0:50074/images/software-image.img'
           onu-image-vendor: 'BBSM'
@@ -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.5'
-          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.12'
+          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.13'
           rw-core-image: 'voltha/voltha-rw-core:2.9.3'
           ofagent-image: 'voltha/voltha-ofagent-go:1.6.5'
           onu-image-version: 'BBSM_IMG_00002'