diff --git a/config/dependencies/fvt.yaml b/config/dependencies/fvt.yaml
index abd2fce5d..8c9186f5e 100644
--- a/config/dependencies/fvt.yaml
+++ b/config/dependencies/fvt.yaml
@@ -53,7 +53,7 @@ spec:
             - /tmp/etcd.data
           # image: quay.io/coreos/etcd:v3.5.4
           # Tag -> registry.access.redhat.com/rhel7/etcd:3.2.32-34
-          image: registry.redhat.io/openshift4/ose-etcd@sha256:d3275cd886d13865937d225d8138db7f6b7bf59ac1a94d9fbe61e35286bee6ff
+          image: $(ose-etcd)
           name: etcd
           ports:
             - containerPort: 2379
diff --git a/config/internal/base/deployment.yaml.tmpl b/config/internal/base/deployment.yaml.tmpl
index 6bcf6fd04..e25c17268 100644
--- a/config/internal/base/deployment.yaml.tmpl
+++ b/config/internal/base/deployment.yaml.tmpl
@@ -136,7 +136,7 @@ spec:
             - '--openshift-delegate-urls={"/": {"namespace": "{{.AuthNamespace}}", "resource": "services", "verb": "get"}}'
             - '--openshift-sar={"namespace": "{{.AuthNamespace}}", "resource": "services", "verb": "get"}'
             - --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
-          image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
+          image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
           ports:
             - containerPort: 8443
               name: https
diff --git a/config/overlays/odh/kustomization.yaml b/config/overlays/odh/kustomization.yaml
index 1a4b76340..4e937c884 100644
--- a/config/overlays/odh/kustomization.yaml
+++ b/config/overlays/odh/kustomization.yaml
@@ -55,6 +55,20 @@ vars:
     apiVersion: v1
     kind: ConfigMap
     name: mesh-parameters
+- fieldref:
+    fieldPath: data.ose-etcd
+  name: ose-etcd
+  objref:
+    apiVersion: v1
+    kind: ConfigMap
+    name: mesh-parameters
+- fieldref:
+    fieldPath: data.ose-cli
+  name: ose-cli
+  objref:
+    apiVersion: v1
+    kind: ConfigMap
+    name: mesh-parameters
 
 
 
diff --git a/config/overlays/odh/params.env b/config/overlays/odh/params.env
index 574d47e3c..5ec35386c 100644
--- a/config/overlays/odh/params.env
+++ b/config/overlays/odh/params.env
@@ -2,3 +2,5 @@ odh-mm-rest-proxy=quay.io/opendatahub/rest-proxy:v0.12.0-rc0-latest
 odh-modelmesh-runtime-adapter=quay.io/opendatahub/modelmesh-runtime-adapter:v0.12.0-rc0-latest
 odh-modelmesh=quay.io/opendatahub/modelmesh:v0.12.0-rc0-latest
 odh-modelmesh-controller=quay.io/opendatahub/modelmesh-controller:v0.12.0-rc0-latest
+ose-etcd=registry.redhat.io/openshift4/ose-etcd-rhel9:v4.19
+ose-cli=registry.redhat.io/openshift4/ose-cli-rhel9:v4.19
diff --git a/config/overlays/odh/params.yaml b/config/overlays/odh/params.yaml
index 6045cd3b2..2f98d74b7 100644
--- a/config/overlays/odh/params.yaml
+++ b/config/overlays/odh/params.yaml
@@ -7,5 +7,7 @@ varReference:
     kind: RoleBinding
   - path: spec/template/spec/containers[]/image
     kind: Deployment
+  - path: spec/template/spec/initContainers[]/image
+    kind: Deployment
   - path: data
     kind: ConfigMap
diff --git a/config/overlays/odh/quickstart.yaml b/config/overlays/odh/quickstart.yaml
index 8bec0361a..5dfc0d230 100644
--- a/config/overlays/odh/quickstart.yaml
+++ b/config/overlays/odh/quickstart.yaml
@@ -49,7 +49,7 @@ spec:
             defaultMode: 0554
       initContainers:
         - name: etcd-secret-creator
-          image: registry.redhat.io/openshift4/ose-cli@sha256:4cfb4219f46c8cc25a5e567fd4cb8babe9a3778b0b86a1e354a3403994ef3677
+          image: $(ose-cli)
           command: ["/bin/bash", "-c", "--"]
           args:
             - |
@@ -69,10 +69,10 @@ spec:
                 exit 0
               elif [[ $etcdpasswordexists == "false" && $modelservingetcdexists != "false" ]]; then
                 echo "model-serving-etcd exists, creating etcdpasswords secret"
