diff --git a/kubernetes-configs/voltha/dt-berlin-pod-gpon.yml b/kubernetes-configs/voltha/dt-berlin-pod-gpon.yml
index 1aaf8e5..ab9e3e8 100644
--- a/kubernetes-configs/voltha/dt-berlin-pod-gpon.yml
+++ b/kubernetes-configs/voltha/dt-berlin-pod-gpon.yml
@@ -12,9 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-defaults:
+global:
   image_tag: master
   image_pullPolicy: Always
+onos-classic:
+  image:
+    tag: master
 
 onosSshPort: 30115
 onosApiPort: 30120
diff --git a/kubernetes-configs/voltha/flex-ocp-cord.yml b/kubernetes-configs/voltha/flex-ocp-cord.yml
index 09a03ba..afdf2be 100644
--- a/kubernetes-configs/voltha/flex-ocp-cord.yml
+++ b/kubernetes-configs/voltha/flex-ocp-cord.yml
@@ -12,9 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-defaults:
+global:
   image_tag: master
   image_pullPolicy: Always
+onos-classic:
+  image:
+    tag: master
 
 onosSshPort: 30115
 onosApiPort: 30120
diff --git a/kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml b/kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml
index e3949a2..8865a19 100644
--- a/kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml
+++ b/kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml
@@ -12,9 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-defaults:
+global:
   image_tag: master
   image_pullPolicy: Always
+onos-classic:
+  image:
+    tag: master
 
 onosSshPort: 30115
 onosApiPort: 30120
@@ -67,4 +70,3 @@
 atomix:
   persistence:
     enabled: false
-
diff --git a/kubernetes-configs/voltha/onf-demo-pod.yml b/kubernetes-configs/voltha/onf-demo-pod.yml
index 825f358..f9500f7 100644
--- a/kubernetes-configs/voltha/onf-demo-pod.yml
+++ b/kubernetes-configs/voltha/onf-demo-pod.yml
@@ -12,9 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-defaults:
+global:
   image_tag: master
   image_pullPolicy: Always
+onos-classic:
+  image:
+    tag: master
 
 onosSshPort: 30115
 onosApiPort: 30120