diff --git a/kubernetes-configs/bbsim-voltha-master.yml b/kubernetes-configs/bbsim-voltha-master.yml
index e4dd50e..bb7afec 100644
--- a/kubernetes-configs/bbsim-voltha-master.yml
+++ b/kubernetes-configs/bbsim-voltha-master.yml
@@ -37,8 +37,7 @@
 # ONOS
   onos:
     repository: 'onosproject/onos'
-    tag: 'latest'
-    pullPolicy: 'Never'
+    tag: '1.13.9'
 
 # VOLTHA
   vcore:
@@ -121,26 +120,24 @@
 
 
 # ONOS applications
-aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa-app&v=1.9.0-SNAPSHOT&e=oar"
-aaaAppVersion: "1.9.0.SNAPSHOT"
+aaaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/1.9.0/aaa-app-1.9.0.oar"
+aaaAppVersion: "1.9.0"
 
-sadisAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=sadis-app&v=3.1.0-SNAPSHOT&e=oar"
-sadisAppVersion: "3.1.0.SNAPSHOT"
+sadisAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/3.1.0/sadis-app-3.1.0.oar"
+sadisAppVersion: "3.1.0"
 
-#dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=dhcpl2relay-app&v=1.6.0-SNAPSHOT&e=oar"
-dhcpl2relayAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/1.6.0-SNAPSHOT/dhcpl2relay-app-1.6.0-20190626.071551-54.oar"
-dhcpl2relayAppVersion: "1.6.0.SNAPSHOT"
+dhcpl2relayAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/1.6.0/dhcpl2relay-app-1.6.0.oar"
+dhcpl2relayAppVersion: "1.6.0"
 
-#oltAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=olt-app&v=3.0.1-SNAPSHOT&e=oar"
-oltAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/3.0.1-SNAPSHOT/olt-app-3.0.1-20190523.225654-67.oar"
-oltAppVersion: "3.0.1.SNAPSHOT"
+oltAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/3.0.1/olt-app-3.0.1.oar"
+oltAppVersion: "3.0.1"
 
-kafkaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=kafka&v=1.1.0-SNAPSHOT&e=oar"
-kafkaAppVersion: "1.1.0.SNAPSHOT"
+kafkaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/kafka/1.1.0/kafka-1.1.0.oar"
+kafkaAppVersion: "1.1.0"
 
 application_logs: |
   log4j.logger.org.opencord.olt = DEBUG
   log4j.logger.org.opencord.kafka = TRACE
   log4j.logger.org.opencord.sadis = DEBUG
   log4j.logger.org.opencord.aaa = DEBUG
-  log4j.logger.org.opencord.dhcpl2relay = TRACE
+  log4j.logger.org.opencord.dhcpl2relay = TRACE
\ No newline at end of file
diff --git a/kubernetes-configs/flex-ocp-cord-voltha-master.yml b/kubernetes-configs/flex-ocp-cord-voltha-master.yml
index bf7ef57..2e9f94c 100644
--- a/kubernetes-configs/flex-ocp-cord-voltha-master.yml
+++ b/kubernetes-configs/flex-ocp-cord-voltha-master.yml
@@ -33,15 +33,13 @@
     tag: 'voltha-1.7'
 
   vcore:
-    #repository: '10.90.0.101:30500/voltha/voltha-voltha'
     tag: 'voltha-1.7'
-    #tag: 'dev'
 
 # ONOS
   onos:
-    repository: 'matteoscandolo/onos'
-    tag: '1.13-branch'
-    #tag: '1.13.9-rc4'
+    repository: 'onosproject/onos'
+    tag: '1.13.9'
+
 xos-gui:
   images:
     xos_gui:
@@ -55,15 +53,11 @@
 
 rcord:
   image:
-    #repository: '10.90.0.101:30500/xosproject/rcord-synchronizer'
-    #tag: 'candidate'
     tag: 'master'
 
 att-workflow-driver:
   image:
     tag: 'master'
-    #repository: '10.90.0.101:30500/xosproject/att-workflow-driver-synchronizer'
-    #tag: 'candidate'
 
 sadis-server:
   image:
@@ -71,22 +65,20 @@
     tag: latest
 
 # ONOS applications
-#aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa-app&v=1.9.0-SNAPSHOT&e=oar"
-#using older aaa-app version due to bug
-aaaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/1.9.0-SNAPSHOT/aaa-app-1.9.0-20190521.071409-20.oar"
-aaaAppVersion: "1.9.0.SNAPSHOT"
+aaaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/1.9.0/aaa-app-1.9.0.oar"
+aaaAppVersion: "1.9.0"
 
-sadisAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=sadis-app&v=3.1.0-SNAPSHOT&e=oar"
-sadisAppVersion: "3.1.0.SNAPSHOT"
+sadisAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/3.1.0/sadis-app-3.1.0.oar"
+sadisAppVersion: "3.1.0"
 
-dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=dhcpl2relay-app&v=1.6.0-SNAPSHOT&e=oar"
-dhcpl2relayAppVersion: "1.6.0.SNAPSHOT"
+dhcpl2relayAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/1.6.0/dhcpl2relay-app-1.6.0.oar"
+dhcpl2relayAppVersion: "1.6.0"
 
-oltAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=olt-app&v=3.0.1-SNAPSHOT&e=oar"
-oltAppVersion: "3.0.1.SNAPSHOT"
+oltAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/3.0.1/olt-app-3.0.1.oar"
+oltAppVersion: "3.0.1"
 
-kafkaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=kafka&v=1.1.0-SNAPSHOT&e=oar"
-kafkaAppVersion: "1.1.0.SNAPSHOT"
+kafkaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/kafka/1.1.0/kafka-1.1.0.oar"
+kafkaAppVersion: "1.1.0"
 
 application_logs: |
   log4j.logger.org.opencord.olt = DEBUG