diff --git a/kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml b/kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml
index a667e8b..a870f16 100644
--- a/kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml
+++ b/kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml
@@ -22,13 +22,16 @@
 
 individualOpenFlowNodePorts: true
 
+voltha:
+  images:
+    rw_core:
+      tag: "3.6.4"
+
 images:
   adapter_adtran_olt:
     registry: "registry.berlin-lab.lfbroadband.org/"
     repository: "voltha-adtran-adapter"
     tag: "2.11.2"
-  rw_core:
-    tag: "3.6.4"
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
 #    tag: "app-update-sadis"
diff --git a/kubernetes-configs/voltha/berlin-community-pod-1-gpon-fttb.yml b/kubernetes-configs/voltha/berlin-community-pod-1-gpon-fttb.yml
index 7a697d7..dbec967 100644
--- a/kubernetes-configs/voltha/berlin-community-pod-1-gpon-fttb.yml
+++ b/kubernetes-configs/voltha/berlin-community-pod-1-gpon-fttb.yml
@@ -25,9 +25,12 @@
 
 individualOpenFlowNodePorts: true
 
-images:
-  rw_core:
-    tag: "3.6.4"
+voltha:
+  images:
+    rw_core:
+      tag: "3.6.4"
+
+#images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
 #    tag: "olt-required-drivers"
diff --git a/kubernetes-configs/voltha/berlin-community-pod-1-gpon.yml b/kubernetes-configs/voltha/berlin-community-pod-1-gpon.yml
index 7a697d7..c0170f1 100644
--- a/kubernetes-configs/voltha/berlin-community-pod-1-gpon.yml
+++ b/kubernetes-configs/voltha/berlin-community-pod-1-gpon.yml
@@ -25,9 +25,12 @@
 
 individualOpenFlowNodePorts: true
 
-images:
-  rw_core:
-    tag: "3.6.4"
+voltha:
+  images:
+    rw_core:
+      tag: "3.6.4"
+
+#images
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
 #    tag: "olt-required-drivers"
diff --git a/kubernetes-configs/voltha/berlin-community-pod-1-multi-olt.yml b/kubernetes-configs/voltha/berlin-community-pod-1-multi-olt.yml
index 4f7f51d..377c2e1 100644
--- a/kubernetes-configs/voltha/berlin-community-pod-1-multi-olt.yml
+++ b/kubernetes-configs/voltha/berlin-community-pod-1-multi-olt.yml
@@ -25,9 +25,12 @@
 
 individualOpenFlowNodePorts: true
 
-images:
-  rw_core:
-    tag: "3.6.4"
+voltha:
+  images:
+    rw_core:
+      tag: "3.6.4"
+
+#images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
 #    tag: "olt-required-drivers"
diff --git a/kubernetes-configs/voltha/berlin-community-pod-1.yml b/kubernetes-configs/voltha/berlin-community-pod-1.yml
index 63a4fb0..be11477 100644
--- a/kubernetes-configs/voltha/berlin-community-pod-1.yml
+++ b/kubernetes-configs/voltha/berlin-community-pod-1.yml
@@ -25,9 +25,12 @@
 
 individualOpenFlowNodePorts: true
 
-images:
-  rw_core:
-    tag: "3.6.4"
+voltha:
+  images:
+    rw_core:
+      tag: "3.6.4"
+
+#images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
 #    tag: "olt-required-drivers"
diff --git a/kubernetes-configs/voltha/berlin-community-pod-2-gpon-zyxel.yml b/kubernetes-configs/voltha/berlin-community-pod-2-gpon-zyxel.yml
index 7a697d7..dbec967 100644
--- a/kubernetes-configs/voltha/berlin-community-pod-2-gpon-zyxel.yml
+++ b/kubernetes-configs/voltha/berlin-community-pod-2-gpon-zyxel.yml
@@ -25,9 +25,12 @@
 
 individualOpenFlowNodePorts: true
 
-images:
-  rw_core:
-    tag: "3.6.4"
+voltha:
+  images:
+    rw_core:
+      tag: "3.6.4"
+
+#images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
 #    tag: "olt-required-drivers"
diff --git a/kubernetes-configs/voltha/berlin-community-pod-2-xgspon-zyxel.yml b/kubernetes-configs/voltha/berlin-community-pod-2-xgspon-zyxel.yml
index 7a697d7..dbec967 100644
--- a/kubernetes-configs/voltha/berlin-community-pod-2-xgspon-zyxel.yml
+++ b/kubernetes-configs/voltha/berlin-community-pod-2-xgspon-zyxel.yml
@@ -25,9 +25,12 @@
 
 individualOpenFlowNodePorts: true
 
-images:
-  rw_core:
-    tag: "3.6.4"
+voltha:
+  images:
+    rw_core:
+      tag: "3.6.4"
+
+#images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
 #    tag: "olt-required-drivers"