diff --git a/jjb/pipeline/voltha/master/software-upgrades.groovy b/jjb/pipeline/voltha/master/software-upgrades.groovy
index 811d642..a56673d 100644
--- a/jjb/pipeline/voltha/master/software-upgrades.groovy
+++ b/jjb/pipeline/voltha/master/software-upgrades.groovy
@@ -24,7 +24,7 @@
   stage('Deploy Voltha - '+ name) {
       def extraHelmFlags = "${extraHelmFlags} --set global.log_level=DEBUG,onu=1,pon=1 --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 "
       if ("${name}" == "onos-app-upgrade") {
-          extraHelmFlags = extraHelmFlags + "--set global.image_tag=master "
+          extraHelmFlags = extraHelmFlags + "--set global.image_tag=master --set images.onos_config_loader.tag=master-onos-config-loader "
       }
       extraHelmFlags = extraHelmFlags + """ --set voltha.services.controller[0].service=voltha-infra-onos-classic-0.voltha-infra-onos-classic-hs.infra.svc \
       --set voltha.services.controller[0].port=6653 \
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 1fced67..d2dd947 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -14,21 +14,21 @@
           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'
+          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/4.5.0-SNAPSHOT/olt-app-4.5.0-20210421.101421-2.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'
+          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.4.0-SNAPSHOT/sadis-app-5.4.0-20210421.084108-2.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'
+          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.3.2'
+          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.2.11'
+          rw-core-image: 'voltha/voltha-rw-core:2.9.1'
+          ofagent-image: 'voltha/voltha-ofagent-go:1.6.1'
           onu-image-name: 'software-image.img'
           onu-image-url: 'http://bbsim0:50074/images'
           onu-image-version: 'v1.0.0'