diff --git a/config/overlays/odh/default/kustomization.yaml b/config/overlays/odh/default/kustomization.yaml
index bb13cc59d..67923638b 100644
--- a/config/overlays/odh/default/kustomization.yaml
+++ b/config/overlays/odh/default/kustomization.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
diff --git a/config/overlays/odh/default/params.yaml b/config/overlays/odh/default/params.yaml
index a0a198310..770b02501 100644
--- a/config/overlays/odh/default/params.yaml
+++ b/config/overlays/odh/default/params.yaml
@@ -1,4 +1,3 @@
 varReference:
-  - path: spec/template/spec/containers[]/image
+  - path: spec/template/spec/containers/image
     kind: Deployment
-    apiVersion: apps/v1
diff --git a/config/overlays/odh/kustomization.yaml b/config/overlays/odh/kustomization.yaml
index 72ac1375d..1a4b76340 100644
--- a/config/overlays/odh/kustomization.yaml
+++ b/config/overlays/odh/kustomization.yaml
@@ -1,65 +1,68 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+
 resources:
-  - ../../prometheus
-  - ./default
-  - ./scripts
-  - ./quickstart.yaml
-  - ./rbac
+- ../../prometheus
+- ./default
+- ./scripts
+- ./quickstart.yaml
+- ./rbac
 
 namespace: opendatahub
 configMapGenerator:
-  - envs:
-      - params.env
-    name: mesh-parameters
+- envs:
+  - params.env
+  name: mesh-parameters
 generatorOptions:
   disableNameSuffixHash: true
 
+patches:
+  - path: ./crd/clusterservingruntime_patch_delete.yaml
 
 vars:
-  - fieldref:
-      fieldPath: metadata.namespace
-    name: mesh-namespace
-    objref:
-      apiVersion: v1
-      kind: ConfigMap
-      name: mesh-parameters
-  - fieldref:
-      fieldPath: data.odh-modelmesh
-    name: odh-modelmesh
-    objref:
-      apiVersion: v1
-      kind: ConfigMap
-      name: mesh-parameters
-  - fieldref:
-      fieldPath: data.odh-mm-rest-proxy
-    name: odh-mm-rest-proxy
-    objref:
-      apiVersion: v1
-      kind: ConfigMap
-      name: mesh-parameters
-  - fieldref:
-      fieldPath: data.odh-modelmesh-runtime-adapter
-    name: odh-modelmesh-runtime-adapter
-    objref:
-      apiVersion: v1
-      kind: ConfigMap
-      name: mesh-parameters
-  - fieldref:
-      fieldPath: data.odh-modelmesh-controller
-    name: odh-modelmesh-controller
-    objref:
-      apiVersion: v1
-      kind: ConfigMap
-      name: mesh-parameters
+- fieldref:
+    fieldPath: metadata.namespace
+  name: mesh-namespace
+  objref:
+    apiVersion: v1
+    kind: ConfigMap
+    name: mesh-parameters
+- fieldref:
+    fieldPath: data.odh-modelmesh
+  name: odh-modelmesh
+  objref:
+    apiVersion: v1
+    kind: ConfigMap
+    name: mesh-parameters
+- fieldref:
+    fieldPath: data.odh-mm-rest-proxy
+  name: odh-mm-rest-proxy
+  objref:
+    apiVersion: v1
+    kind: ConfigMap
+    name: mesh-parameters
+- fieldref:
+    fieldPath: data.odh-modelmesh-runtime-adapter
+  name: odh-modelmesh-runtime-adapter
+  objref:
+    apiVersion: v1
+    kind: ConfigMap
+    name: mesh-parameters
+- fieldref:
+    fieldPath: data.odh-modelmesh-controller
+  name: odh-modelmesh-controller
+  objref:
+    apiVersion: v1
+    kind: ConfigMap
+    name: mesh-parameters
 
-commonLabels:
-  app: model-mesh
-  app.kubernetes.io/part-of: model-mesh
 
-patchesStrategicMerge:
-  - ./crd/clusterservingruntime_patch_delete.yaml
 
 configurations:
-  - params.yaml
+- params.yaml
+
+labels:
+- includeSelectors: true
+  pairs:
+    app: model-mesh
+    app.kubernetes.io/part-of: model-mesh
diff --git a/config/overlays/odh/params.yaml b/config/overlays/odh/params.yaml
index 67e82db89..6045cd3b2 100644
--- a/config/overlays/odh/params.yaml
+++ b/config/overlays/odh/params.yaml
@@ -1,15 +1,11 @@
 varReference:
   - path: metadata/namespace
     kind: ServiceAccount
-    apiVersion: v1
   - path: metadata/name
     kind: ClusterRoleBinding
-    apiGroup: rbac.authorization.k8s.io
   - path: subjects/namespace
     kind: RoleBinding
-    apiGroup: rbac.authorization.k8s.io
   - path: spec/template/spec/containers[]/image
     kind: Deployment
-    apiVersion: apps/v1
   - path: data
     kind: ConfigMap