diff --git a/kubernetes-configs/voltha/dt-berlin-pod-gpon.yml b/kubernetes-configs/voltha/dt-berlin-pod-gpon.yml
index db76823..ab9e3e8 100644
--- a/kubernetes-configs/voltha/dt-berlin-pod-gpon.yml
+++ b/kubernetes-configs/voltha/dt-berlin-pod-gpon.yml
@@ -17,8 +17,7 @@
   image_pullPolicy: Always
 onos-classic:
   image:
-    repository: "andreacampanella/voltha-onos"
-    tag: "voltha-onos-2.5"
+    tag: master
 
 onosSshPort: 30115
 onosApiPort: 30120
@@ -29,7 +28,7 @@
 #images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
-#    tag: "voltha-onos-2.5"
+#    tag: "olt-required-drivers"
 
 deployments:
   etcdOperator: true
diff --git a/kubernetes-configs/voltha/dt-berlin-pod-multi-olt.yml b/kubernetes-configs/voltha/dt-berlin-pod-multi-olt.yml
index db76823..f739c7c 100644
--- a/kubernetes-configs/voltha/dt-berlin-pod-multi-olt.yml
+++ b/kubernetes-configs/voltha/dt-berlin-pod-multi-olt.yml
@@ -17,8 +17,7 @@
   image_pullPolicy: Always
 onos-classic:
   image:
-    repository: "andreacampanella/voltha-onos"
-    tag: "voltha-onos-2.5"
+    tag: "master"
 
 onosSshPort: 30115
 onosApiPort: 30120
@@ -29,7 +28,7 @@
 #images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
-#    tag: "voltha-onos-2.5"
+#    tag: "olt-required-drivers"
 
 deployments:
   etcdOperator: true
diff --git a/kubernetes-configs/voltha/dt-berlin-pod.yml b/kubernetes-configs/voltha/dt-berlin-pod.yml
index 911b912..772511c 100644
--- a/kubernetes-configs/voltha/dt-berlin-pod.yml
+++ b/kubernetes-configs/voltha/dt-berlin-pod.yml
@@ -17,8 +17,7 @@
   image_pullPolicy: Always
 onos-classic:
   image:
-    repository: "andreacampanella/voltha-onos"
-    tag: "voltha-onos-2.5"
+    tag: "master"
 
 onosSshPort: 30115
 onosApiPort: 30120
@@ -29,7 +28,7 @@
 #images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
-#    tag: "voltha-onos-2.5"
+#    tag: "olt-required-drivers"
 
 deployments:
   etcdOperator: true
diff --git a/kubernetes-configs/voltha/flex-ocp-cord.yml b/kubernetes-configs/voltha/flex-ocp-cord.yml
index ac0e1d9..afdf2be 100644
--- a/kubernetes-configs/voltha/flex-ocp-cord.yml
+++ b/kubernetes-configs/voltha/flex-ocp-cord.yml
@@ -17,8 +17,7 @@
   image_pullPolicy: Always
 onos-classic:
   image:
-    repository: "andreacampanella/voltha-onos"
-    tag: "voltha-onos-2.5"
+    tag: master
 
 onosSshPort: 30115
 onosApiPort: 30120
@@ -29,7 +28,7 @@
 #images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
-#    tag: "voltha-onos-2.5"
+#    tag: "olt-required-drivers"
 #  adapter_open_onu:
 #     repository: gcgirish/voltha-openonu-adapter
 #     tag: ttfix
diff --git a/kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml b/kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml
index 5f1381c..8865a19 100644
--- a/kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml
+++ b/kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml
@@ -17,8 +17,7 @@
   image_pullPolicy: Always
 onos-classic:
   image:
-    repository: "andreacampanella/voltha-onos"
-    tag: "voltha-onos-2.5"
+    tag: master
 
 onosSshPort: 30115
 onosApiPort: 30120
@@ -29,7 +28,7 @@
 #images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
-#    tag: "voltha-onos-2.5"
+#    tag: "app-update-sadis"
 
 network:
   netconfUserSecret: ''
diff --git a/kubernetes-configs/voltha/onf-demo-pod-gpon.yml b/kubernetes-configs/voltha/onf-demo-pod-gpon.yml
index 82b4103..907266e 100644
--- a/kubernetes-configs/voltha/onf-demo-pod-gpon.yml
+++ b/kubernetes-configs/voltha/onf-demo-pod-gpon.yml
@@ -17,8 +17,7 @@
   image_pullPolicy: Always
 onos-classic:
   image:
-    repository: "andreacampanella/voltha-onos"
-    tag: "voltha-onos-2.5"
+    tag: "master"
 
 onosSshPort: 30115
 onosApiPort: 30120
@@ -28,7 +27,7 @@
 #images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
-#    tag: "voltha-onos-2.5"
+#    tag: "olt-required-drivers"
 #  adapter_open_onu:
 #    repository: gcgirish/voltha-openonu-adapter
 #    tag: tpstate
diff --git a/kubernetes-configs/voltha/onf-demo-pod.yml b/kubernetes-configs/voltha/onf-demo-pod.yml
index 5ec198e..403842a 100644
--- a/kubernetes-configs/voltha/onf-demo-pod.yml
+++ b/kubernetes-configs/voltha/onf-demo-pod.yml
@@ -17,8 +17,7 @@
   image_pullPolicy: Always
 onos-classic:
   image:
-    repository: "andreacampanella/voltha-onos"
-    tag: "voltha-onos-2.5"
+    tag: master
 
 onosSshPort: 30115
 onosApiPort: 30120
@@ -29,7 +28,7 @@
 #images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
-#    tag: "voltha-onos-2.5"
+#    tag: "olt-required-drivers"
 #  adapter_open_onu:
 #    repository: gcgirish/voltha-openonu-adapter
 #    tag: tpstate
diff --git a/kubernetes-configs/voltha/onlab-pod1.yml b/kubernetes-configs/voltha/onlab-pod1.yml
index 6110821..0935108 100644
--- a/kubernetes-configs/voltha/onlab-pod1.yml
+++ b/kubernetes-configs/voltha/onlab-pod1.yml
@@ -17,8 +17,7 @@
   image_pullPolicy: Always
 onos-classic:
   image:
-    repository: "andreacampanella/voltha-onos"
-    tag: "voltha-onos-2.5"
+    tag: "master"
 
 deployments:
   etcdOperator: true