[VOL-2586] Migrate PODs to ONOS-2.2 official release

Change-Id: I9ccbac115946c887056b5d37096de8ed24c945eb
diff --git a/kubernetes-configs/voltha/flex-ocp-cord.yml b/kubernetes-configs/voltha/flex-ocp-cord.yml
index 592d4e5..f1cde57 100644
--- a/kubernetes-configs/voltha/flex-ocp-cord.yml
+++ b/kubernetes-configs/voltha/flex-ocp-cord.yml
@@ -16,15 +16,10 @@
   image_tag: master
   image_pullPolicy: Always
 
-#images:
-#  onos:
-#    repository: voltha/voltha-onos
-#    tag: onos-2.2 
-
 images:
   onos:
-    repository: matteoscandolo/voltha-onos
-    tag: onos-2.2-latest-apps
+    repository: voltha/voltha-onos
+    tag: onos-2.2
 
 deployments:
   etcdOperator: true
diff --git a/kubernetes-configs/voltha/infosys-pod.yml b/kubernetes-configs/voltha/infosys-pod.yml
index 3a898a7..f1cde57 100644
--- a/kubernetes-configs/voltha/infosys-pod.yml
+++ b/kubernetes-configs/voltha/infosys-pod.yml
@@ -16,6 +16,11 @@
   image_tag: master
   image_pullPolicy: Always
 
+images:
+  onos:
+    repository: voltha/voltha-onos
+    tag: onos-2.2
+
 deployments:
   etcdOperator: true
   backupOperator: false
diff --git a/kubernetes-configs/voltha/onf-demo-pod.yml b/kubernetes-configs/voltha/onf-demo-pod.yml
index c5e57fe..f1cde57 100644
--- a/kubernetes-configs/voltha/onf-demo-pod.yml
+++ b/kubernetes-configs/voltha/onf-demo-pod.yml
@@ -18,8 +18,8 @@
 
 images:
   onos:
-    repository: matteoscandolo/voltha-onos
-    tag: 1.13.10
+    repository: voltha/voltha-onos
+    tag: onos-2.2
 
 deployments:
   etcdOperator: true