diff --git a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-master__installer-rehearse-4.11.yaml b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-master__installer-rehearse-4.11.yaml
index b04c5f79b70bf..9d46db939ead9 100644
--- a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-master__installer-rehearse-4.11.yaml
+++ b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-master__installer-rehearse-4.11.yaml
@@ -39,7 +39,7 @@ tests:
     cluster_profile: aws-qe
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-    workflow: cucushift-installer-rehearse-aws-ipi-proxy-workers-rhel8
+    workflow: cucushift-installer-rehearse-aws-ipi-disconnected-private
 - as: installer-rehearse-gcp
   interval: 960h
   steps:
diff --git a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-master__installer-rehearse-4.12.yaml b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-master__installer-rehearse-4.12.yaml
index 68d7155019b92..853f7bda875fa 100644
--- a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-master__installer-rehearse-4.12.yaml
+++ b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-master__installer-rehearse-4.12.yaml
@@ -39,7 +39,7 @@ tests:
     cluster_profile: aws-qe
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-    workflow: cucushift-installer-rehearse-aws-ipi-sdn
+    workflow: cucushift-installer-rehearse-aws-ipi-disconnected-private-workers-rhcos-rhel8
 - as: installer-rehearse-azure
   interval: 960h
   steps:
diff --git a/ci-operator/step-registry/aws/deprovision/cco-manual-users/static/aws-deprovision-cco-manual-users-static-ref.yaml b/ci-operator/step-registry/aws/deprovision/cco-manual-users/static/aws-deprovision-cco-manual-users-static-ref.yaml
index e7ea374b11639..48b38d62ad164 100644
--- a/ci-operator/step-registry/aws/deprovision/cco-manual-users/static/aws-deprovision-cco-manual-users-static-ref.yaml
+++ b/ci-operator/step-registry/aws/deprovision/cco-manual-users/static/aws-deprovision-cco-manual-users-static-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: aws-deprovision-cco-manual-users-static
   from_image:
     namespace: ocp
-    name: "4.5"
+    name: "4.12"
     tag: upi-installer
   grace_period: 10m
   commands: aws-deprovision-cco-manual-users-static-commands.sh
diff --git a/ci-operator/step-registry/aws/deprovision/route53/private-hosted-zone/aws-deprovision-route53-private-hosted-zone-ref.yaml b/ci-operator/step-registry/aws/deprovision/route53/private-hosted-zone/aws-deprovision-route53-private-hosted-zone-ref.yaml
index 812f8dcfefc7d..e3368148f4f1f 100644
--- a/ci-operator/step-registry/aws/deprovision/route53/private-hosted-zone/aws-deprovision-route53-private-hosted-zone-ref.yaml
+++ b/ci-operator/step-registry/aws/deprovision/route53/private-hosted-zone/aws-deprovision-route53-private-hosted-zone-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: aws-deprovision-route53-private-hosted-zone
   from_image:
     namespace: ocp
-    name: "4.10"
+    name: "4.12"
     tag: upi-installer
   grace_period: 10m
   commands: aws-deprovision-route53-private-hosted-zone-commands.sh
diff --git a/ci-operator/step-registry/aws/deprovision/s3buckets/aws-deprovision-s3buckets-ref.yaml b/ci-operator/step-registry/aws/deprovision/s3buckets/aws-deprovision-s3buckets-ref.yaml
index 770f8fb6929cb..db2206360806b 100644
--- a/ci-operator/step-registry/aws/deprovision/s3buckets/aws-deprovision-s3buckets-ref.yaml
+++ b/ci-operator/step-registry/aws/deprovision/s3buckets/aws-deprovision-s3buckets-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: aws-deprovision-s3buckets
   from_image:
     namespace: ocp
-    name: "4.5"
+    name: "4.12"
     tag: upi-installer
   grace_period: 10m
   commands: aws-deprovision-s3buckets-commands.sh
diff --git a/ci-operator/step-registry/aws/deprovision/stacks/aws-deprovision-stacks-ref.yaml b/ci-operator/step-registry/aws/deprovision/stacks/aws-deprovision-stacks-ref.yaml
index 9218951c3acaa..88645b5b1dae4 100644
--- a/ci-operator/step-registry/aws/deprovision/stacks/aws-deprovision-stacks-ref.yaml
+++ b/ci-operator/step-registry/aws/deprovision/stacks/aws-deprovision-stacks-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: aws-deprovision-stacks
   from_image:
     namespace: ocp
-    name: "4.5"
+    name: "4.12"
     tag: upi-installer
   grace_period: 10m
   commands: aws-deprovision-stacks-commands.sh
diff --git a/ci-operator/step-registry/aws/provision/bastionhost/aws-provision-bastionhost-commands.sh b/ci-operator/step-registry/aws/provision/bastionhost/aws-provision-bastionhost-commands.sh
index 410c60283c8f5..549897488d0e9 100644
--- a/ci-operator/step-registry/aws/provision/bastionhost/aws-provision-bastionhost-commands.sh
+++ b/ci-operator/step-registry/aws/provision/bastionhost/aws-provision-bastionhost-commands.sh
@@ -8,8 +8,6 @@ trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wa
 
 export AWS_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"
 
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 REGION="${LEASED_RESOURCE}"
 
 # Using source region for C2S and SC2S
@@ -21,7 +19,7 @@ fi
 VpcId=$(cat "${SHARED_DIR}/vpc_id")
 echo "VpcId: $VpcId"
 
-PublicSubnet="$(/tmp/yq r "${SHARED_DIR}/public_subnet_ids" '[0]')"
+PublicSubnet="$(yq-go r "${SHARED_DIR}/public_subnet_ids" '[0]')"
 echo "PublicSubnet: $PublicSubnet"
 
 CLUSTER_NAME="${NAMESPACE}-${JOB_NAME_HASH}"
diff --git a/ci-operator/step-registry/aws/provision/bastionhost/aws-provision-bastionhost-ref.yaml b/ci-operator/step-registry/aws/provision/bastionhost/aws-provision-bastionhost-ref.yaml
index cd9b78323a6de..7a673fb97f24b 100644
--- a/ci-operator/step-registry/aws/provision/bastionhost/aws-provision-bastionhost-ref.yaml
+++ b/ci-operator/step-registry/aws/provision/bastionhost/aws-provision-bastionhost-ref.yaml
@@ -1,6 +1,9 @@
 ref:
   as: aws-provision-bastionhost
-  from: upi-installer
+  from_image:
+    namespace: ocp
+    name: "4.12"
+    tag: upi-installer
   cli: latest
   grace_period: 10m
   commands: aws-provision-bastionhost-commands.sh
diff --git a/ci-operator/step-registry/aws/provision/cco-manual-users/static/aws-provision-cco-manual-users-static-commands.sh b/ci-operator/step-registry/aws/provision/cco-manual-users/static/aws-provision-cco-manual-users-static-commands.sh
index 229ef25116564..5d0eac00466f8 100644
--- a/ci-operator/step-registry/aws/provision/cco-manual-users/static/aws-provision-cco-manual-users-static-commands.sh
+++ b/ci-operator/step-registry/aws/provision/cco-manual-users/static/aws-provision-cco-manual-users-static-commands.sh
@@ -8,9 +8,6 @@ trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wa
 
 export AWS_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"
 
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-curl -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 -o /tmp/jq && chmod +x /tmp/jq
-
 REGION="${LEASED_RESOURCE}"
 
 function run_command() {
@@ -119,10 +116,10 @@ do
     # 
     cr_yaml="${cr_yaml_d}/${item}"
     cr_json="${cr_json_d}/${item:0:-5}.json"
-    /tmp/yq r -j "${cr_yaml}" > "${cr_json}"
+    yq-go r -j "${cr_yaml}" > "${cr_json}"
 
-    name=$(cat "${cr_json}" | /tmp/jq -r '.spec.secretRef.name')
-    ns=$(cat "${cr_json}" | /tmp/jq -r '.spec.secretRef.namespace')
+    name=$(cat "${cr_json}" | jq -r '.spec.secretRef.name')
+    ns=$(cat "${cr_json}" | jq -r '.spec.secretRef.namespace')
     
     #  Create policy document
     # 
@@ -133,8 +130,8 @@ do
         | sed 's/"effect"/"Effect"/g' \
         | sed 's/"policyCondition"/"Condition"/g' \
         | sed 's/"resource"/"Resource"/g' \
-        | /tmp/jq '{Version: "2012-10-17", Statement: .spec.providerSpec.statementEntries}' > "${policy_json}"
-    policy_doc=$(cat "${policy_json}" | /tmp/jq -c .)
+        | jq '{Version: "2012-10-17", Statement: .spec.providerSpec.statementEntries}' > "${policy_json}"
+    policy_doc=$(cat "${policy_json}" | jq -c .)
     echo "policy_doc: $policy_doc"
     
     #  Create policy
@@ -144,7 +141,7 @@ do
     output_policy="${resources_d}/policy_${policy_name}.json"
     aws_create_policy $REGION "${policy_name}" "${policy_doc}" "${output_policy}"
 	
-    policy_arn=$(cat "${output_policy}" | /tmp/jq -r '.Policy.Arn')
+    policy_arn=$(cat "${output_policy}" | jq -r '.Policy.Arn')
     
     echo "${policy_arn}" >> "${SHARED_DIR}/aws_policy_arns"
 
@@ -157,8 +154,8 @@ do
     output_access_keys="${resources_d}/accesskey_${user_name}.json"
     aws_create_user $REGION "${user_name}" "${policy_arn}" "${output_users}" "${output_access_keys}"
 
-    key_id=$(cat "${output_access_keys}" | /tmp/jq -r '.AccessKey.AccessKeyId')
-    key_sec=$(cat "${output_access_keys}" | /tmp/jq -r '.AccessKey.SecretAccessKey')
+    key_id=$(cat "${output_access_keys}" | jq -r '.AccessKey.AccessKeyId')
+    key_sec=$(cat "${output_access_keys}" | jq -r '.AccessKey.SecretAccessKey')
     echo "${user_name}" >> "${SHARED_DIR}/aws_user_names"
 
     # Generate users manifests
diff --git a/ci-operator/step-registry/aws/provision/cco-manual-users/static/aws-provision-cco-manual-users-static-ref.yaml b/ci-operator/step-registry/aws/provision/cco-manual-users/static/aws-provision-cco-manual-users-static-ref.yaml
index f5a89db8292f2..1bf47a76bbed2 100644
--- a/ci-operator/step-registry/aws/provision/cco-manual-users/static/aws-provision-cco-manual-users-static-ref.yaml
+++ b/ci-operator/step-registry/aws/provision/cco-manual-users/static/aws-provision-cco-manual-users-static-ref.yaml
@@ -1,6 +1,9 @@
 ref:
   as: aws-provision-cco-manual-users-static
-  from: upi-installer
+  from_image:
+    namespace: ocp
+    name: "4.12"
+    tag: upi-installer
   cli: latest
   grace_period: 10m
   commands: aws-provision-cco-manual-users-static-commands.sh
diff --git a/ci-operator/step-registry/aws/provision/route53/private-hosted-zone/aws-provision-route53-private-hosted-zone-ref.yaml b/ci-operator/step-registry/aws/provision/route53/private-hosted-zone/aws-provision-route53-private-hosted-zone-ref.yaml
index 6c2f43de6a427..fceb70ec62976 100644
--- a/ci-operator/step-registry/aws/provision/route53/private-hosted-zone/aws-provision-route53-private-hosted-zone-ref.yaml
+++ b/ci-operator/step-registry/aws/provision/route53/private-hosted-zone/aws-provision-route53-private-hosted-zone-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: aws-provision-route53-private-hosted-zone
   from_image:
     namespace: ocp
-    name: "4.10"
+    name: "4.12"
     tag: upi-installer
   grace_period: 10m
   commands: aws-provision-route53-private-hosted-zone-commands.sh
diff --git a/ci-operator/step-registry/aws/provision/vpc/disconnected/aws-provision-vpc-disconnected-commands.sh b/ci-operator/step-registry/aws/provision/vpc/disconnected/aws-provision-vpc-disconnected-commands.sh
index 4e5893320893d..967e95382575d 100644
--- a/ci-operator/step-registry/aws/provision/vpc/disconnected/aws-provision-vpc-disconnected-commands.sh
+++ b/ci-operator/step-registry/aws/provision/vpc/disconnected/aws-provision-vpc-disconnected-commands.sh
@@ -6,9 +6,6 @@ set -o pipefail
 
 export AWS_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc)
 TAGS="Key=expirationDate,Value=${EXPIRATION_DATE}"
 
diff --git a/ci-operator/step-registry/aws/provision/vpc/disconnected/aws-provision-vpc-disconnected-ref.yaml b/ci-operator/step-registry/aws/provision/vpc/disconnected/aws-provision-vpc-disconnected-ref.yaml
index dbe49520623b4..43c4f6cacfa65 100644
--- a/ci-operator/step-registry/aws/provision/vpc/disconnected/aws-provision-vpc-disconnected-ref.yaml
+++ b/ci-operator/step-registry/aws/provision/vpc/disconnected/aws-provision-vpc-disconnected-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: aws-provision-vpc-disconnected
   from_image:
     namespace: ocp
-    name: "4.5"
+    name: "4.12"
     tag: upi-installer
   grace_period: 10m
   commands: aws-provision-vpc-disconnected-commands.sh
diff --git a/ci-operator/step-registry/aws/provision/vpc/shared/aws-provision-vpc-shared-commands.sh b/ci-operator/step-registry/aws/provision/vpc/shared/aws-provision-vpc-shared-commands.sh
index 8170715d8289f..e2baa39f6212e 100644
--- a/ci-operator/step-registry/aws/provision/vpc/shared/aws-provision-vpc-shared-commands.sh
+++ b/ci-operator/step-registry/aws/provision/vpc/shared/aws-provision-vpc-shared-commands.sh
@@ -6,8 +6,6 @@ set -o pipefail
 
 export AWS_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"
 
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc)
 TAGS="Key=expirationDate,Value=${EXPIRATION_DATE}"
 
diff --git a/ci-operator/step-registry/aws/provision/vpc/shared/aws-provision-vpc-shared-ref.yaml b/ci-operator/step-registry/aws/provision/vpc/shared/aws-provision-vpc-shared-ref.yaml
index c91fef70b6625..a82c4563086f5 100644
--- a/ci-operator/step-registry/aws/provision/vpc/shared/aws-provision-vpc-shared-ref.yaml
+++ b/ci-operator/step-registry/aws/provision/vpc/shared/aws-provision-vpc-shared-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: aws-provision-vpc-shared
   from_image:
     namespace: ocp
