diff --git a/kubernetes-configs/voltha/dt-berlin-pod-gpon.yml b/kubernetes-configs/voltha/dt-berlin-pod-gpon.yml
index ab9e3e8..db76823 100644
--- a/kubernetes-configs/voltha/dt-berlin-pod-gpon.yml
+++ b/kubernetes-configs/voltha/dt-berlin-pod-gpon.yml
@@ -17,7 +17,8 @@
   image_pullPolicy: Always
 onos-classic:
   image:
-    tag: master
+    repository: "andreacampanella/voltha-onos"
+    tag: "voltha-onos-2.5"
 
 onosSshPort: 30115
 onosApiPort: 30120
@@ -28,7 +29,7 @@
 #images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
-#    tag: "olt-required-drivers"
+#    tag: "voltha-onos-2.5"
 
 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 0cc20a9..db76823 100644
--- a/kubernetes-configs/voltha/dt-berlin-pod-multi-olt.yml
+++ b/kubernetes-configs/voltha/dt-berlin-pod-multi-olt.yml
@@ -15,6 +15,10 @@
 global:
   image_tag: master
   image_pullPolicy: Always
+onos-classic:
+  image:
+    repository: "andreacampanella/voltha-onos"
+    tag: "voltha-onos-2.5"
 
 onosSshPort: 30115
 onosApiPort: 30120
@@ -25,7 +29,7 @@
 #images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
-#    tag: "olt-required-drivers"
+#    tag: "voltha-onos-2.5"
 
 deployments:
   etcdOperator: true
diff --git a/kubernetes-configs/voltha/dt-berlin-pod.yml b/kubernetes-configs/voltha/dt-berlin-pod.yml
index 4723038..911b912 100644
--- a/kubernetes-configs/voltha/dt-berlin-pod.yml
+++ b/kubernetes-configs/voltha/dt-berlin-pod.yml
@@ -15,6 +15,10 @@
 global:
   image_tag: master
   image_pullPolicy: Always
+onos-classic:
+  image:
+    repository: "andreacampanella/voltha-onos"
+    tag: "voltha-onos-2.5"
 
 onosSshPort: 30115
 onosApiPort: 30120
@@ -25,7 +29,7 @@
 #images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
-#    tag: "olt-required-drivers"
+#    tag: "voltha-onos-2.5"
 
 deployments:
   etcdOperator: true
diff --git a/kubernetes-configs/voltha/flex-ocp-cord.yml b/kubernetes-configs/voltha/flex-ocp-cord.yml
index afdf2be..ac0e1d9 100644
--- a/kubernetes-configs/voltha/flex-ocp-cord.yml
+++ b/kubernetes-configs/voltha/flex-ocp-cord.yml
@@ -17,7 +17,8 @@
   image_pullPolicy: Always
 onos-classic:
   image:
-    tag: master
+    repository: "andreacampanella/voltha-onos"
+    tag: "voltha-onos-2.5"
 
 onosSshPort: 30115
 onosApiPort: 30120
@@ -28,7 +29,7 @@
 #images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
-#    tag: "olt-required-drivers"
+#    tag: "voltha-onos-2.5"
 #  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 8865a19..5f1381c 100644
--- a/kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml
+++ b/kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml
@@ -17,7 +17,8 @@
   image_pullPolicy: Always
 onos-classic:
   image:
-    tag: master
+    repository: "andreacampanella/voltha-onos"
+    tag: "voltha-onos-2.5"
 
 onosSshPort: 30115
 onosApiPort: 30120
@@ -28,7 +29,7 @@
 #images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
-#    tag: "app-update-sadis"
+#    tag: "voltha-onos-2.5"
 
 network:
   netconfUserSecret: ''
diff --git a/kubernetes-configs/voltha/onf-demo-pod-gpon.yml b/kubernetes-configs/voltha/onf-demo-pod-gpon.yml
index b9a3414..82b4103 100644
--- a/kubernetes-configs/voltha/onf-demo-pod-gpon.yml
+++ b/kubernetes-configs/voltha/onf-demo-pod-gpon.yml
@@ -15,6 +15,10 @@
 global:
   image_tag: master
   image_pullPolicy: Always
+onos-classic:
+  image:
+    repository: "andreacampanella/voltha-onos"
+    tag: "voltha-onos-2.5"
 
 onosSshPort: 30115
 onosApiPort: 30120
@@ -24,7 +28,7 @@
 #images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
-#    tag: "olt-required-drivers"
+#    tag: "voltha-onos-2.5"
 #  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 403842a..5ec198e 100644
--- a/kubernetes-configs/voltha/onf-demo-pod.yml
+++ b/kubernetes-configs/voltha/onf-demo-pod.yml
@@ -17,7 +17,8 @@
   image_pullPolicy: Always
 onos-classic:
   image:
-    tag: master
+    repository: "andreacampanella/voltha-onos"
+    tag: "voltha-onos-2.5"
 
 onosSshPort: 30115
 onosApiPort: 30120
@@ -28,7 +29,7 @@
 #images:
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
-#    tag: "olt-required-drivers"
+#    tag: "voltha-onos-2.5"
 #  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 5637187..6110821 100644
--- a/kubernetes-configs/voltha/onlab-pod1.yml
+++ b/kubernetes-configs/voltha/onlab-pod1.yml
@@ -15,6 +15,10 @@
 global:
   image_tag: master
   image_pullPolicy: Always
+onos-classic:
+  image:
+    repository: "andreacampanella/voltha-onos"
+    tag: "voltha-onos-2.5"
 
 deployments:
   etcdOperator: true