-                ETC_ROOT_PSW=$(oc get secrets/model-serving-etcd --template={{.data.etcd_connection}} | base64 -d | grep -o '"password": *"[^"]*"' | grep -o '"[^"]*"$' | grep -oP '"\K[^"\047]+(?=["\047])') 
+                ETC_ROOT_PSW=$(oc get secrets/model-serving-etcd --template={{.data.etcd_connection}} | base64 -d | grep -o '"password": *"[^"]*"' | grep -o '"[^"]*"$' | grep -oP '"\K[^"\047]+(?=["\047])')
                 oc create secret generic etcd-passwords --type=string --from-literal=root=$ETC_ROOT_PSW
                 exit 0
-              else 
+              else
                 echo "secrets etcdpasswords and model-serving-etcd exist, doing nothing"
                 exit 0
               fi
@@ -92,7 +92,7 @@ spec:
             - http://0.0.0.0:2379
             - "--data-dir"
             - /tmp/etcd.data
-          image: registry.redhat.io/openshift4/ose-etcd@sha256:d3275cd886d13865937d225d8138db7f6b7bf59ac1a94d9fbe61e35286bee6ff
+          image: $(ose-etcd)
           name: etcd
           env:
             - name: ROOT_PASSWORD
diff --git a/controllers/testdata/servingruntime_controller.golden b/controllers/testdata/servingruntime_controller.golden
index 50fc7d7de..cb4e4b007 100644
--- a/controllers/testdata/servingruntime_controller.golden
+++ b/controllers/testdata/servingruntime_controller.golden
@@ -103,7 +103,7 @@ spec:
         - '--openshift-sar={"namespace": "default", "resource": "services", "verb":
           "get"}'
         - --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
-        image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
+        image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3
@@ -415,7 +415,7 @@ spec:
         - '--openshift-sar={"namespace": "default", "resource": "services", "verb":
           "get"}'
         - --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
-        image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
+        image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3
@@ -699,7 +699,7 @@ spec:
         - '--openshift-sar={"namespace": "default", "resource": "services", "verb":
           "get"}'
         - --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
-        image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
+        image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3
@@ -1055,7 +1055,7 @@ spec:
         - '--openshift-sar={"namespace": "default", "resource": "services", "verb":
           "get"}'
         - --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
-        image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
+        image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3
@@ -1360,7 +1360,7 @@ spec:
         - '--openshift-sar={"namespace": "default", "resource": "services", "verb":
           "get"}'
         - --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
-        image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
+        image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3
@@ -1657,7 +1657,7 @@ spec:
         - '--openshift-sar={"namespace": "default", "resource": "services", "verb":
           "get"}'
         - --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
-        image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
+        image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3
@@ -1959,7 +1959,7 @@ spec:
         - '--openshift-sar={"namespace": "default", "resource": "services", "verb":
           "get"}'
         - --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
-        image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
+        image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3
@@ -2255,7 +2255,7 @@ spec:
         - '--openshift-sar={"namespace": "default", "resource": "services", "verb":
           "get"}'
         - --skip-auth-regex='(^/metrics|^/apis/v1beta1/healthz)'
-        image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:8507daed246d4d367704f7d7193233724acf1072572e1226ca063c066b858ecf
+        image: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9@sha256:d3056b35d9a205b9f2c48d924f199c5ac23904eb18d526e4bff229e7c7181415
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3
diff --git a/opendatahub/scripts/README.md b/opendatahub/scripts/README.md
index e871745ce..46866f141 100644
--- a/opendatahub/scripts/README.md
+++ b/opendatahub/scripts/README.md
@@ -19,7 +19,7 @@ manifests are the part that deploys the components required for fvt (functional
 
 ## Scripts
 
-The scripts in this folder help you run fvt tests or compare odh manifests. However, it is not recommended to use these scripts directly without familiarizing yourself with them. [This doc has make examples](../docs/makefile_-cheatsheet.md) of using these scripts in a makefile here.
+The scripts in this folder help you run fvt tests or compare odh manifests. However, it is not recommended to use these scripts directly without familiarizing yourself with them. [This doc has make examples](../docs/makefile-cheatsheet.md) of using these scripts in a makefile here.
 
 - [env.sh](./env.sh)
 
diff --git a/opendatahub/scripts/manifests/fvt/fvt.yaml b/opendatahub/scripts/manifests/fvt/fvt.yaml
index 77b5e89ce..09c785678 100644
--- a/opendatahub/scripts/manifests/fvt/fvt.yaml
+++ b/opendatahub/scripts/manifests/fvt/fvt.yaml
@@ -53,7 +53,7 @@ spec:
             - /tmp/etcd.data
           # image: quay.io/coreos/etcd:v3.5.4
           # Tag -> registry.access.redhat.com/rhel7/etcd:3.2.32-34
-          image: registry.redhat.io/openshift4/ose-etcd@sha256:d3275cd886d13865937d225d8138db7f6b7bf59ac1a94d9fbe61e35286bee6ff
+          image: registry.redhat.io/openshift4/ose-etcd-rhel9@sha256:ea7545b79599f3868d442fdffdfe9b12a02a4b56ac155f02c0fac4720d475796
           name: etcd
           ports:
             - containerPort: 2379