-    name: "4.5"
+    name: "4.12"
     tag: upi-installer
   grace_period: 10m
   commands: aws-provision-vpc-shared-commands.sh
diff --git a/ci-operator/step-registry/azure/provision/bastionhost/azure-provision-bastionhost-commands.sh b/ci-operator/step-registry/azure/provision/bastionhost/azure-provision-bastionhost-commands.sh
index d358cbe3cf306..27ec8eb42f4fc 100644
--- a/ci-operator/step-registry/azure/provision/bastionhost/azure-provision-bastionhost-commands.sh
+++ b/ci-operator/step-registry/azure/provision/bastionhost/azure-provision-bastionhost-commands.sh
@@ -57,8 +57,7 @@ fi
 if [ -z "${VNET_NAME}" ]; then
   vnet_file="${SHARED_DIR}/customer_vnet_subnets.yaml"
   if [ -f "${vnet_file}" ]; then
-    curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-    bastion_vnet_name=$(/tmp/yq r ${vnet_file} 'platform.azure.virtualNetwork')
+    bastion_vnet_name=$(yq-go r ${vnet_file} 'platform.azure.virtualNetwork')
   else
     echo "Did not find ${vnet_file}!"
     exit 1
diff --git a/ci-operator/step-registry/azure/provision/bastionhost/azure-provision-bastionhost-ref.yaml b/ci-operator/step-registry/azure/provision/bastionhost/azure-provision-bastionhost-ref.yaml
index b26c48f6843da..e3904efe01d4f 100644
--- a/ci-operator/step-registry/azure/provision/bastionhost/azure-provision-bastionhost-ref.yaml
+++ b/ci-operator/step-registry/azure/provision/bastionhost/azure-provision-bastionhost-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: azure-provision-bastionhost
   from_image:
     namespace: ocp
-    name: "4.5"
+    name: "4.12"
     tag: upi-installer
   grace_period: 10m
   commands: azure-provision-bastionhost-commands.sh
diff --git a/ci-operator/step-registry/azure/provision/nat/azure-provision-nat-commands.sh b/ci-operator/step-registry/azure/provision/nat/azure-provision-nat-commands.sh
index 3c613eed845bd..28d64f1bdc549 100644
--- a/ci-operator/step-registry/azure/provision/nat/azure-provision-nat-commands.sh
+++ b/ci-operator/step-registry/azure/provision/nat/azure-provision-nat-commands.sh
@@ -4,9 +4,6 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 function run_command() {
     local CMD="$1"
     echo "Running Command: ${CMD}"
@@ -51,9 +48,9 @@ if [ X"${OUTBOUND_UDR_TYPE}" == X"NAT" ]; then
   echo "Use NAT for UserDefinedRouting..."
   VNET_FILE="${SHARED_DIR}/customer_vnet_subnets.yaml"
   RESOURCE_GROUP=$(cat ${SHARED_DIR}/resourcegroup)
-  vnet_name=$(/tmp/yq r ${VNET_FILE} 'platform.azure.virtualNetwork')
-  controlPlaneSubnet=$(/tmp/yq r ${VNET_FILE} 'platform.azure.controlPlaneSubnet')
-  computeSubnet=$(/tmp/yq r ${VNET_FILE} 'platform.azure.computeSubnet')
+  vnet_name=$(yq-go r ${VNET_FILE} 'platform.azure.virtualNetwork')
+  controlPlaneSubnet=$(yq-go r ${VNET_FILE} 'platform.azure.controlPlaneSubnet')
+  computeSubnet=$(yq-go r ${VNET_FILE} 'platform.azure.computeSubnet')
   NAT_for_UDR "$RESOURCE_GROUP" "$vnet_name" "$controlPlaneSubnet" "$computeSubnet" || exit 3
 else
   echo "UserDefinedRouting is enabled, but does not define steps here, leave them for user"
diff --git a/ci-operator/step-registry/azure/provision/nat/azure-provision-nat-ref.yaml b/ci-operator/step-registry/azure/provision/nat/azure-provision-nat-ref.yaml
index 92f732f135f23..44ddae9553dc1 100644
--- a/ci-operator/step-registry/azure/provision/nat/azure-provision-nat-ref.yaml
+++ b/ci-operator/step-registry/azure/provision/nat/azure-provision-nat-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: azure-provision-nat
   from_image:
     namespace: ocp
-    name: "4.5"
+    name: "4.12"
     tag: upi-installer
   grace_period: 10m
   commands: azure-provision-nat-commands.sh
diff --git a/ci-operator/step-registry/azure/provision/vnet/azure-provision-vnet-ref.yaml b/ci-operator/step-registry/azure/provision/vnet/azure-provision-vnet-ref.yaml
index b2ed8cb273986..053e6b7061237 100644
--- a/ci-operator/step-registry/azure/provision/vnet/azure-provision-vnet-ref.yaml
+++ b/ci-operator/step-registry/azure/provision/vnet/azure-provision-vnet-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: azure-provision-vnet
   from_image:
     namespace: ocp
-    name: "4.5"
+    name: "4.12"
     tag: upi-installer
   grace_period: 10m
   commands: azure-provision-vnet-commands.sh
diff --git a/ci-operator/step-registry/gcp/deprovision/bastionhost/gcp-deprovision-bastionhost-ref.yaml b/ci-operator/step-registry/gcp/deprovision/bastionhost/gcp-deprovision-bastionhost-ref.yaml
index c0be9208918cf..355d5f70a3873 100644
--- a/ci-operator/step-registry/gcp/deprovision/bastionhost/gcp-deprovision-bastionhost-ref.yaml
+++ b/ci-operator/step-registry/gcp/deprovision/bastionhost/gcp-deprovision-bastionhost-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: gcp-deprovision-bastionhost
   from_image:
     namespace: ocp
-    name: "4.10"
+    name: "4.12"
     tag: upi-installer
   commands: gcp-deprovision-bastionhost-commands.sh
   resources:
@@ -10,4 +10,4 @@ ref:
       cpu: 10m
       memory: 100Mi
   documentation: |-
-    The step destroys all resources configured by "gcp-provision-bastionhost". 
\ No newline at end of file
+    The step destroys all resources configured by "gcp-provision-bastionhost". 
diff --git a/ci-operator/step-registry/gcp/deprovision/vpc/gcp-deprovision-vpc-ref.yaml b/ci-operator/step-registry/gcp/deprovision/vpc/gcp-deprovision-vpc-ref.yaml
index 3bb3c6ddbba0f..3727b496f1849 100644
--- a/ci-operator/step-registry/gcp/deprovision/vpc/gcp-deprovision-vpc-ref.yaml
+++ b/ci-operator/step-registry/gcp/deprovision/vpc/gcp-deprovision-vpc-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: gcp-deprovision-vpc
   from_image:
     namespace: ocp
-    name: "4.10"
+    name: "4.12"
     tag: upi-installer
   commands: gcp-deprovision-vpc-commands.sh
   resources:
@@ -10,4 +10,4 @@ ref:
       cpu: 10m
       memory: 100Mi
   documentation: |-
-    The step destroys all resources configured by "gcp-provision-vpc". 
\ No newline at end of file
+    The step destroys all resources configured by "gcp-provision-vpc". 
diff --git a/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-commands.sh b/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-commands.sh
index b7d2a260ac8b4..ee9e24c37d63f 100755
--- a/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-commands.sh
+++ b/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-commands.sh
@@ -27,10 +27,6 @@ fi
 #####################################
 ##############Initialize#############
 #####################################
-
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 workdir=`mktemp -d`
 
 curl -L -o ${workdir}/fcos-stable.json https://builds.coreos.fedoraproject.org/streams/stable.json
@@ -68,8 +64,8 @@ echo "Using region: ${REGION}"
 
 VPC_CONFIG="${SHARED_DIR}/customer_vpc_subnets.yaml"
 if [[ -z "${NETWORK}" || -z "${CONTROL_PLANE_SUBNET}" ]]; then
-  NETWORK=$(/tmp/yq r "${VPC_CONFIG}" 'platform.gcp.network')
-  CONTROL_PLANE_SUBNET=$(/tmp/yq r "${VPC_CONFIG}" 'platform.gcp.controlPlaneSubnet')
+  NETWORK=$(yq-go r "${VPC_CONFIG}" 'platform.gcp.network')
+  CONTROL_PLANE_SUBNET=$(yq-go r "${VPC_CONFIG}" 'platform.gcp.controlPlaneSubnet')
 fi
 if [[ -z "${NETWORK}" || -z "${CONTROL_PLANE_SUBNET}" ]]; then
   echo "Could not find VPC network and control-plane subnet" && exit 1
diff --git a/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-ref.yaml b/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-ref.yaml
index b2b19ca65afb1..00b11d77e8cb4 100644
--- a/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-ref.yaml
+++ b/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: gcp-provision-bastionhost
   from_image:
     namespace: ocp
-    name: "4.10"
+    name: "4.12"
     tag: upi-installer
   grace_period: 10m
   commands: gcp-provision-bastionhost-commands.sh
diff --git a/ci-operator/step-registry/gcp/provision/vpc/gcp-provision-vpc-ref.yaml b/ci-operator/step-registry/gcp/provision/vpc/gcp-provision-vpc-ref.yaml
index fea57cca57197..9f704de193635 100644
--- a/ci-operator/step-registry/gcp/provision/vpc/gcp-provision-vpc-ref.yaml
+++ b/ci-operator/step-registry/gcp/provision/vpc/gcp-provision-vpc-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: gcp-provision-vpc
   from_image:
     namespace: ocp
-    name: "4.10"
+    name: "4.12"
     tag: upi-installer
   commands: gcp-provision-vpc-commands.sh
   resources:
@@ -15,4 +15,4 @@ ref:
       documentation: |-
         This field represents the VPC would be a disconnected network (without NAT gateway), or not.
   documentation: |-
-    The GCP step creates VPC network/subnets/etc. resources, and write the info in "${SHARED_DIR}/customer_vpc_subnets.yaml" for subsequent consumers. 
\ No newline at end of file
+    The GCP step creates VPC network/subnets/etc. resources, and write the info in "${SHARED_DIR}/customer_vpc_subnets.yaml" for subsequent consumers. 
diff --git a/ci-operator/step-registry/ignition/bastionhost/ignition-bastionhost-commands.sh b/ci-operator/step-registry/ignition/bastionhost/ignition-bastionhost-commands.sh
index c9f59ef761283..32dc18a22a8c8 100755
--- a/ci-operator/step-registry/ignition/bastionhost/ignition-bastionhost-commands.sh
+++ b/ci-operator/step-registry/ignition/bastionhost/ignition-bastionhost-commands.sh
@@ -6,9 +6,6 @@ set -o pipefail
 
 trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 workdir=`mktemp -d`
 
 CLUSTER_NAME="${NAMESPACE}-${JOB_NAME_HASH}"
@@ -289,7 +286,7 @@ proxy:
   username: "${reg_quay_user}"
   password: "${reg_quay_password}"
 EOF
-/tmp/yq m -x -i "${workdir}/registry_config_file_6001" "${patch_file}"
+yq-go m -x -i "${workdir}/registry_config_file_6001" "${patch_file}"
 
 # patch proxy for 6002 brew.registry.redhat.io
 reg_brew_url=$(cat "/var/run/vault/mirror-registry/registry_brew.json" | jq -r '.url')
@@ -301,7 +298,7 @@ proxy:
   username: "${reg_brew_user}"
   password: "${reg_brew_password}"
 EOF
-/tmp/yq m -x -i "${workdir}/registry_config_file_6002" "${patch_file}"
+yq-go m -x -i "${workdir}/registry_config_file_6002" "${patch_file}"
 
 rm -f "${patch_file}"
 
diff --git a/ci-operator/step-registry/ignition/bastionhost/ignition-bastionhost-ref.yaml b/ci-operator/step-registry/ignition/bastionhost/ignition-bastionhost-ref.yaml
index e49aec6b634eb..a18aacc6e5c92 100644
--- a/ci-operator/step-registry/ignition/bastionhost/ignition-bastionhost-ref.yaml
+++ b/ci-operator/step-registry/ignition/bastionhost/ignition-bastionhost-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: ignition-bastionhost
   from_image:
     namespace: ocp
-    name: "4.10"
+    name: "4.12"
     tag: upi-installer
   grace_period: 10m
   commands: ignition-bastionhost-commands.sh
diff --git a/ci-operator/step-registry/ipi/OWNERS b/ci-operator/step-registry/ipi/OWNERS
index 4e535d51d926d..d79c8695cc263 100644
--- a/ci-operator/step-registry/ipi/OWNERS
+++ b/ci-operator/step-registry/ipi/OWNERS
@@ -5,3 +5,5 @@ approvers:
 - deads2k
 - staebler
 - technical-release-team-approvers
+- jianlinliu
+- yunjiang29
diff --git a/ci-operator/step-registry/ipi/aws/ipi-aws-workflow.metadata.json b/ci-operator/step-registry/ipi/aws/ipi-aws-workflow.metadata.json
index de0e8369d4644..2b81cd83f25dc 100644
--- a/ci-operator/step-registry/ipi/aws/ipi-aws-workflow.metadata.json
+++ b/ci-operator/step-registry/ipi/aws/ipi-aws-workflow.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/aws/post/ipi-aws-post-chain.metadata.json b/ci-operator/step-registry/ipi/aws/post/ipi-aws-post-chain.metadata.json
index 3416b408fe207..cfa2d290cf686 100644
--- a/ci-operator/step-registry/ipi/aws/post/ipi-aws-post-chain.metadata.json
+++ b/ci-operator/step-registry/ipi/aws/post/ipi-aws-post-chain.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/aws/pre/ipi-aws-pre-chain.metadata.json b/ci-operator/step-registry/ipi/aws/pre/ipi-aws-pre-chain.metadata.json
index 13e4a5e210f99..f7b022600cbf9 100644
--- a/ci-operator/step-registry/ipi/aws/pre/ipi-aws-pre-chain.metadata.json
+++ b/ci-operator/step-registry/ipi/aws/pre/ipi-aws-pre-chain.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/aws/pre/sharednetwork/ipi-aws-pre-sharednetwork-chain.metadata.json b/ci-operator/step-registry/ipi/aws/pre/sharednetwork/ipi-aws-pre-sharednetwork-chain.metadata.json
index e58fc035f5621..9a53c70366ddb 100644
--- a/ci-operator/step-registry/ipi/aws/pre/sharednetwork/ipi-aws-pre-sharednetwork-chain.metadata.json
+++ b/ci-operator/step-registry/ipi/aws/pre/sharednetwork/ipi-aws-pre-sharednetwork-chain.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/aws/pre/stableinitial/ipi-aws-pre-stableinitial-chain.metadata.json b/ci-operator/step-registry/ipi/aws/pre/stableinitial/ipi-aws-pre-stableinitial-chain.metadata.json
index be1710649eac3..35a3c77c5b748 100644
--- a/ci-operator/step-registry/ipi/aws/pre/stableinitial/ipi-aws-pre-stableinitial-chain.metadata.json
+++ b/ci-operator/step-registry/ipi/aws/pre/stableinitial/ipi-aws-pre-stableinitial-chain.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/aws/sdn/pre/ipi-aws-sdn-pre-chain.metadata.json b/ci-operator/step-registry/ipi/aws/sdn/pre/ipi-aws-sdn-pre-chain.metadata.json
index 3cc2fa32c0e1d..92e0b55454afd 100644
--- a/ci-operator/step-registry/ipi/aws/sdn/pre/ipi-aws-sdn-pre-chain.metadata.json
+++ b/ci-operator/step-registry/ipi/aws/sdn/pre/ipi-aws-sdn-pre-chain.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/aws/blackholenetwork/ipi-conf-aws-blackholenetwork-commands.sh b/ci-operator/step-registry/ipi/conf/aws/blackholenetwork/ipi-conf-aws-blackholenetwork-commands.sh
index 602aa0247dac0..70fe4ad877b97 100755
--- a/ci-operator/step-registry/ipi/conf/aws/blackholenetwork/ipi-conf-aws-blackholenetwork-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/aws/blackholenetwork/ipi-conf-aws-blackholenetwork-commands.sh
@@ -6,9 +6,6 @@ set -o pipefail
 
 export AWS_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 function join_by { local IFS="$1"; shift; echo "$*"; }
 
 EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc)
