diff --git a/kubernetes-configs/flex-ocp-cord-voltha-master.yml b/kubernetes-configs/flex-ocp-cord-voltha-master.yml
index 08fd7e5..3d86bab 100644
--- a/kubernetes-configs/flex-ocp-cord-voltha-master.yml
+++ b/kubernetes-configs/flex-ocp-cord-voltha-master.yml
@@ -15,7 +15,6 @@
 
 # Automated deployment configuration for Flex POD 1 , olt/onu are connected to this
 
-# This file is used to optionally customize helm charts installations
 images:
 # VOLTHA
   envoy_for_etcd:
@@ -31,11 +30,19 @@
     tag: 'voltha-1.7'
 
   vcore:
+    #repository: '10.90.0.101:30500/voltha/voltha-voltha'
     tag: 'voltha-1.7'
+    #tag: 'dev'
 
 # ONOS
   onos:
-    tag: '1.13.9-rc4'
+    repository: 'matteoscandolo/onos'
+    tag: '1.13-branch'
+    #tag: '1.13.9-rc4'
+
+volt:
+  image:
+    tag: 'master'
 
 rcord:
   image:
@@ -51,7 +58,9 @@
     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"
+#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"
 
 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"
@@ -72,3 +81,4 @@
   log4j.logger.org.opencord.sadis = DEBUG
   log4j.logger.org.opencord.aaa = DEBUG
   log4j.logger.org.opencord.dhcpl2relay = DEBUG
+