@@ -19,7 +16,7 @@ PATCH=/tmp/install-config-blackholenetwork.yaml.patch
 
 REGION="${LEASED_RESOURCE}"
 
-CLUSTER_NAME="$(/tmp/yq r "${CONFIG}" 'metadata.name')"
+CLUSTER_NAME="$(yq-go r "${CONFIG}" 'metadata.name')"
 
 cat << EOF > /tmp/blackhole_vpc.yaml
 # This is the template file used to generate blackhole VPC and subnet entries.
@@ -349,4 +346,4 @@ platform:
     subnets: ${subnets}
 EOF
 
-/tmp/yq m -x -i "${CONFIG}" "${PATCH}"
+yq-go m -x -i "${CONFIG}" "${PATCH}"
diff --git a/ci-operator/step-registry/ipi/conf/aws/blackholenetwork/ipi-conf-aws-blackholenetwork-ref.yaml b/ci-operator/step-registry/ipi/conf/aws/blackholenetwork/ipi-conf-aws-blackholenetwork-ref.yaml
index eb8ca035b9f44..9022c9a9e3835 100644
--- a/ci-operator/step-registry/ipi/conf/aws/blackholenetwork/ipi-conf-aws-blackholenetwork-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/aws/blackholenetwork/ipi-conf-aws-blackholenetwork-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: ipi-conf-aws-blackholenetwork
   from_image:
     namespace: ocp
-    name: "4.5"
+    name: "4.12"
     tag: upi-installer
   commands: ipi-conf-aws-blackholenetwork-commands.sh
   resources:
diff --git a/ci-operator/step-registry/ipi/conf/aws/byo-route53/ipi-conf-aws-byo-route53-commands.sh b/ci-operator/step-registry/ipi/conf/aws/byo-route53/ipi-conf-aws-byo-route53-commands.sh
index 978e5f3623beb..c0ec41d7cd3ef 100644
--- a/ci-operator/step-registry/ipi/conf/aws/byo-route53/ipi-conf-aws-byo-route53-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/aws/byo-route53/ipi-conf-aws-byo-route53-commands.sh
@@ -6,8 +6,6 @@ set -o pipefail
 
 trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
 
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 CONFIG="${SHARED_DIR}/install-config.yaml"
 
 
@@ -27,4 +25,4 @@ platform:
     hostedZone: $(cat "${HostedZoneId}")
 EOF
 
-/tmp/yq m -x -i "${CONFIG}" "${CONFIG_ROUTE53_PRIVATE_HOSTEDZONE}"
+yq-go m -x -i "${CONFIG}" "${CONFIG_ROUTE53_PRIVATE_HOSTEDZONE}"
diff --git a/ci-operator/step-registry/ipi/conf/aws/byo-route53/ipi-conf-aws-byo-route53-ref.yaml b/ci-operator/step-registry/ipi/conf/aws/byo-route53/ipi-conf-aws-byo-route53-ref.yaml
index 7d8bc194db1dc..bc8d77a1b1adf 100644
--- a/ci-operator/step-registry/ipi/conf/aws/byo-route53/ipi-conf-aws-byo-route53-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/aws/byo-route53/ipi-conf-aws-byo-route53-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: ipi-conf-aws-byo-route53
   from_image:
     namespace: ocp
-    name: "4.10"
+    name: "4.12"
     tag: upi-installer
   grace_period: 10m
   commands: ipi-conf-aws-byo-route53-commands.sh
diff --git a/ci-operator/step-registry/ipi/conf/aws/custom-vpc/ipi-conf-aws-custom-vpc-commands.sh b/ci-operator/step-registry/ipi/conf/aws/custom-vpc/ipi-conf-aws-custom-vpc-commands.sh
index 63aeffc915b4f..754afcd1ab695 100644
--- a/ci-operator/step-registry/ipi/conf/aws/custom-vpc/ipi-conf-aws-custom-vpc-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/aws/custom-vpc/ipi-conf-aws-custom-vpc-commands.sh
@@ -6,8 +6,6 @@ set -o pipefail
 
 trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
 
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 CONFIG="${SHARED_DIR}/install-config.yaml"
 
 # subnet and AZs
@@ -35,4 +33,4 @@ compute:
     aws:
       zones: $(cat "${availability_zones}")
 EOF
-/tmp/yq m -x -i "${CONFIG}" "${CONFIG_PATCH}"
+yq-go m -x -i "${CONFIG}" "${CONFIG_PATCH}"
diff --git a/ci-operator/step-registry/ipi/conf/aws/custom-vpc/ipi-conf-aws-custom-vpc-ref.yaml b/ci-operator/step-registry/ipi/conf/aws/custom-vpc/ipi-conf-aws-custom-vpc-ref.yaml
index a196e7efd3712..c76129fb4b4ac 100644
--- a/ci-operator/step-registry/ipi/conf/aws/custom-vpc/ipi-conf-aws-custom-vpc-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/aws/custom-vpc/ipi-conf-aws-custom-vpc-ref.yaml
@@ -1,7 +1,9 @@
 ref:
   as: ipi-conf-aws-custom-vpc
-  from: upi-installer
-  cli: latest
+  from_image:
+    namespace: ocp
+    name: "4.12"
+    tag: upi-installer
   grace_period: 10m
   commands: ipi-conf-aws-custom-vpc-commands.sh
   resources:
diff --git a/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-chain.metadata.json b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-chain.metadata.json
index 3b6bd5f8fb111..329efdc3838b0 100644
--- a/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-chain.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-chain.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh
index d66f055cf1772..034c28138a756 100755
--- a/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh
@@ -4,9 +4,6 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 export AWS_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"
 
 CONFIG="${SHARED_DIR}/install-config.yaml"
@@ -67,7 +64,7 @@ MAX_ZONES_COUNT="${#ZONES[@]}"
 # Save max zones count information to ${SHARED_DIR} for use in other scenarios
 echo "${MAX_ZONES_COUNT}" >> "${SHARED_DIR}/maxzonescount"
 
-existing_zones_setting=$(/tmp/yq r "${CONFIG}" 'controlPlane.platform.aws.zones')
+existing_zones_setting=$(yq-go r "${CONFIG}" 'controlPlane.platform.aws.zones')
 
 if [[ ${existing_zones_setting} == "" ]]; then
   ZONES_COUNT=${ZONES_COUNT:-2}
@@ -85,7 +82,7 @@ compute:
     aws:
       zones: ${ZONES_STR}
 EOF
-  /tmp/yq m -x -i "${CONFIG}" "${PATCH}"
+  yq-go m -x -i "${CONFIG}" "${PATCH}"
 else
   echo "zones already set in install-config.yaml, skipped"
 fi
@@ -113,7 +110,7 @@ compute:
       type: ${COMPUTE_NODE_TYPE}
 EOF
 
-/tmp/yq m -x -i "${CONFIG}" "${PATCH}"
+yq-go m -x -i "${CONFIG}" "${PATCH}"
 
 # custom rhcos ami for non-public regions
 RHCOS_AMI=
@@ -135,7 +132,7 @@ platform:
   aws:
     amiID: ${RHCOS_AMI}
 EOF
-  /tmp/yq m -x -i "${CONFIG}" "${CONFIG_PATCH_AMI}"
+  yq-go m -x -i "${CONFIG}" "${CONFIG_PATCH_AMI}"
   cp "${SHARED_DIR}/install-config-ami.yaml.patch" "${ARTIFACT_DIR}/"
 fi
 
@@ -157,6 +154,6 @@ compute:
         authentication: ${AWS_METADATA_SERVICE_AUTH}
 EOF
 
-  /tmp/yq m -x -i "${CONFIG}" "${METADATA_AUTH_PATCH}"
+  yq-go m -x -i "${CONFIG}" "${METADATA_AUTH_PATCH}"
   cp "${METADATA_AUTH_PATCH}" "${ARTIFACT_DIR}/"
 fi
diff --git a/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.metadata.json b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.metadata.json
index 327c8d813ccbc..8165a620ea752 100644
--- a/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.yaml b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.yaml
index 2f7d0dc5b4e5e..f5bf638f52ee2 100644
--- a/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: ipi-conf-aws
   from_image:
     namespace: ocp
-    name: "4.5"
+    name: "4.12"
     tag: upi-installer
   commands: ipi-conf-aws-commands.sh
   resources:
diff --git a/ci-operator/step-registry/ipi/conf/aws/proxy/ipi-conf-aws-proxy-commands.sh b/ci-operator/step-registry/ipi/conf/aws/proxy/ipi-conf-aws-proxy-commands.sh
index 4814e5b7f3a3c..be28e2f76cfac 100644
--- a/ci-operator/step-registry/ipi/conf/aws/proxy/ipi-conf-aws-proxy-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/aws/proxy/ipi-conf-aws-proxy-commands.sh
@@ -235,9 +235,6 @@ EOF
 
 export AWS_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc)
 TAGS="Key=expirationDate,Value=${EXPIRATION_DATE}"
 
@@ -245,8 +242,8 @@ CONFIG="${SHARED_DIR}/install-config.yaml"
 
 PROXY_IMAGE=registry.ci.openshift.org/origin/4.5:egress-http-proxy
 
-PROXY_NAME="$(/tmp/yq r "${CONFIG}" 'metadata.name')"
-REGION="$(/tmp/yq r "${CONFIG}" 'platform.aws.region')"
+PROXY_NAME="$(yq-go r "${CONFIG}" 'metadata.name')"
+REGION="$(yq-go r "${CONFIG}" 'platform.aws.region')"
 echo Using region: ${REGION}
 test -n "${REGION}"
 
@@ -262,7 +259,7 @@ echo "Using FCOS ${RELEASE} AMI: ${AMI}"
 ssh_pub_key=$(<"${CLUSTER_PROFILE_DIR}/ssh-publickey")
 
 # get the VPC ID from a subnet -> subnet.VpcId
-aws_subnet="$(/tmp/yq r "${CONFIG}" 'platform.aws.subnets[0]')"
+aws_subnet="$(yq-go r "${CONFIG}" 'platform.aws.subnets[0]')"
 echo "Using aws_subnet: ${aws_subnet}"
 vpc_id="$(aws --region "${REGION}" ec2 describe-subnets --subnet-ids "${aws_subnet}" | jq -r '.[][0].VpcId')"
 echo "Using vpc_id: ${vpc_id}"
@@ -271,7 +268,7 @@ echo "Using vpc_id: ${vpc_id}"
 # aws ec2 describe-route-tables --filters Name=association.subnet-id,Values=${value} | grep '"GatewayId": "igw.*'
   # if $? then use it as the public subnet
 
-SUBNETS="$(/tmp/yq r -P "${CONFIG}" 'platform.aws.subnets' | sed 's/- //g')"
+SUBNETS="$(yq-go r -P "${CONFIG}" 'platform.aws.subnets' | sed 's/- //g')"
 public_subnet=""
 for subnet in ${SUBNETS}; do
   if aws --region "${REGION}" ec2 describe-route-tables --filters Name=association.subnet-id,Values="${subnet}" | grep '"GatewayId": "igw.*' 1>&2 > /dev/null; then
diff --git a/ci-operator/step-registry/ipi/conf/aws/proxy/ipi-conf-aws-proxy-ref.yaml b/ci-operator/step-registry/ipi/conf/aws/proxy/ipi-conf-aws-proxy-ref.yaml
index 46934d9dfc872..ca1795b492599 100644
--- a/ci-operator/step-registry/ipi/conf/aws/proxy/ipi-conf-aws-proxy-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/aws/proxy/ipi-conf-aws-proxy-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: ipi-conf-aws-proxy
   from_image:
     namespace: ocp
-    name: "4.5"
+    name: "4.12"
     tag: upi-installer
   grace_period: 10m
   commands: ipi-conf-aws-proxy-commands.sh
diff --git a/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-chain.metadata.json b/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-chain.metadata.json
index 4254f94585e97..ad754e24340de 100644
--- a/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-chain.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-chain.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-commands.sh b/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-commands.sh
index 14e74ee76a8ce..49c8654949d37 100755
--- a/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-commands.sh
@@ -8,9 +8,6 @@ export AWS_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"
 
 function join_by { local IFS="$1"; shift; echo "$*"; }
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc)
 TAGS="Key=expirationDate,Value=${EXPIRATION_DATE}"
 
@@ -19,7 +16,7 @@ PATCH=/tmp/install-config-sharednetwork.yaml.patch
 
 REGION="${LEASED_RESOURCE}"
 
-CLUSTER_NAME="$(/tmp/yq r "${CONFIG}" 'metadata.name')"
+CLUSTER_NAME="$(yq-go r "${CONFIG}" 'metadata.name')"
 
 curl -L https://raw.githubusercontent.com/openshift/installer/master/upi/aws/cloudformation/01_vpc.yaml -o /tmp/01_vpc.yaml
 
@@ -69,4 +66,4 @@ platform:
     subnets: ${subnets}
 EOF
 
-/tmp/yq m -x -i "${CONFIG}" "${PATCH}"
+yq-go m -x -i "${CONFIG}" "${PATCH}"
diff --git a/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-ref.metadata.json b/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-ref.metadata.json
index d38920e54c127..e2c26261f940e 100644
--- a/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-ref.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-ref.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-ref.yaml b/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-ref.yaml
index 50626c885f6e1..e1e456dd14659 100644
--- a/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/aws/sharednetwork/ipi-conf-aws-sharednetwork-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: ipi-conf-aws-sharednetwork
   from_image:
     namespace: ocp
-    name: "4.5"
+    name: "4.12"
     tag: upi-installer
   commands: ipi-conf-aws-sharednetwork-commands.sh
   resources:
diff --git a/ci-operator/step-registry/ipi/conf/azure/OWNERS b/ci-operator/step-registry/ipi/conf/azure/OWNERS
index d75fabb55445d..669efcce2a7cc 100644
--- a/ci-operator/step-registry/ipi/conf/azure/OWNERS
+++ b/ci-operator/step-registry/ipi/conf/azure/OWNERS
@@ -1,2 +1,4 @@
 approvers:
-- abhinavdahiya
+- patrickdillon
+- jianlinliu
+- yunjiang29
diff --git a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-chain.metadata.json b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-chain.metadata.json
index 0147f691df105..7d6d58dbfaa01 100644
--- a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-chain.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-chain.metadata.json
@@ -2,7 +2,9 @@
 	"path": "ipi/conf/azure/ipi-conf-azure-chain.yaml",
 	"owners": {
 		"approvers": [
-			"abhinavdahiya"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-commands.sh b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-commands.sh
index a442ecfcdfbd5..1b7001741d88b 100755
--- a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-commands.sh
@@ -20,9 +20,6 @@ function getVersion() {
   echo "${version}"
 }
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 CONFIG="${SHARED_DIR}/install-config.yaml"
 
 REGION="${LEASED_RESOURCE}"
@@ -70,7 +67,7 @@ platform:
   azure:
     outboundType: ${OUTBOUND_TYPE}
 EOF
-    /tmp/yq m -x -i "${CONFIG}" "${PATCH}"
+    yq-go m -x -i "${CONFIG}" "${PATCH}"
   else
     echo "${OUTBOUND_TYPE} is not supported yet" || exit 1
   fi
@@ -84,7 +81,7 @@ if [ -n "${version}" ] && [ "$(printf '%s\n' "${REQUIRED_OCP_VERSION}" "${versio
   isOldVersion=false
 fi
 
-PUBLISH=$(/tmp/yq r "${CONFIG}" "publish")
+PUBLISH=$(yq-go r "${CONFIG}" "publish")
 echo "publish: ${PUBLISH}"
 echo "is Old Version: ${isOldVersion}"
 if [ ${isOldVersion} = true ] || [ -z "${PUBLISH}" ] || [ X"${PUBLISH}" == X"External" ]; then
@@ -95,7 +92,7 @@ platform:
   azure:
     baseDomainResourceGroupName: os4-common
 EOF
-    /tmp/yq m -x -i "${CONFIG}" "${PATCH}"
+    yq-go m -x -i "${CONFIG}" "${PATCH}"
 else
   echo "Omit baseDomainResourceGroupName for private cluster"
-fi
\ No newline at end of file
+fi
diff --git a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.metadata.json b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.metadata.json
index 7e6b36926e711..79715e91e4634 100644
--- a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.metadata.json
@@ -2,7 +2,9 @@
 	"path": "ipi/conf/azure/ipi-conf-azure-ref.yaml",
 	"owners": {
 		"approvers": [
-			"abhinavdahiya"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.yaml b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.yaml
index 712cd7e2e1e5f..ae0b83ae2b954 100644
--- a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.yaml
@@ -1,9 +1,10 @@
 ref:
   as: ipi-conf-azure  
-  from_image:    
-    name: cli-jq
+  from_image:
+    name: "4.12"
     namespace: ocp
-    tag: latest
+    tag: upi-installer
+  cli: latest
   grace_period: 10m
   commands: ipi-conf-azure-commands.sh
   resources:
diff --git a/ci-operator/step-registry/ipi/conf/azure/provisioned-resourcegroup/ipi-conf-azure-provisioned-resourcegroup-commands.sh b/ci-operator/step-registry/ipi/conf/azure/provisioned-resourcegroup/ipi-conf-azure-provisioned-resourcegroup-commands.sh
index f14d52455f2f3..a049df8e61e71 100644
--- a/ci-operator/step-registry/ipi/conf/azure/provisioned-resourcegroup/ipi-conf-azure-provisioned-resourcegroup-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/azure/provisioned-resourcegroup/ipi-conf-azure-provisioned-resourcegroup-commands.sh
@@ -10,9 +10,6 @@ if [ ! -f "${provisioned_rg_file}" ]; then
     exit 1
 fi
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 provisioned_rg=$(cat "${provisioned_rg_file}")
 echo "Using provisioned resource group: ${provisioned_rg}"
 
@@ -27,4 +24,4 @@ platform:
 EOF
 
 # apply patch to install-config
-/tmp/yq m -x -i "${CONFIG}" "${PATCH}"
+yq-go m -x -i "${CONFIG}" "${PATCH}"
diff --git a/ci-operator/step-registry/ipi/conf/azure/provisioned-resourcegroup/ipi-conf-azure-provisioned-resourcegroup-ref.yaml b/ci-operator/step-registry/ipi/conf/azure/provisioned-resourcegroup/ipi-conf-azure-provisioned-resourcegroup-ref.yaml
index de28d84bdce7d..17e0434a30e0f 100644
--- a/ci-operator/step-registry/ipi/conf/azure/provisioned-resourcegroup/ipi-conf-azure-provisioned-resourcegroup-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/azure/provisioned-resourcegroup/ipi-conf-azure-provisioned-resourcegroup-ref.yaml
@@ -1,10 +1,9 @@
 ref:
   as: ipi-conf-azure-provisioned-resourcegroup
-  from: 
   from_image:
-   namespace: origin
-   name: centos
-   tag: '8'
+    namespace: ocp
+    name: "4.12"
+    tag: upi-installer
   commands: ipi-conf-azure-provisioned-resourcegroup-commands.sh
   resources:
     requests:
diff --git a/ci-operator/step-registry/ipi/conf/azure/provisionednetwork/ipi-conf-azure-provisionednetwork-commands.sh b/ci-operator/step-registry/ipi/conf/azure/provisionednetwork/ipi-conf-azure-provisionednetwork-commands.sh
index c599f377b3af4..7219f96a95b4c 100644
--- a/ci-operator/step-registry/ipi/conf/azure/provisionednetwork/ipi-conf-azure-provisionednetwork-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/azure/provisionednetwork/ipi-conf-azure-provisionednetwork-commands.sh
@@ -4,9 +4,6 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 CONFIG="${SHARED_DIR}/install-config.yaml"
 
 PATCH="${SHARED_DIR}/customer_vnet_subnets.yaml"
@@ -14,7 +11,7 @@ if [ ! -f ${PATCH} ]; then
     echo "${PATCH} is not found!"
     exit 1
 else
-    /tmp/yq m -x -i "${CONFIG}" "${PATCH}"
+    yq-go m -x -i "${CONFIG}" "${PATCH}"
 fi
 
 NETWORK_PATCH="${SHARED_DIR}/network_machinecidr.yaml"
@@ -22,5 +19,5 @@ if [ ! -f "${NETWORK_PATCH}" ]; then
     echo "${NETWORK_PATCH} is not found!"
     exit 1
 else
-    /tmp/yq m -x -i "${CONFIG}" "${NETWORK_PATCH}"
+    yq-go m -x -i "${CONFIG}" "${NETWORK_PATCH}"
 fi
diff --git a/ci-operator/step-registry/ipi/conf/azure/provisionednetwork/ipi-conf-azure-provisionednetwork-ref.yaml b/ci-operator/step-registry/ipi/conf/azure/provisionednetwork/ipi-conf-azure-provisionednetwork-ref.yaml
index 1f164e536e263..08149ae986933 100644
--- a/ci-operator/step-registry/ipi/conf/azure/provisionednetwork/ipi-conf-azure-provisionednetwork-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/azure/provisionednetwork/ipi-conf-azure-provisionednetwork-ref.yaml
@@ -1,10 +1,9 @@
 ref:
   as: ipi-conf-azure-provisionednetwork
-  from: 
   from_image:
-   namespace: origin
-   name: centos
-   tag: '8'
+    name: "4.12"
+    namespace: ocp
+    tag: upi-installer
   commands: ipi-conf-azure-provisionednetwork-commands.sh
   resources:
     requests:
diff --git a/ci-operator/step-registry/ipi/conf/azure/resourcegroup/ipi-conf-azure-resourcegroup-commands.sh b/ci-operator/step-registry/ipi/conf/azure/resourcegroup/ipi-conf-azure-resourcegroup-commands.sh
index 2095f5131dbfc..794232e672ac8 100755
--- a/ci-operator/step-registry/ipi/conf/azure/resourcegroup/ipi-conf-azure-resourcegroup-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/azure/resourcegroup/ipi-conf-azure-resourcegroup-commands.sh
@@ -4,14 +4,11 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 CONFIG="${SHARED_DIR}/install-config.yaml"
 PATCH="/tmp/install-config-existingresourcegroup.yaml.patch"
 
-azure_region=$(/tmp/yq r "${CONFIG}" 'platform.azure.region')
-cluster_name=$(/tmp/yq r "${CONFIG}" 'metadata.name')
+azure_region=$(yq-go r "${CONFIG}" 'platform.azure.region')
+cluster_name=$(yq-go r "${CONFIG}" 'metadata.name')
 existing_rg=${cluster_name}-exrg
 
 # az should already be there
@@ -37,4 +34,4 @@ platform:
 EOF
 
 # apply patch to install-config
-/tmp/yq m -x -i "${CONFIG}" "${PATCH}"
+yq-go m -x -i "${CONFIG}" "${PATCH}"
diff --git a/ci-operator/step-registry/ipi/conf/azure/resourcegroup/ipi-conf-azure-resourcegroup-ref.yaml b/ci-operator/step-registry/ipi/conf/azure/resourcegroup/ipi-conf-azure-resourcegroup-ref.yaml
index 85f74681a304d..3e63348eaee72 100644
--- a/ci-operator/step-registry/ipi/conf/azure/resourcegroup/ipi-conf-azure-resourcegroup-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/azure/resourcegroup/ipi-conf-azure-resourcegroup-ref.yaml
@@ -1,6 +1,9 @@
 ref:
   as: ipi-conf-azure-resourcegroup
-  from: upi-installer
+  from_image:
+    namespace: ocp
+    name: "4.12"
+    tag: upi-installer
   commands: ipi-conf-azure-resourcegroup-commands.sh
   resources:
     requests:
diff --git a/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-chain.metadata.json b/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-chain.metadata.json
index b2ccfc0b1d51f..57bff827f1a34 100644
--- a/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-chain.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-chain.metadata.json
@@ -2,7 +2,9 @@
 	"path": "ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-chain.yaml",
 	"owners": {
 		"approvers": [
-			"abhinavdahiya"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-commands.sh b/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-commands.sh
index 11824d47ceda5..2728df39bdc92 100755
--- a/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-commands.sh
@@ -4,17 +4,14 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 CONFIG="${SHARED_DIR}/install-config.yaml"
 
 if [ -f "${SHARED_DIR}/customer_vnet_subnets.yaml" ]; then
   VNET_FILE="${SHARED_DIR}/customer_vnet_subnets.yaml"
   RESOURCE_GROUP=$(cat ${SHARED_DIR}/resourcegroup)
-  vnet_name=$(/tmp/yq r ${VNET_FILE} 'platform.azure.virtualNetwork')
-  controlPlaneSubnet=$(/tmp/yq r ${VNET_FILE} 'platform.azure.controlPlaneSubnet')
-  computeSubnet=$(/tmp/yq r ${VNET_FILE} 'platform.azure.computeSubnet')
+  vnet_name=$(yq-go r ${VNET_FILE} 'platform.azure.virtualNetwork')
+  controlPlaneSubnet=$(yq-go r ${VNET_FILE} 'platform.azure.controlPlaneSubnet')
+  computeSubnet=$(yq-go r ${VNET_FILE} 'platform.azure.computeSubnet')
 
   PATCH="${SHARED_DIR}/install-config-provisioned-sharednetwork.yaml.patch"
 
@@ -29,7 +26,7 @@ EOF
 else
   PATCH=/tmp/install-config-sharednetwork.yaml.patch
 
-  azure_region=$(/tmp/yq r "${CONFIG}" 'platform.azure.region')
+  azure_region=$(yq-go r "${CONFIG}" 'platform.azure.region')
 
   cat > "${PATCH}" << EOF
 platform:
@@ -40,4 +37,4 @@ platform:
     computeSubnet: subnet-2
 EOF
 fi
-/tmp/yq m -x -i "${CONFIG}" "${PATCH}"
+yq-go m -x -i "${CONFIG}" "${PATCH}"
diff --git a/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-ref.metadata.json b/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-ref.metadata.json
index ff05cc8312970..003704a2980bd 100644
--- a/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-ref.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-ref.metadata.json
@@ -2,7 +2,9 @@
 	"path": "ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-ref.yaml",
 	"owners": {
 		"approvers": [
-			"abhinavdahiya"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-ref.yaml b/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-ref.yaml
index 2496306547ef6..2cd68f1b71dea 100644
--- a/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/azure/sharednetwork/ipi-conf-azure-sharednetwork-ref.yaml
@@ -1,9 +1,9 @@
 ref:
   as: ipi-conf-azure-sharednetwork
   from_image:
-   namespace: origin
-   name: centos
-   tag: '8'
+    name: "4.12"
+    namespace: ocp
+    tag: upi-installer
   commands: ipi-conf-azure-sharednetwork-commands.sh
   resources:
     requests:
diff --git a/ci-operator/step-registry/ipi/conf/azure/vmgenv1/ipi-conf-azure-vmgenv1-commands.sh b/ci-operator/step-registry/ipi/conf/azure/vmgenv1/ipi-conf-azure-vmgenv1-commands.sh
index 529b482a11b0e..ac9cebdf39cef 100755
--- a/ci-operator/step-registry/ipi/conf/azure/vmgenv1/ipi-conf-azure-vmgenv1-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/azure/vmgenv1/ipi-conf-azure-vmgenv1-commands.sh
@@ -4,9 +4,6 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 CONFIG="${SHARED_DIR}/install-config.yaml"
 PATCH="/tmp/install-config-existingvmgenv1.yaml.patch"
 # the only vm instance type which HyperVGenerations is 'V1', with it, can create the vm which generation is V1.
@@ -41,4 +38,4 @@ platform:
 EOF
 
 # apply patch to install-config
-/tmp/yq m -x -i "${CONFIG}" "${PATCH}"
+yq-go m -x -i "${CONFIG}" "${PATCH}"
diff --git a/ci-operator/step-registry/ipi/conf/azure/vmgenv1/ipi-conf-azure-vmgenv1-ref.yaml b/ci-operator/step-registry/ipi/conf/azure/vmgenv1/ipi-conf-azure-vmgenv1-ref.yaml
index 40e43ad706024..39fd0bc1f9ac3 100644
--- a/ci-operator/step-registry/ipi/conf/azure/vmgenv1/ipi-conf-azure-vmgenv1-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/azure/vmgenv1/ipi-conf-azure-vmgenv1-ref.yaml
@@ -1,6 +1,9 @@
 ref:
   as: ipi-conf-azure-vmgenv1
-  from: upi-installer
+  from_image:
+    namespace: ocp
+    name: "4.12"
+    tag: upi-installer
   commands: ipi-conf-azure-vmgenv1-commands.sh
   resources:
     requests:
diff --git a/ci-operator/step-registry/ipi/conf/azure/workers-marketimage/ipi-conf-azure-workers-marketimage-commands.sh b/ci-operator/step-registry/ipi/conf/azure/workers-marketimage/ipi-conf-azure-workers-marketimage-commands.sh
index 7d42200f8c285..040659e5b3841 100755
--- a/ci-operator/step-registry/ipi/conf/azure/workers-marketimage/ipi-conf-azure-workers-marketimage-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/azure/workers-marketimage/ipi-conf-azure-workers-marketimage-commands.sh
@@ -4,9 +4,6 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 CONFIG="${SHARED_DIR}/install-config.yaml"
 PATCH="/tmp/install-config-existingworkers-marketimage.yaml.patch"
 
@@ -50,4 +47,4 @@ compute:
 EOF
 
 # apply patch to install-config
-/tmp/yq m -x -i "${CONFIG}" "${PATCH}"
+yq-go m -x -i "${CONFIG}" "${PATCH}"
diff --git a/ci-operator/step-registry/ipi/conf/azure/workers-marketimage/ipi-conf-azure-workers-marketimage-ref.yaml b/ci-operator/step-registry/ipi/conf/azure/workers-marketimage/ipi-conf-azure-workers-marketimage-ref.yaml
index 3c5dfc626a642..757f0cf3cbf50 100644
--- a/ci-operator/step-registry/ipi/conf/azure/workers-marketimage/ipi-conf-azure-workers-marketimage-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/azure/workers-marketimage/ipi-conf-azure-workers-marketimage-ref.yaml
@@ -1,6 +1,9 @@
 ref:
   as: ipi-conf-azure-workers-marketimage
-  from: upi-installer
+  from_image:
+    namespace: ocp
+    name: "4.12"
+    tag: upi-installer
   commands: ipi-conf-azure-workers-marketimage-commands.sh
   resources:
     requests:
@@ -8,4 +11,4 @@ ref:
       memory: 100Mi
   documentation: |-
     The IPI Azure configure step generates the Azure-specific install-config.yaml contents based on the cluster profile and the market-image workers. 
-    This only supports in 4.11 and later version.
\ No newline at end of file
+    This only supports in 4.11 and later version.
diff --git a/ci-operator/step-registry/ipi/conf/customnoupgrade/ipi-conf-customnoupgrade-ref.metadata.json b/ci-operator/step-registry/ipi/conf/customnoupgrade/ipi-conf-customnoupgrade-ref.metadata.json
index d7b0b13db3e4a..b58fc16875161 100644
--- a/ci-operator/step-registry/ipi/conf/customnoupgrade/ipi-conf-customnoupgrade-ref.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/customnoupgrade/ipi-conf-customnoupgrade-ref.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/gcp/OWNERS b/ci-operator/step-registry/ipi/conf/gcp/OWNERS
index 1f2b819aa0000..b43e265490f08 100644
--- a/ci-operator/step-registry/ipi/conf/gcp/OWNERS
+++ b/ci-operator/step-registry/ipi/conf/gcp/OWNERS
@@ -1,4 +1,5 @@
 approvers:
-- abhinavdahiya
 - jstuever
 - patrickdillon
+- jianlinliu
+- yunjiang29
diff --git a/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-chain.metadata.json b/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-chain.metadata.json
index 7d5ad041b856e..762f9114215ce 100644
--- a/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-chain.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-chain.metadata.json
@@ -2,9 +2,10 @@
 	"path": "ipi/conf/gcp/ipi-conf-gcp-chain.yaml",
 	"owners": {
 		"approvers": [
-			"abhinavdahiya",
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-commands.sh b/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-commands.sh
index db7c86ed12e20..04d6c94dbb413 100755
--- a/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-commands.sh
@@ -4,10 +4,6 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
-
 CONFIG="${SHARED_DIR}/install-config.yaml"
 
 GCP_BASE_DOMAIN="$(< ${CLUSTER_PROFILE_DIR}/public_hosted_zone)"
@@ -63,6 +59,5 @@ EOF
 fi
 
 if [[ -s "${SHARED_DIR}/customer_vpc_subnets.yaml" ]]; then
-  /tmp/yq m -x -i "${CONFIG}" "${SHARED_DIR}/customer_vpc_subnets.yaml"
-  cat "${CONFIG}"
+  yq-go m -x -i "${CONFIG}" "${SHARED_DIR}/customer_vpc_subnets.yaml"
 fi
diff --git a/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-ref.metadata.json b/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-ref.metadata.json
index 2a4baf89aa54c..e1b28e780a185 100644
--- a/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-ref.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-ref.metadata.json
@@ -2,9 +2,10 @@
 	"path": "ipi/conf/gcp/ipi-conf-gcp-ref.yaml",
 	"owners": {
 		"approvers": [
-			"abhinavdahiya",
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-ref.yaml b/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-ref.yaml
index 095b3b7e86af2..532135396aabb 100644
--- a/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-ref.yaml
@@ -1,9 +1,9 @@
 ref:
   as: ipi-conf-gcp
   from_image:
-   namespace: origin
-   name: centos
-   tag: '8'
+   namespace: ocp
+   name: "4.12"
+   tag: upi-installer
   commands: ipi-conf-gcp-commands.sh
   resources:
     requests:
diff --git a/ci-operator/step-registry/ipi/conf/gcp/oidc-creds-additional/ipi-conf-gcp-oidc-creds-additional-commands.sh b/ci-operator/step-registry/ipi/conf/gcp/oidc-creds-additional/ipi-conf-gcp-oidc-creds-additional-commands.sh
index 78acd7aa58e94..4a1d143663c5f 100755
--- a/ci-operator/step-registry/ipi/conf/gcp/oidc-creds-additional/ipi-conf-gcp-oidc-creds-additional-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/gcp/oidc-creds-additional/ipi-conf-gcp-oidc-creds-additional-commands.sh
@@ -9,13 +9,10 @@ if [[ ! -f "${image_registry_credential_yaml}" ]]; then
   echo "'${image_registry_credential_yaml}' not found, abort." && exit 1
 fi
 
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-curl -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 -o /tmp/jq && chmod +x /tmp/jq
-
 PROJECT_NAME=$(< "${CLUSTER_PROFILE_DIR}/openshift_gcp_project")
 
 export GOOGLE_CLOUD_KEYFILE_JSON="${CLUSTER_PROFILE_DIR}/gce.json"
-sa_email=$(/tmp/jq -r .client_email ${GOOGLE_CLOUD_KEYFILE_JSON})
+sa_email=$(jq -r .client_email ${GOOGLE_CLOUD_KEYFILE_JSON})
 if ! gcloud auth list | grep -E "\*\s+${sa_email}"
 then
   gcloud auth activate-service-account --key-file="${GOOGLE_CLOUD_KEYFILE_JSON}"
@@ -27,14 +24,14 @@ working_dir=`mktemp -d`
 pushd "${working_dir}"
 
 echo -e "\n$(date -u --rfc-3339=seconds) - Creating long-live key for image-registry (https://docs.openshift.com/container-platform/4.10/authentication/managing_cloud_provider_credentials/cco-mode-gcp-workload-identity.html#cco-ccoctl-gcp-image-registry_cco-mode-gcp-workload-identity)"
-image_registry_sa=$(gcloud iam service-accounts list --filter="displayName=${infra_name}-openshift-image-registry-gcs" --format=json | /tmp/jq -r '.[].email')
+image_registry_sa=$(gcloud iam service-accounts list --filter="displayName=${infra_name}-openshift-image-registry-gcs" --format=json | jq -r '.[].email')
 
 new_key_json="image_registry_key.json"
 gcloud iam service-accounts keys create "${new_key_json}" --iam-account="${image_registry_sa}"
 new_key_str_b64=$(cat "${new_key_json}" | base64 -w 0)
 
-/tmp/yq r -j "${image_registry_credential_yaml}" > tmp1.json
-/tmp/jq --arg k "${new_key_str_b64}" '.data["service_account.json"] = $k' < tmp1.json > tmp2.json
-cat tmp2.json | /tmp/yq r -P - > "${image_registry_credential_yaml}"
+yq-go r -j "${image_registry_credential_yaml}" > tmp1.json
+jq --arg k "${new_key_str_b64}" '.data["service_account.json"] = $k' < tmp1.json > tmp2.json
+cat tmp2.json | yq-go r -P - > "${image_registry_credential_yaml}"
 popd
 echo -e "\n$(date -u --rfc-3339=seconds) - Updated image-registry SA with long-live key."
diff --git a/ci-operator/step-registry/ipi/conf/gcp/oidc-creds-additional/ipi-conf-gcp-oidc-creds-additional-ref.yaml b/ci-operator/step-registry/ipi/conf/gcp/oidc-creds-additional/ipi-conf-gcp-oidc-creds-additional-ref.yaml
index 1836de6175884..d7fd23d9e5542 100644
--- a/ci-operator/step-registry/ipi/conf/gcp/oidc-creds-additional/ipi-conf-gcp-oidc-creds-additional-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/gcp/oidc-creds-additional/ipi-conf-gcp-oidc-creds-additional-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: ipi-conf-gcp-oidc-creds-additional
   from_image:
     namespace: ocp
-    name: "4.10"
+    name: "4.12"
     tag: upi-installer
   commands: ipi-conf-gcp-oidc-creds-additional-commands.sh
   resources:
@@ -10,4 +10,4 @@ ref:
       cpu: 10m
       memory: 100Mi
   documentation: |-
-    The GCP step does additional step for using CCO manual mode and GCP workload identity. 
\ No newline at end of file
+    The GCP step does additional step for using CCO manual mode and GCP workload identity. 
diff --git a/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-chain.metadata.json b/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-chain.metadata.json
index eee7aa9e942c3..c5bcccf1a3c08 100644
--- a/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-chain.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-chain.metadata.json
@@ -2,9 +2,10 @@
 	"path": "ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-chain.yaml",
 	"owners": {
 		"approvers": [
-			"abhinavdahiya",
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-commands.sh b/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-commands.sh
index 6c245e080b21e..2e50db35671cd 100755
--- a/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-commands.sh
@@ -4,9 +4,6 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 CONFIG="${SHARED_DIR}/install-config.yaml"
 PATCH=/tmp/install-config-sharednetwork.yaml.patch
 
@@ -18,4 +15,4 @@ platform:
     computeSubnet: do-not-delete-shared-worker-subnet
 EOF
 
-/tmp/yq m -x -i "${CONFIG}" "${PATCH}"
+yq-go m -x -i "${CONFIG}" "${PATCH}"
diff --git a/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-ref.metadata.json b/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-ref.metadata.json
index 49bc29f64f950..4bb3211833d78 100644
--- a/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-ref.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-ref.metadata.json
@@ -2,9 +2,10 @@
 	"path": "ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-ref.yaml",
 	"owners": {
 		"approvers": [
-			"abhinavdahiya",
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-ref.yaml b/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-ref.yaml
index f34e5cc360402..817f329717838 100644
--- a/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/gcp/sharednetwork/ipi-conf-gcp-sharednetwork-ref.yaml
@@ -1,6 +1,9 @@
 ref:
   as: ipi-conf-gcp-sharednetwork
-  from: upi-installer
+  from_image:
+    namespace: ocp
+    name: "4.12"
+    tag: upi-installer
   commands: ipi-conf-gcp-sharednetwork-commands.sh
   resources:
     requests:
diff --git a/ci-operator/step-registry/ipi/conf/ipi-conf-ref.metadata.json b/ci-operator/step-registry/ipi/conf/ipi-conf-ref.metadata.json
index 134451489668f..718c12700e924 100644
--- a/ci-operator/step-registry/ipi/conf/ipi-conf-ref.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/ipi-conf-ref.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/manual-creds/OWNERS b/ci-operator/step-registry/ipi/conf/manual-creds/OWNERS
index 8a1865910cab3..af54eb184b394 100644
--- a/ci-operator/step-registry/ipi/conf/manual-creds/OWNERS
+++ b/ci-operator/step-registry/ipi/conf/manual-creds/OWNERS
@@ -1,3 +1,4 @@
 approvers:
-- abhinavdahiya
 - joelddiaz
+- jianlinliu
+- yunjiang29
diff --git a/ci-operator/step-registry/ipi/conf/manual-creds/ipi-conf-manual-creds-commands.sh b/ci-operator/step-registry/ipi/conf/manual-creds/ipi-conf-manual-creds-commands.sh
index c60d96ea167b0..0342fb9d68318 100755
--- a/ci-operator/step-registry/ipi/conf/manual-creds/ipi-conf-manual-creds-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/manual-creds/ipi-conf-manual-creds-commands.sh
@@ -4,14 +4,8 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 CONFIG="${SHARED_DIR}/install-config.yaml"
-PATCH=/tmp/install-config-manual-creds.yaml.patch
 
-cat > "${PATCH}" << EOF
+cat >> "${CONFIG}" << EOF
 credentialsMode: Manual
 EOF
-
-/tmp/yq m -x -i "${CONFIG}" "${PATCH}"
diff --git a/ci-operator/step-registry/ipi/conf/manual-creds/ipi-conf-manual-creds-ref.metadata.json b/ci-operator/step-registry/ipi/conf/manual-creds/ipi-conf-manual-creds-ref.metadata.json
index 77dd04731923f..ff6ea0dbd2655 100644
--- a/ci-operator/step-registry/ipi/conf/manual-creds/ipi-conf-manual-creds-ref.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/manual-creds/ipi-conf-manual-creds-ref.metadata.json
@@ -2,8 +2,9 @@
 	"path": "ipi/conf/manual-creds/ipi-conf-manual-creds-ref.yaml",
 	"owners": {
 		"approvers": [
-			"abhinavdahiya",
-			"joelddiaz"
+			"joelddiaz",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/conf/mirror/ipi-conf-mirror-commands.sh b/ci-operator/step-registry/ipi/conf/mirror/ipi-conf-mirror-commands.sh
index 048b7ca121e8d..c6322742a3f0a 100755
--- a/ci-operator/step-registry/ipi/conf/mirror/ipi-conf-mirror-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/mirror/ipi-conf-mirror-commands.sh
@@ -4,8 +4,6 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 CONFIG="${SHARED_DIR}/install-config.yaml"
 
 # mirror registry
@@ -35,9 +33,9 @@ pullSecret: >
 additionalTrustBundle: |
 `sed 's/^/  /g' "/var/run/vault/mirror-registry/client_ca.crt"`
 EOF
-/tmp/yq m -x -i "${CONFIG}" "${CONFIG_PATCH}"
+yq-go m -x -i "${CONFIG}" "${CONFIG_PATCH}"
 
 # imageContentSources patch
-/tmp/yq m -x -i "${CONFIG}" "${install_config_icsp_patch}"
+yq-go m -x -i "${CONFIG}" "${install_config_icsp_patch}"
 
 rm -f "${mirror_registry_pull_secret}"
diff --git a/ci-operator/step-registry/ipi/conf/mirror/ipi-conf-mirror-ref.yaml b/ci-operator/step-registry/ipi/conf/mirror/ipi-conf-mirror-ref.yaml
index d707fb2cbae38..66c7cc401fbfb 100644
--- a/ci-operator/step-registry/ipi/conf/mirror/ipi-conf-mirror-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/mirror/ipi-conf-mirror-ref.yaml
@@ -2,7 +2,7 @@ ref:
   as: ipi-conf-mirror
   from_image:
     namespace: ocp
-    name: "4.5"
+    name: "4.12"
     tag: upi-installer
   commands: ipi-conf-mirror-commands.sh
   resources:
diff --git a/ci-operator/step-registry/ipi/conf/techpreview/ipi-conf-techpreview-ref.metadata.json b/ci-operator/step-registry/ipi/conf/techpreview/ipi-conf-techpreview-ref.metadata.json
index 706370535bca7..7770e76b7e2d9 100644
--- a/ci-operator/step-registry/ipi/conf/techpreview/ipi-conf-techpreview-ref.metadata.json
+++ b/ci-operator/step-registry/ipi/conf/techpreview/ipi-conf-techpreview-ref.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/deprovision/azure/resourcegroup/ipi-deprovision-azure-resourcegroup-commands.sh b/ci-operator/step-registry/ipi/deprovision/azure/resourcegroup/ipi-deprovision-azure-resourcegroup-commands.sh
index b86ed0fc6e556..512c183ee9c64 100755
--- a/ci-operator/step-registry/ipi/deprovision/azure/resourcegroup/ipi-deprovision-azure-resourcegroup-commands.sh
+++ b/ci-operator/step-registry/ipi/deprovision/azure/resourcegroup/ipi-deprovision-azure-resourcegroup-commands.sh
@@ -4,13 +4,10 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 CONFIG="${SHARED_DIR}/install-config.yaml"
 
-existing_rg=$(/tmp/yq r "${CONFIG}" 'platform.azure.resourceGroupName')
-cloud_name=$(/tmp/yq r "${CONFIG}" 'platform.azure.cloudName')
+existing_rg=$(yq-go r "${CONFIG}" 'platform.azure.resourceGroupName')
+cloud_name=$(yq-go r "${CONFIG}" 'platform.azure.cloudName')
 
 # az should already be there
 command -v az
diff --git a/ci-operator/step-registry/ipi/deprovision/azure/resourcegroup/ipi-deprovision-azure-resourcegroup-ref.yaml b/ci-operator/step-registry/ipi/deprovision/azure/resourcegroup/ipi-deprovision-azure-resourcegroup-ref.yaml
index 35924a9a9a4c4..80244eb48328d 100644
--- a/ci-operator/step-registry/ipi/deprovision/azure/resourcegroup/ipi-deprovision-azure-resourcegroup-ref.yaml
+++ b/ci-operator/step-registry/ipi/deprovision/azure/resourcegroup/ipi-deprovision-azure-resourcegroup-ref.yaml
@@ -1,6 +1,9 @@
 ref:
   as: ipi-deprovision-azure-resourcegroup
-  from: upi-installer
+  from_image:
+    namespace: ocp
+    name: "4.12"
+    tag: upi-installer
   commands: ipi-deprovision-azure-resourcegroup-commands.sh
   resources:
     requests:
diff --git a/ci-operator/step-registry/ipi/deprovision/deprovision/ipi-deprovision-deprovision-ref.metadata.json b/ci-operator/step-registry/ipi/deprovision/deprovision/ipi-deprovision-deprovision-ref.metadata.json
index d9225a1f5404e..5890b82a792d7 100644
--- a/ci-operator/step-registry/ipi/deprovision/deprovision/ipi-deprovision-deprovision-ref.metadata.json
+++ b/ci-operator/step-registry/ipi/deprovision/deprovision/ipi-deprovision-deprovision-ref.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/deprovision/ipi-deprovision-chain.metadata.json b/ci-operator/step-registry/ipi/deprovision/ipi-deprovision-chain.metadata.json
index 3d706279ba968..afe07979a77d0 100644
--- a/ci-operator/step-registry/ipi/deprovision/ipi-deprovision-chain.metadata.json
+++ b/ci-operator/step-registry/ipi/deprovision/ipi-deprovision-chain.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/install/install/aws/ipi-install-install-aws-commands.sh b/ci-operator/step-registry/ipi/install/install/aws/ipi-install-install-aws-commands.sh
index b5a945814ec2c..47978cb5986bf 100755
--- a/ci-operator/step-registry/ipi/install/install/aws/ipi-install-install-aws-commands.sh
+++ b/ci-operator/step-registry/ipi/install/install/aws/ipi-install-install-aws-commands.sh
@@ -4,10 +4,8 @@ set -o nounset
 # set -o errexit
 # set -o pipefail
 
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
-CLUSTER_NAME="$(/tmp/yq r "${SHARED_DIR}/install-config.yaml" 'metadata.name')"
-BASE_DOMAIN="$(/tmp/yq r "${SHARED_DIR}/install-config.yaml" 'baseDomain')"
+CLUSTER_NAME="$(yq-go r "${SHARED_DIR}/install-config.yaml" 'metadata.name')"
+BASE_DOMAIN="$(yq-go r "${SHARED_DIR}/install-config.yaml" 'baseDomain')"
 
 function populate_artifact_dir() {
   set +e
@@ -108,8 +106,8 @@ openshift-install --dir="${dir}" create manifests &
 wait "$!"
 
 if [ "${ADD_INGRESS_RECORDS_MANUALLY}" == "yes" ]; then
-  /tmp/yq d -i "${dir}/manifests/cluster-dns-02-config.yml" spec.privateZone
-  /tmp/yq d -i "${dir}/manifests/cluster-dns-02-config.yml" spec.publicZone
+  yq-go d -i "${dir}/manifests/cluster-dns-02-config.yml" spec.privateZone
+  yq-go d -i "${dir}/manifests/cluster-dns-02-config.yml" spec.publicZone
 fi
 
 sed -i '/^  channel:/d' "${dir}/manifests/cvo-overrides.yaml"
diff --git a/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.metadata.json b/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.metadata.json
index 5f39fededf90f..6a4adddbd2bbf 100644
--- a/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.metadata.json
+++ b/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.metadata.json b/ci-operator/step-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.metadata.json
index 9fb6aa055ee16..623918223bba3 100644
--- a/ci-operator/step-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.metadata.json
+++ b/ci-operator/step-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/install/ipi-install-chain.metadata.json b/ci-operator/step-registry/ipi/install/ipi-install-chain.metadata.json
index b5ad1632f30be..2913e21714ce4 100644
--- a/ci-operator/step-registry/ipi/install/ipi-install-chain.metadata.json
+++ b/ci-operator/step-registry/ipi/install/ipi-install-chain.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/install/rbac/ipi-install-rbac-ref.metadata.json b/ci-operator/step-registry/ipi/install/rbac/ipi-install-rbac-ref.metadata.json
index d6042301d6795..d912773584219 100644
--- a/ci-operator/step-registry/ipi/install/rbac/ipi-install-rbac-ref.metadata.json
+++ b/ci-operator/step-registry/ipi/install/rbac/ipi-install-rbac-ref.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/ipi/install/stableinitial/ipi-install-stableinitial-chain.metadata.json b/ci-operator/step-registry/ipi/install/stableinitial/ipi-install-stableinitial-chain.metadata.json
index 596e0fdf79a3f..b32cbbe56dacf 100644
--- a/ci-operator/step-registry/ipi/install/stableinitial/ipi-install-stableinitial-chain.metadata.json
+++ b/ci-operator/step-registry/ipi/install/stableinitial/ipi-install-stableinitial-chain.metadata.json
@@ -7,7 +7,9 @@
 			"abhinavdahiya",
 			"deads2k",
 			"staebler",
-			"technical-release-team-approvers"
+			"technical-release-team-approvers",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/aws/OWNERS b/ci-operator/step-registry/upi/aws/OWNERS
index 0fff929df92e3..38b4d590cf16f 100644
--- a/ci-operator/step-registry/upi/aws/OWNERS
+++ b/ci-operator/step-registry/upi/aws/OWNERS
@@ -1,6 +1,7 @@
 approvers:
-- staebler
 - rna-afk
 - patrickdillon
 - jhixson74
 - jstuever
+- jianlinliu
+- yunjiang29
diff --git a/ci-operator/step-registry/upi/aws/post/upi-aws-post-chain.metadata.json b/ci-operator/step-registry/upi/aws/post/upi-aws-post-chain.metadata.json
index 356b4c72a3de3..d969d15b614ef 100644
--- a/ci-operator/step-registry/upi/aws/post/upi-aws-post-chain.metadata.json
+++ b/ci-operator/step-registry/upi/aws/post/upi-aws-post-chain.metadata.json
@@ -2,11 +2,12 @@
 	"path": "upi/aws/post/upi-aws-post-chain.yaml",
 	"owners": {
 		"approvers": [
-			"staebler",
 			"rna-afk",
 			"patrickdillon",
 			"jhixson74",
-			"jstuever"
+			"jstuever",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/aws/pre/upi-aws-pre-chain.metadata.json b/ci-operator/step-registry/upi/aws/pre/upi-aws-pre-chain.metadata.json
index 6e3c2626a5066..3808330f0f0b8 100644
--- a/ci-operator/step-registry/upi/aws/pre/upi-aws-pre-chain.metadata.json
+++ b/ci-operator/step-registry/upi/aws/pre/upi-aws-pre-chain.metadata.json
@@ -2,11 +2,12 @@
 	"path": "upi/aws/pre/upi-aws-pre-chain.yaml",
 	"owners": {
 		"approvers": [
-			"staebler",
 			"rna-afk",
 			"patrickdillon",
 			"jhixson74",
-			"jstuever"
+			"jstuever",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/aws/proxy/post/upi-aws-proxy-post-chain.metadata.json b/ci-operator/step-registry/upi/aws/proxy/post/upi-aws-proxy-post-chain.metadata.json
index 5730ff3a9b2ff..a685ee0462f1f 100644
--- a/ci-operator/step-registry/upi/aws/proxy/post/upi-aws-proxy-post-chain.metadata.json
+++ b/ci-operator/step-registry/upi/aws/proxy/post/upi-aws-proxy-post-chain.metadata.json
@@ -2,11 +2,12 @@
 	"path": "upi/aws/proxy/post/upi-aws-proxy-post-chain.yaml",
 	"owners": {
 		"approvers": [
-			"staebler",
 			"rna-afk",
 			"patrickdillon",
 			"jhixson74",
-			"jstuever"
+			"jstuever",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/aws/proxy/pre/upi-aws-proxy-pre-chain.metadata.json b/ci-operator/step-registry/upi/aws/proxy/pre/upi-aws-proxy-pre-chain.metadata.json
index 6d6e043ee17ee..9dc7927227fc2 100644
--- a/ci-operator/step-registry/upi/aws/proxy/pre/upi-aws-proxy-pre-chain.metadata.json
+++ b/ci-operator/step-registry/upi/aws/proxy/pre/upi-aws-proxy-pre-chain.metadata.json
@@ -2,11 +2,12 @@
 	"path": "upi/aws/proxy/pre/upi-aws-proxy-pre-chain.yaml",
 	"owners": {
 		"approvers": [
-			"staebler",
 			"rna-afk",
 			"patrickdillon",
 			"jhixson74",
-			"jstuever"
+			"jstuever",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/aws/proxy/upi-aws-proxy-workflow.metadata.json b/ci-operator/step-registry/upi/aws/proxy/upi-aws-proxy-workflow.metadata.json
index 06b8b92370541..8cfb2cf5f73c5 100644
--- a/ci-operator/step-registry/upi/aws/proxy/upi-aws-proxy-workflow.metadata.json
+++ b/ci-operator/step-registry/upi/aws/proxy/upi-aws-proxy-workflow.metadata.json
@@ -2,11 +2,12 @@
 	"path": "upi/aws/proxy/upi-aws-proxy-workflow.yaml",
 	"owners": {
 		"approvers": [
-			"staebler",
 			"rna-afk",
 			"patrickdillon",
 			"jhixson74",
-			"jstuever"
+			"jstuever",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/aws/upi-aws-workflow.metadata.json b/ci-operator/step-registry/upi/aws/upi-aws-workflow.metadata.json
index f50d47a6ebf30..2da5aeb631c02 100644
--- a/ci-operator/step-registry/upi/aws/upi-aws-workflow.metadata.json
+++ b/ci-operator/step-registry/upi/aws/upi-aws-workflow.metadata.json
@@ -2,11 +2,12 @@
 	"path": "upi/aws/upi-aws-workflow.yaml",
 	"owners": {
 		"approvers": [
-			"staebler",
 			"rna-afk",
 			"patrickdillon",
 			"jhixson74",
-			"jstuever"
+			"jstuever",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/azure/OWNERS b/ci-operator/step-registry/upi/azure/OWNERS
index 0fff929df92e3..38b4d590cf16f 100644
--- a/ci-operator/step-registry/upi/azure/OWNERS
+++ b/ci-operator/step-registry/upi/azure/OWNERS
@@ -1,6 +1,7 @@
 approvers:
-- staebler
 - rna-afk
 - patrickdillon
 - jhixson74
 - jstuever
+- jianlinliu
+- yunjiang29
diff --git a/ci-operator/step-registry/upi/azure/post/upi-azure-post-chain.metadata.json b/ci-operator/step-registry/upi/azure/post/upi-azure-post-chain.metadata.json
index ab8a21ddd8971..a681f4b380cf8 100644
--- a/ci-operator/step-registry/upi/azure/post/upi-azure-post-chain.metadata.json
+++ b/ci-operator/step-registry/upi/azure/post/upi-azure-post-chain.metadata.json
@@ -2,11 +2,12 @@
 	"path": "upi/azure/post/upi-azure-post-chain.yaml",
 	"owners": {
 		"approvers": [
-			"staebler",
 			"rna-afk",
 			"patrickdillon",
 			"jhixson74",
-			"jstuever"
+			"jstuever",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/azure/pre/upi-azure-pre-chain.metadata.json b/ci-operator/step-registry/upi/azure/pre/upi-azure-pre-chain.metadata.json
index 434f821f0aff3..51fbc32c33bf8 100644
--- a/ci-operator/step-registry/upi/azure/pre/upi-azure-pre-chain.metadata.json
+++ b/ci-operator/step-registry/upi/azure/pre/upi-azure-pre-chain.metadata.json
@@ -2,11 +2,12 @@
 	"path": "upi/azure/pre/upi-azure-pre-chain.yaml",
 	"owners": {
 		"approvers": [
-			"staebler",
 			"rna-afk",
 			"patrickdillon",
 			"jhixson74",
-			"jstuever"
+			"jstuever",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/azure/upi-azure-workflow.metadata.json b/ci-operator/step-registry/upi/azure/upi-azure-workflow.metadata.json
index d0562b0a48c1a..939ff29cdc290 100644
--- a/ci-operator/step-registry/upi/azure/upi-azure-workflow.metadata.json
+++ b/ci-operator/step-registry/upi/azure/upi-azure-workflow.metadata.json
@@ -2,11 +2,12 @@
 	"path": "upi/azure/upi-azure-workflow.yaml",
 	"owners": {
 		"approvers": [
-			"staebler",
 			"rna-afk",
 			"patrickdillon",
 			"jhixson74",
-			"jstuever"
+			"jstuever",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/conf/gcp/OWNERS b/ci-operator/step-registry/upi/conf/gcp/OWNERS
index 1f2b819aa0000..6f40e94e25761 100644
--- a/ci-operator/step-registry/upi/conf/gcp/OWNERS
+++ b/ci-operator/step-registry/upi/conf/gcp/OWNERS
@@ -2,3 +2,5 @@ approvers:
 - abhinavdahiya
 - jstuever
 - patrickdillon
+- jianlinliu
+- yunjiang29
diff --git a/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-chain.metadata.json b/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-chain.metadata.json
index be041863e4d55..d916ddb6d621f 100644
--- a/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-chain.metadata.json
+++ b/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-chain.metadata.json
@@ -4,7 +4,9 @@
 		"approvers": [
 			"abhinavdahiya",
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-commands.sh b/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-commands.sh
index 694280ef2dcbc..0987093ed3cd4 100755
--- a/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-commands.sh
+++ b/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-commands.sh
@@ -6,9 +6,6 @@ set -o pipefail
 
 trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 export HOME=/tmp
 
 if [[ -z "$RELEASE_IMAGE_LATEST" ]]; then
@@ -64,7 +61,7 @@ data["compute"] = [ { "name": "worker", "replicas": 0 } ];
 open(path, "w").write(yaml.dump(data, default_flow_style=False))'
 
 ### Enable private cluster setting (optional)
-origin_publish="$(/tmp/yq r install-config.yaml 'publish')"
+origin_publish="$(yq-go r install-config.yaml 'publish')"
 if [[ ${origin_publish} = "" ]]; then
   origin_publish="External"
 fi
diff --git a/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-ref.metadata.json b/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-ref.metadata.json
index 376230b7db20a..21558439a969f 100644
--- a/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-ref.metadata.json
+++ b/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-ref.metadata.json
@@ -4,7 +4,9 @@
 		"approvers": [
 			"abhinavdahiya",
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-ref.yaml b/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-ref.yaml
index 7eca19bbfe02a..906469de65aae 100644
--- a/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-ref.yaml
+++ b/ci-operator/step-registry/upi/conf/gcp/upi-conf-gcp-ref.yaml
@@ -1,6 +1,9 @@
 ref:
   as: upi-conf-gcp
-  from: upi-installer
+  from_image:
+    namespace: ocp
+    name: "4.12"
+    tag: upi-installer
   grace_period: 10m
   commands: upi-conf-gcp-commands.sh
   resources:
diff --git a/ci-operator/step-registry/upi/conf/gcp/xpn/upi-conf-gcp-xpn-ref.metadata.json b/ci-operator/step-registry/upi/conf/gcp/xpn/upi-conf-gcp-xpn-ref.metadata.json
index a3b65e1e47375..df8e7a3ef4f77 100644
--- a/ci-operator/step-registry/upi/conf/gcp/xpn/upi-conf-gcp-xpn-ref.metadata.json
+++ b/ci-operator/step-registry/upi/conf/gcp/xpn/upi-conf-gcp-xpn-ref.metadata.json
@@ -4,7 +4,9 @@
 		"approvers": [
 			"abhinavdahiya",
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/deprovision/aws/OWNERS b/ci-operator/step-registry/upi/deprovision/aws/OWNERS
index 0fff929df92e3..526f5433a3ae3 100644
--- a/ci-operator/step-registry/upi/deprovision/aws/OWNERS
+++ b/ci-operator/step-registry/upi/deprovision/aws/OWNERS
@@ -4,3 +4,5 @@ approvers:
 - patrickdillon
 - jhixson74
 - jstuever
+- jianlinliu
+- yunjiang29
diff --git a/ci-operator/step-registry/upi/deprovision/aws/check-destroy/upi-deprovision-aws-check-destroy-ref.metadata.json b/ci-operator/step-registry/upi/deprovision/aws/check-destroy/upi-deprovision-aws-check-destroy-ref.metadata.json
index ec7c94bf1a3ac..5dbcbdc045fab 100644
--- a/ci-operator/step-registry/upi/deprovision/aws/check-destroy/upi-deprovision-aws-check-destroy-ref.metadata.json
+++ b/ci-operator/step-registry/upi/deprovision/aws/check-destroy/upi-deprovision-aws-check-destroy-ref.metadata.json
@@ -6,7 +6,9 @@
 			"rna-afk",
 			"patrickdillon",
 			"jhixson74",
-			"jstuever"
+			"jstuever",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/deprovision/aws/upi-deprovision-aws-ref.metadata.json b/ci-operator/step-registry/upi/deprovision/aws/upi-deprovision-aws-ref.metadata.json
index f9cf979fccd3c..336639d097d1a 100644
--- a/ci-operator/step-registry/upi/deprovision/aws/upi-deprovision-aws-ref.metadata.json
+++ b/ci-operator/step-registry/upi/deprovision/aws/upi-deprovision-aws-ref.metadata.json
@@ -6,7 +6,9 @@
 			"rna-afk",
 			"patrickdillon",
 			"jhixson74",
-			"jstuever"
+			"jstuever",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/deprovision/azure/OWNERS b/ci-operator/step-registry/upi/deprovision/azure/OWNERS
index 0fff929df92e3..526f5433a3ae3 100644
--- a/ci-operator/step-registry/upi/deprovision/azure/OWNERS
+++ b/ci-operator/step-registry/upi/deprovision/azure/OWNERS
@@ -4,3 +4,5 @@ approvers:
 - patrickdillon
 - jhixson74
 - jstuever
+- jianlinliu
+- yunjiang29
diff --git a/ci-operator/step-registry/upi/deprovision/azure/upi-deprovision-azure-ref.metadata.json b/ci-operator/step-registry/upi/deprovision/azure/upi-deprovision-azure-ref.metadata.json
index 1da71cdc2dda6..4a0aaade1b799 100644
--- a/ci-operator/step-registry/upi/deprovision/azure/upi-deprovision-azure-ref.metadata.json
+++ b/ci-operator/step-registry/upi/deprovision/azure/upi-deprovision-azure-ref.metadata.json
@@ -6,7 +6,9 @@
 			"rna-afk",
 			"patrickdillon",
 			"jhixson74",
-			"jstuever"
+			"jstuever",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/deprovision/gcp/OWNERS b/ci-operator/step-registry/upi/deprovision/gcp/OWNERS
index 1f2b819aa0000..6f40e94e25761 100644
--- a/ci-operator/step-registry/upi/deprovision/gcp/OWNERS
+++ b/ci-operator/step-registry/upi/deprovision/gcp/OWNERS
@@ -2,3 +2,5 @@ approvers:
 - abhinavdahiya
 - jstuever
 - patrickdillon
+- jianlinliu
+- yunjiang29
diff --git a/ci-operator/step-registry/upi/deprovision/gcp/upi-deprovision-gcp-ref.metadata.json b/ci-operator/step-registry/upi/deprovision/gcp/upi-deprovision-gcp-ref.metadata.json
index 66b2a32e456dc..c31992be652b0 100644
--- a/ci-operator/step-registry/upi/deprovision/gcp/upi-deprovision-gcp-ref.metadata.json
+++ b/ci-operator/step-registry/upi/deprovision/gcp/upi-deprovision-gcp-ref.metadata.json
@@ -4,7 +4,9 @@
 		"approvers": [
 			"abhinavdahiya",
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/gcp/OWNERS b/ci-operator/step-registry/upi/gcp/OWNERS
index 1f2b819aa0000..b43e265490f08 100644
--- a/ci-operator/step-registry/upi/gcp/OWNERS
+++ b/ci-operator/step-registry/upi/gcp/OWNERS
@@ -1,4 +1,5 @@
 approvers:
-- abhinavdahiya
 - jstuever
 - patrickdillon
+- jianlinliu
+- yunjiang29
diff --git a/ci-operator/step-registry/upi/gcp/post/upi-gcp-post-chain.metadata.json b/ci-operator/step-registry/upi/gcp/post/upi-gcp-post-chain.metadata.json
index cd1c73f6a6c0d..58a90950c31fe 100644
--- a/ci-operator/step-registry/upi/gcp/post/upi-gcp-post-chain.metadata.json
+++ b/ci-operator/step-registry/upi/gcp/post/upi-gcp-post-chain.metadata.json
@@ -2,9 +2,10 @@
 	"path": "upi/gcp/post/upi-gcp-post-chain.yaml",
 	"owners": {
 		"approvers": [
-			"abhinavdahiya",
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/gcp/pre/upi-gcp-pre-chain.metadata.json b/ci-operator/step-registry/upi/gcp/pre/upi-gcp-pre-chain.metadata.json
index e31352ed40817..712d1f2943f57 100644
--- a/ci-operator/step-registry/upi/gcp/pre/upi-gcp-pre-chain.metadata.json
+++ b/ci-operator/step-registry/upi/gcp/pre/upi-gcp-pre-chain.metadata.json
@@ -2,9 +2,10 @@
 	"path": "upi/gcp/pre/upi-gcp-pre-chain.yaml",
 	"owners": {
 		"approvers": [
-			"abhinavdahiya",
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/gcp/upi-gcp-workflow.metadata.json b/ci-operator/step-registry/upi/gcp/upi-gcp-workflow.metadata.json
index 7124db6262944..b344eba771a41 100644
--- a/ci-operator/step-registry/upi/gcp/upi-gcp-workflow.metadata.json
+++ b/ci-operator/step-registry/upi/gcp/upi-gcp-workflow.metadata.json
@@ -2,9 +2,10 @@
 	"path": "upi/gcp/upi-gcp-workflow.yaml",
 	"owners": {
 		"approvers": [
-			"abhinavdahiya",
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/gcp/xpn/post/upi-gcp-xpn-post-chain.metadata.json b/ci-operator/step-registry/upi/gcp/xpn/post/upi-gcp-xpn-post-chain.metadata.json
index 8c0217c14738d..5b4847386058f 100644
--- a/ci-operator/step-registry/upi/gcp/xpn/post/upi-gcp-xpn-post-chain.metadata.json
+++ b/ci-operator/step-registry/upi/gcp/xpn/post/upi-gcp-xpn-post-chain.metadata.json
@@ -2,9 +2,10 @@
 	"path": "upi/gcp/xpn/post/upi-gcp-xpn-post-chain.yaml",
 	"owners": {
 		"approvers": [
-			"abhinavdahiya",
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/gcp/xpn/pre/upi-gcp-xpn-pre-chain.metadata.json b/ci-operator/step-registry/upi/gcp/xpn/pre/upi-gcp-xpn-pre-chain.metadata.json
index a081e9c82de2a..9e83492567e4a 100644
--- a/ci-operator/step-registry/upi/gcp/xpn/pre/upi-gcp-xpn-pre-chain.metadata.json
+++ b/ci-operator/step-registry/upi/gcp/xpn/pre/upi-gcp-xpn-pre-chain.metadata.json
@@ -2,9 +2,10 @@
 	"path": "upi/gcp/xpn/pre/upi-gcp-xpn-pre-chain.yaml",
 	"owners": {
 		"approvers": [
-			"abhinavdahiya",
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/gcp/xpn/upi-gcp-xpn-workflow.metadata.json b/ci-operator/step-registry/upi/gcp/xpn/upi-gcp-xpn-workflow.metadata.json
index bf8c74d2324b0..1574956e71fe4 100644
--- a/ci-operator/step-registry/upi/gcp/xpn/upi-gcp-xpn-workflow.metadata.json
+++ b/ci-operator/step-registry/upi/gcp/xpn/upi-gcp-xpn-workflow.metadata.json
@@ -2,9 +2,10 @@
 	"path": "upi/gcp/xpn/upi-gcp-xpn-workflow.yaml",
 	"owners": {
 		"approvers": [
-			"abhinavdahiya",
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/install/aws/OWNERS b/ci-operator/step-registry/upi/install/aws/OWNERS
index 0fff929df92e3..526f5433a3ae3 100644
--- a/ci-operator/step-registry/upi/install/aws/OWNERS
+++ b/ci-operator/step-registry/upi/install/aws/OWNERS
@@ -4,3 +4,5 @@ approvers:
 - patrickdillon
 - jhixson74
 - jstuever
+- jianlinliu
+- yunjiang29
diff --git a/ci-operator/step-registry/upi/install/aws/cluster/upi-install-aws-cluster-ref.metadata.json b/ci-operator/step-registry/upi/install/aws/cluster/upi-install-aws-cluster-ref.metadata.json
index c4d775bbf6d4f..d1fbf4b7a0cbf 100644
--- a/ci-operator/step-registry/upi/install/aws/cluster/upi-install-aws-cluster-ref.metadata.json
+++ b/ci-operator/step-registry/upi/install/aws/cluster/upi-install-aws-cluster-ref.metadata.json
@@ -6,7 +6,9 @@
 			"rna-afk",
 			"patrickdillon",
 			"jhixson74",
-			"jstuever"
+			"jstuever",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/install/aws/upi-install-aws-chain.metadata.json b/ci-operator/step-registry/upi/install/aws/upi-install-aws-chain.metadata.json
index ed197a1e707c9..04db7f6ff0b1c 100644
--- a/ci-operator/step-registry/upi/install/aws/upi-install-aws-chain.metadata.json
+++ b/ci-operator/step-registry/upi/install/aws/upi-install-aws-chain.metadata.json
@@ -6,7 +6,9 @@
 			"rna-afk",
 			"patrickdillon",
 			"jhixson74",
-			"jstuever"
+			"jstuever",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/install/azure/OWNERS b/ci-operator/step-registry/upi/install/azure/OWNERS
index 0fff929df92e3..526f5433a3ae3 100644
--- a/ci-operator/step-registry/upi/install/azure/OWNERS
+++ b/ci-operator/step-registry/upi/install/azure/OWNERS
@@ -4,3 +4,5 @@ approvers:
 - patrickdillon
 - jhixson74
 - jstuever
+- jianlinliu
+- yunjiang29
diff --git a/ci-operator/step-registry/upi/install/azure/upi-install-azure-ref.metadata.json b/ci-operator/step-registry/upi/install/azure/upi-install-azure-ref.metadata.json
index be78bac72b033..f46a503fa837c 100644
--- a/ci-operator/step-registry/upi/install/azure/upi-install-azure-ref.metadata.json
+++ b/ci-operator/step-registry/upi/install/azure/upi-install-azure-ref.metadata.json
@@ -6,7 +6,9 @@
 			"rna-afk",
 			"patrickdillon",
 			"jhixson74",
-			"jstuever"
+			"jstuever",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/upi/install/gcp/OWNERS b/ci-operator/step-registry/upi/install/gcp/OWNERS
index fab16a7e921cd..b43e265490f08 100644
--- a/ci-operator/step-registry/upi/install/gcp/OWNERS
+++ b/ci-operator/step-registry/upi/install/gcp/OWNERS
@@ -1,3 +1,5 @@
 approvers:
 - jstuever
 - patrickdillon
+- jianlinliu
+- yunjiang29
diff --git a/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-ref.metadata.json b/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-ref.metadata.json
index 84c4f0afbe27a..b6ffb4f7178e0 100644
--- a/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-ref.metadata.json
+++ b/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-ref.metadata.json
@@ -3,7 +3,9 @@
 	"owners": {
 		"approvers": [
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/workers-rhel/OWNERS b/ci-operator/step-registry/workers-rhel/OWNERS
index fab16a7e921cd..b43e265490f08 100644
--- a/ci-operator/step-registry/workers-rhel/OWNERS
+++ b/ci-operator/step-registry/workers-rhel/OWNERS
@@ -1,3 +1,5 @@
 approvers:
 - jstuever
 - patrickdillon
+- jianlinliu
+- yunjiang29
diff --git a/ci-operator/step-registry/workers-rhel/aws-provision/workers-rhel-aws-provision-ref.metadata.json b/ci-operator/step-registry/workers-rhel/aws-provision/workers-rhel-aws-provision-ref.metadata.json
index 6f562418562b3..d4a624993a494 100644
--- a/ci-operator/step-registry/workers-rhel/aws-provision/workers-rhel-aws-provision-ref.metadata.json
+++ b/ci-operator/step-registry/workers-rhel/aws-provision/workers-rhel-aws-provision-ref.metadata.json
@@ -3,7 +3,9 @@
 	"owners": {
 		"approvers": [
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/workers-rhel/azure-provision/workers-rhel-azure-provision-commands.sh b/ci-operator/step-registry/workers-rhel/azure-provision/workers-rhel-azure-provision-commands.sh
index 4f9cc3d0a27d0..199d059a2b00a 100755
--- a/ci-operator/step-registry/workers-rhel/azure-provision/workers-rhel-azure-provision-commands.sh
+++ b/ci-operator/step-registry/workers-rhel/azure-provision/workers-rhel-azure-provision-commands.sh
@@ -4,9 +4,6 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 export KUBECONFIG=${SHARED_DIR}/kubeconfig
 
 AZURE_AUTH_LOCATION="${CLUSTER_PROFILE_DIR}/osServicePrincipal.json"
@@ -33,8 +30,8 @@ echo "${vnet_RG}"
 # Get existing vnet info
 if [ -f "${SHARED_DIR}/customer_vnet_subnets.yaml" ]; then
   VNET_FILE="${SHARED_DIR}/customer_vnet_subnets.yaml"
-  vnet_name=$(/tmp/yq r ${VNET_FILE} 'platform.azure.virtualNetwork')
-  computeSubnet=$(/tmp/yq r ${VNET_FILE} 'platform.azure.computeSubnet')
+  vnet_name=$(yq-go r ${VNET_FILE} 'platform.azure.virtualNetwork')
+  computeSubnet=$(yq-go r ${VNET_FILE} 'platform.azure.computeSubnet')
 fi
 
 # Get computeSubnet ID
diff --git a/ci-operator/step-registry/workers-rhel/azure-provision/workers-rhel-azure-provision-ref.yaml b/ci-operator/step-registry/workers-rhel/azure-provision/workers-rhel-azure-provision-ref.yaml
index d691693a24b31..c6720244959f0 100644
--- a/ci-operator/step-registry/workers-rhel/azure-provision/workers-rhel-azure-provision-ref.yaml
+++ b/ci-operator/step-registry/workers-rhel/azure-provision/workers-rhel-azure-provision-ref.yaml
@@ -1,6 +1,9 @@
 ref:
   as: workers-rhel-azure-provision
-  from: upi-installer
+  from_image:
+    namespace: ocp
+    name: "4.12"
+    tag: upi-installer
   commands: workers-rhel-azure-provision-commands.sh
   resources:
     requests:
diff --git a/ci-operator/step-registry/workers-rhel/gcp-provision/workers-rhel-gcp-provision-commands.sh b/ci-operator/step-registry/workers-rhel/gcp-provision/workers-rhel-gcp-provision-commands.sh
index dd234f5b9204b..01cc9c1498f62 100755
--- a/ci-operator/step-registry/workers-rhel/gcp-provision/workers-rhel-gcp-provision-commands.sh
+++ b/ci-operator/step-registry/workers-rhel/gcp-provision/workers-rhel-gcp-provision-commands.sh
@@ -4,9 +4,6 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-# TODO: move to image
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 export KUBECONFIG=${SHARED_DIR}/kubeconfig
 
 GOOGLE_PROJECT_ID="$(< ${CLUSTER_PROFILE_DIR}/openshift_gcp_project)"
@@ -27,8 +24,8 @@ export SSH_PUB_KEY_PATH=${CLUSTER_PROFILE_DIR}/ssh-publickey
 infra_id=$(oc get -o jsonpath='{.status.infrastructureName}{"\n"}' infrastructure cluster)
 
 VPC_CONFIG="${SHARED_DIR}/customer_vpc_subnets.yaml"
-NETWORK=$(/tmp/yq r "${VPC_CONFIG}" 'platform.gcp.network')
-COMPUTE_SUBNET=$(/tmp/yq r "${VPC_CONFIG}" 'platform.gcp.computeSubnet')
+NETWORK=$(yq-go r "${VPC_CONFIG}" 'platform.gcp.network')
+COMPUTE_SUBNET=$(yq-go r "${VPC_CONFIG}" 'platform.gcp.computeSubnet')
 if [[ -z "${NETWORK}" || -z "${COMPUTE_SUBNET}" ]]; then
   echo "Could not find VPC network or compute subnet." && exit 1
 fi
diff --git a/ci-operator/step-registry/workers-rhel/gcp-provision/workers-rhel-gcp-provision-ref.yaml b/ci-operator/step-registry/workers-rhel/gcp-provision/workers-rhel-gcp-provision-ref.yaml
index f28756152f9f4..d879b89654982 100644
--- a/ci-operator/step-registry/workers-rhel/gcp-provision/workers-rhel-gcp-provision-ref.yaml
+++ b/ci-operator/step-registry/workers-rhel/gcp-provision/workers-rhel-gcp-provision-ref.yaml
@@ -1,6 +1,9 @@
 ref:
   as: workers-rhel-gcp-provision
-  from: upi-installer
+  from_image:
+    namespace: ocp
+    name: "4.12"
+    tag: upi-installer
   commands: workers-rhel-gcp-provision-commands.sh
   resources:
     requests:
diff --git a/ci-operator/step-registry/workers-rhel/repos/workers-rhel-repos-commands.sh b/ci-operator/step-registry/workers-rhel/repos/workers-rhel-repos-commands.sh
index a6991505576b9..481f91d55f7e3 100644
--- a/ci-operator/step-registry/workers-rhel/repos/workers-rhel-repos-commands.sh
+++ b/ci-operator/step-registry/workers-rhel/repos/workers-rhel-repos-commands.sh
@@ -21,10 +21,6 @@ if ! whoami &> /dev/null; then
     fi
 fi
 
-# Install an updated version of the client
-mkdir -p /tmp/client
-curl https://mirror2.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz | tar --directory=/tmp/client -xzf -
-PATH=/tmp/client:$PATH
 oc version --client
 
 MIRROR_USERNAME="$(<'/var/run/mirror-repo-basic-auth/username')"
diff --git a/ci-operator/step-registry/workers-rhel/repos/workers-rhel-repos-ref.metadata.json b/ci-operator/step-registry/workers-rhel/repos/workers-rhel-repos-ref.metadata.json
index 53a93bdf4553a..49fea86a08b0f 100644
--- a/ci-operator/step-registry/workers-rhel/repos/workers-rhel-repos-ref.metadata.json
+++ b/ci-operator/step-registry/workers-rhel/repos/workers-rhel-repos-ref.metadata.json
@@ -3,7 +3,9 @@
 	"owners": {
 		"approvers": [
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/workers-rhel/repos/workers-rhel-repos-ref.yaml b/ci-operator/step-registry/workers-rhel/repos/workers-rhel-repos-ref.yaml
index d637c407965bd..c344eceb220ce 100644
--- a/ci-operator/step-registry/workers-rhel/repos/workers-rhel-repos-ref.yaml
+++ b/ci-operator/step-registry/workers-rhel/repos/workers-rhel-repos-ref.yaml
@@ -1,6 +1,7 @@
 ref:
   as: workers-rhel-repos
   from: ansible
+  cli: latest
   commands: workers-rhel-repos-commands.sh
   resources:
     requests:
diff --git a/ci-operator/step-registry/workers-rhel/scaleup/workers-rhel-scaleup-commands.sh b/ci-operator/step-registry/workers-rhel/scaleup/workers-rhel-scaleup-commands.sh
index b6565d00c30f0..e89ea46723313 100644
--- a/ci-operator/step-registry/workers-rhel/scaleup/workers-rhel-scaleup-commands.sh
+++ b/ci-operator/step-registry/workers-rhel/scaleup/workers-rhel-scaleup-commands.sh
@@ -16,10 +16,6 @@ if ! whoami &> /dev/null; then
     fi
 fi
 
-# Install an updated version of the client
-mkdir -p /tmp/client
-curl -L --fail https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz | tar --directory=/tmp/client -xzf -
-PATH=/tmp/client:$PATH
 oc version --client
 
 if [ -f "${SHARED_DIR}/proxy-conf.sh" ] ; then
diff --git a/ci-operator/step-registry/workers-rhel/scaleup/workers-rhel-scaleup-ref.metadata.json b/ci-operator/step-registry/workers-rhel/scaleup/workers-rhel-scaleup-ref.metadata.json
index b4b2799545d12..cde2a82fc19d4 100644
--- a/ci-operator/step-registry/workers-rhel/scaleup/workers-rhel-scaleup-ref.metadata.json
+++ b/ci-operator/step-registry/workers-rhel/scaleup/workers-rhel-scaleup-ref.metadata.json
@@ -3,7 +3,9 @@
 	"owners": {
 		"approvers": [
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/workers-rhel/scaleup/workers-rhel-scaleup-ref.yaml b/ci-operator/step-registry/workers-rhel/scaleup/workers-rhel-scaleup-ref.yaml
index c209a48fb8007..0dc2c28554b3e 100644
--- a/ci-operator/step-registry/workers-rhel/scaleup/workers-rhel-scaleup-ref.yaml
+++ b/ci-operator/step-registry/workers-rhel/scaleup/workers-rhel-scaleup-ref.yaml
@@ -1,6 +1,7 @@
 ref:
   as: workers-rhel-scaleup
   from: ansible
+  cli: latest
   commands: workers-rhel-scaleup-commands.sh
   resources:
     requests:
diff --git a/ci-operator/step-registry/workers-rhel/workers-rhel-chain.metadata.json b/ci-operator/step-registry/workers-rhel/workers-rhel-chain.metadata.json
index ea2debd8c3cc4..3f6d32fa4ee60 100644
--- a/ci-operator/step-registry/workers-rhel/workers-rhel-chain.metadata.json
+++ b/ci-operator/step-registry/workers-rhel/workers-rhel-chain.metadata.json
@@ -3,7 +3,9 @@
 	"owners": {
 		"approvers": [
 			"jstuever",
-			"patrickdillon"
+			"patrickdillon",
+			"jianlinliu",
+			"yunjiang29"
 		]
 	}
 }
\ No newline at end of file