From 1657ccf6f51bfffef9ea5669429f4d77f3740384 Mon Sep 17 00:00:00 2001
From: Zhaohua Sun <zhsun@redhat.com>
Date: Wed, 28 May 2025 17:52:02 +0800
Subject: [PATCH] update cluster infra tests-private test image tags

---
 .../openshift-priv-cloud-provider-gcp-main.yaml               | 2 +-
 .../openshift-priv-cloud-provider-gcp-release-4.18.yaml       | 2 +-
 .../openshift-priv-cloud-provider-gcp-release-4.19.yaml       | 2 +-
 .../openshift-priv-cloud-provider-gcp-release-4.20.yaml       | 2 +-
 .../openshift-priv-cloud-provider-gcp-release-4.21.yaml       | 2 +-
 .../openshift-priv-cloud-provider-vsphere-main.yaml           | 2 +-
 .../openshift-priv-cloud-provider-vsphere-release-4.17.yaml   | 2 +-
 .../openshift-priv-cloud-provider-vsphere-release-4.18.yaml   | 2 +-
 .../openshift-priv-cloud-provider-vsphere-release-4.19.yaml   | 2 +-
 .../openshift-priv-cloud-provider-vsphere-release-4.20.yaml   | 2 +-
 .../openshift-priv-cloud-provider-vsphere-release-4.21.yaml   | 2 +-
 .../openshift-priv-cluster-api-provider-aws-main.yaml         | 2 +-
 .../openshift-priv-cluster-api-provider-aws-release-4.17.yaml | 2 +-
 .../openshift-priv-cluster-api-provider-aws-release-4.18.yaml | 2 +-
 .../openshift-priv-cluster-api-provider-aws-release-4.19.yaml | 4 ++--
 .../openshift-priv-cluster-api-provider-aws-release-4.20.yaml | 4 ++--
 .../openshift-priv-cluster-api-provider-aws-release-4.21.yaml | 2 +-
 .../openshift-priv-cluster-api-provider-azure-master.yaml     | 2 +-
 ...penshift-priv-cluster-api-provider-azure-release-4.19.yaml | 4 ++--
 ...penshift-priv-cluster-api-provider-azure-release-4.20.yaml | 4 ++--
 ...penshift-priv-cluster-api-provider-azure-release-4.21.yaml | 2 +-
 .../openshift-priv-cluster-api-provider-gcp-master.yaml       | 2 +-
 .../openshift-priv-cluster-api-provider-gcp-release-4.17.yaml | 2 +-
 .../openshift-priv-cluster-api-provider-gcp-release-4.18.yaml | 2 +-
 .../openshift-priv-cluster-api-provider-gcp-release-4.19.yaml | 4 ++--
 .../openshift-priv-cluster-api-provider-gcp-release-4.20.yaml | 4 ++--
 .../openshift-priv-cluster-api-provider-gcp-release-4.21.yaml | 2 +-
 .../openshift-priv-cluster-api-provider-vsphere-master.yaml   | 2 +-
 ...nshift-priv-cluster-api-provider-vsphere-release-4.17.yaml | 2 +-
 ...nshift-priv-cluster-api-provider-vsphere-release-4.18.yaml | 2 +-
 ...nshift-priv-cluster-api-provider-vsphere-release-4.19.yaml | 2 +-
 ...nshift-priv-cluster-api-provider-vsphere-release-4.20.yaml | 2 +-
 ...nshift-priv-cluster-api-provider-vsphere-release-4.21.yaml | 2 +-
 .../cluster-api/openshift-priv-cluster-api-master.yaml        | 2 +-
 .../cluster-api/openshift-priv-cluster-api-release-4.18.yaml  | 2 +-
 .../cluster-api/openshift-priv-cluster-api-release-4.19.yaml  | 2 +-
 .../cluster-api/openshift-priv-cluster-api-release-4.20.yaml  | 2 +-
 .../cluster-api/openshift-priv-cluster-api-release-4.21.yaml  | 2 +-
 .../openshift-priv-cluster-autoscaler-operator-main.yaml      | 2 +-
 ...enshift-priv-cluster-autoscaler-operator-release-4.19.yaml | 2 +-
 ...enshift-priv-cluster-autoscaler-operator-release-4.20.yaml | 2 +-
 ...enshift-priv-cluster-autoscaler-operator-release-4.21.yaml | 2 +-
 .../openshift-priv-cluster-capi-operator-main.yaml            | 2 +-
 .../openshift-priv-cluster-capi-operator-release-4.18.yaml    | 2 +-
 .../openshift-priv-cluster-capi-operator-release-4.19.yaml    | 2 +-
 .../openshift-priv-cluster-capi-operator-release-4.20.yaml    | 2 +-
 .../openshift-priv-cluster-capi-operator-release-4.21.yaml    | 2 +-
 ...-priv-cluster-control-plane-machine-set-operator-main.yaml | 2 +-
 ...uster-control-plane-machine-set-operator-release-4.18.yaml | 2 +-
 ...uster-control-plane-machine-set-operator-release-4.19.yaml | 2 +-
 ...uster-control-plane-machine-set-operator-release-4.20.yaml | 2 +-
 ...uster-control-plane-machine-set-operator-release-4.21.yaml | 2 +-
 .../openshift-priv-kubernetes-autoscaler-main.yaml            | 2 +-
 .../openshift-priv-kubernetes-autoscaler-release-4.19.yaml    | 2 +-
 .../openshift-priv-kubernetes-autoscaler-release-4.20.yaml    | 2 +-
 .../openshift-priv-kubernetes-autoscaler-release-4.21.yaml    | 2 +-
 .../openshift-priv-machine-api-operator-main.yaml             | 2 +-
 .../openshift-priv-machine-api-operator-release-4.18.yaml     | 2 +-
 .../openshift-priv-machine-api-operator-release-4.19.yaml     | 4 ++--
 .../openshift-priv-machine-api-operator-release-4.20.yaml     | 4 ++--
 .../openshift-priv-machine-api-operator-release-4.21.yaml     | 2 +-
 .../openshift-priv-machine-api-provider-aws-main.yaml         | 2 +-
 .../openshift-priv-machine-api-provider-aws-release-4.19.yaml | 4 ++--
 .../openshift-priv-machine-api-provider-aws-release-4.20.yaml | 4 ++--
 .../openshift-priv-machine-api-provider-aws-release-4.21.yaml | 2 +-
 .../openshift-priv-machine-api-provider-azure-main.yaml       | 2 +-
 ...penshift-priv-machine-api-provider-azure-release-4.19.yaml | 4 ++--
 ...penshift-priv-machine-api-provider-azure-release-4.20.yaml | 4 ++--
 ...penshift-priv-machine-api-provider-azure-release-4.21.yaml | 2 +-
 .../openshift-priv-machine-api-provider-gcp-main.yaml         | 2 +-
 .../openshift-priv-machine-api-provider-gcp-release-4.17.yaml | 2 +-
 .../openshift-priv-machine-api-provider-gcp-release-4.18.yaml | 2 +-
 .../openshift-priv-machine-api-provider-gcp-release-4.19.yaml | 4 ++--
 .../openshift-priv-machine-api-provider-gcp-release-4.20.yaml | 4 ++--
 .../openshift-priv-machine-api-provider-gcp-release-4.21.yaml | 2 +-
 .../openshift-priv-machine-api-provider-ibmcloud-main.yaml    | 2 +-
 ...shift-priv-machine-api-provider-ibmcloud-release-4.19.yaml | 4 ++--
 ...shift-priv-machine-api-provider-ibmcloud-release-4.20.yaml | 4 ++--
 ...shift-priv-machine-api-provider-ibmcloud-release-4.21.yaml | 2 +-
 .../openshift-priv-machine-api-provider-nutanix-main.yaml     | 2 +-
 ...nshift-priv-machine-api-provider-nutanix-release-4.19.yaml | 4 ++--
 ...nshift-priv-machine-api-provider-nutanix-release-4.20.yaml | 4 ++--
 ...nshift-priv-machine-api-provider-nutanix-release-4.21.yaml | 2 +-
 .../cloud-provider-gcp/openshift-cloud-provider-gcp-main.yaml | 2 +-
 .../openshift-cloud-provider-gcp-release-4.18.yaml            | 2 +-
 .../openshift-cloud-provider-gcp-release-4.19.yaml            | 2 +-
 .../openshift-cloud-provider-gcp-release-4.20.yaml            | 2 +-
 .../openshift-cloud-provider-gcp-release-4.21.yaml            | 2 +-
 .../openshift-cloud-provider-vsphere-main.yaml                | 2 +-
 .../openshift-cloud-provider-vsphere-release-4.17.yaml        | 2 +-
 .../openshift-cloud-provider-vsphere-release-4.18.yaml        | 2 +-
 .../openshift-cloud-provider-vsphere-release-4.19.yaml        | 2 +-
 .../openshift-cloud-provider-vsphere-release-4.20.yaml        | 2 +-
 .../openshift-cloud-provider-vsphere-release-4.21.yaml        | 2 +-
 .../openshift-cluster-api-provider-aws-main.yaml              | 2 +-
 .../openshift-cluster-api-provider-aws-release-4.17.yaml      | 2 +-
 .../openshift-cluster-api-provider-aws-release-4.18.yaml      | 2 +-
 .../openshift-cluster-api-provider-aws-release-4.19.yaml      | 4 ++--
 .../openshift-cluster-api-provider-aws-release-4.20.yaml      | 4 ++--
 .../openshift-cluster-api-provider-aws-release-4.21.yaml      | 2 +-
 .../openshift-cluster-api-provider-azure-master.yaml          | 2 +-
 .../openshift-cluster-api-provider-azure-release-4.19.yaml    | 4 ++--
 .../openshift-cluster-api-provider-azure-release-4.20.yaml    | 4 ++--
 .../openshift-cluster-api-provider-azure-release-4.21.yaml    | 2 +-
 .../openshift-cluster-api-provider-gcp-master.yaml            | 2 +-
 .../openshift-cluster-api-provider-gcp-release-4.17.yaml      | 2 +-
 .../openshift-cluster-api-provider-gcp-release-4.18.yaml      | 2 +-
 .../openshift-cluster-api-provider-gcp-release-4.19.yaml      | 4 ++--
 .../openshift-cluster-api-provider-gcp-release-4.20.yaml      | 4 ++--
 .../openshift-cluster-api-provider-gcp-release-4.21.yaml      | 2 +-
 .../openshift-cluster-api-provider-vsphere-master.yaml        | 2 +-
 .../openshift-cluster-api-provider-vsphere-release-4.17.yaml  | 2 +-
 .../openshift-cluster-api-provider-vsphere-release-4.18.yaml  | 2 +-
 .../openshift-cluster-api-provider-vsphere-release-4.19.yaml  | 2 +-
 .../openshift-cluster-api-provider-vsphere-release-4.20.yaml  | 2 +-
 .../openshift-cluster-api-provider-vsphere-release-4.21.yaml  | 2 +-
 .../openshift/cluster-api/openshift-cluster-api-master.yaml   | 2 +-
 .../cluster-api/openshift-cluster-api-release-4.18.yaml       | 2 +-
 .../cluster-api/openshift-cluster-api-release-4.19.yaml       | 2 +-
 .../cluster-api/openshift-cluster-api-release-4.20.yaml       | 2 +-
 .../cluster-api/openshift-cluster-api-release-4.21.yaml       | 2 +-
 .../openshift-cluster-autoscaler-operator-main.yaml           | 2 +-
 .../openshift-cluster-autoscaler-operator-release-4.19.yaml   | 2 +-
 .../openshift-cluster-autoscaler-operator-release-4.20.yaml   | 2 +-
 .../openshift-cluster-autoscaler-operator-release-4.21.yaml   | 2 +-
 .../openshift-cluster-capi-operator-main.yaml                 | 2 +-
 .../openshift-cluster-capi-operator-release-4.18.yaml         | 2 +-
 .../openshift-cluster-capi-operator-release-4.19.yaml         | 2 +-
 .../openshift-cluster-capi-operator-release-4.20.yaml         | 2 +-
 .../openshift-cluster-capi-operator-release-4.21.yaml         | 2 +-
 ...shift-cluster-control-plane-machine-set-operator-main.yaml | 2 +-
 ...uster-control-plane-machine-set-operator-release-4.18.yaml | 2 +-
 ...uster-control-plane-machine-set-operator-release-4.19.yaml | 2 +-
 ...uster-control-plane-machine-set-operator-release-4.20.yaml | 2 +-
 ...uster-control-plane-machine-set-operator-release-4.21.yaml | 2 +-
 .../openshift-kubernetes-autoscaler-main.yaml                 | 2 +-
 .../openshift-kubernetes-autoscaler-release-4.19.yaml         | 2 +-
 .../openshift-kubernetes-autoscaler-release-4.20.yaml         | 2 +-
 .../openshift-kubernetes-autoscaler-release-4.21.yaml         | 2 +-
 .../openshift-machine-api-operator-main.yaml                  | 2 +-
 .../openshift-machine-api-operator-release-4.18.yaml          | 2 +-
 .../openshift-machine-api-operator-release-4.19.yaml          | 4 ++--
 .../openshift-machine-api-operator-release-4.20.yaml          | 4 ++--
 .../openshift-machine-api-operator-release-4.21.yaml          | 2 +-
 .../openshift-machine-api-provider-aws-main.yaml              | 2 +-
 .../openshift-machine-api-provider-aws-release-4.19.yaml      | 4 ++--
 .../openshift-machine-api-provider-aws-release-4.20.yaml      | 4 ++--
 .../openshift-machine-api-provider-aws-release-4.21.yaml      | 2 +-
 .../openshift-machine-api-provider-azure-main.yaml            | 2 +-
 .../openshift-machine-api-provider-azure-release-4.19.yaml    | 4 ++--
 .../openshift-machine-api-provider-azure-release-4.20.yaml    | 4 ++--
 .../openshift-machine-api-provider-azure-release-4.21.yaml    | 2 +-
 .../openshift-machine-api-provider-gcp-main.yaml              | 2 +-
 .../openshift-machine-api-provider-gcp-release-4.17.yaml      | 2 +-
 .../openshift-machine-api-provider-gcp-release-4.18.yaml      | 2 +-
 .../openshift-machine-api-provider-gcp-release-4.19.yaml      | 4 ++--
 .../openshift-machine-api-provider-gcp-release-4.20.yaml      | 4 ++--
 .../openshift-machine-api-provider-gcp-release-4.21.yaml      | 2 +-
 .../openshift-machine-api-provider-ibmcloud-main.yaml         | 2 +-
 .../openshift-machine-api-provider-ibmcloud-release-4.19.yaml | 4 ++--
 .../openshift-machine-api-provider-ibmcloud-release-4.20.yaml | 4 ++--
 .../openshift-machine-api-provider-ibmcloud-release-4.21.yaml | 2 +-
 .../openshift-machine-api-provider-nutanix-main.yaml          | 2 +-
 .../openshift-machine-api-provider-nutanix-release-4.19.yaml  | 4 ++--
 .../openshift-machine-api-provider-nutanix-release-4.20.yaml  | 4 ++--
 .../openshift-machine-api-provider-nutanix-release-4.21.yaml  | 2 +-
 166 files changed, 202 insertions(+), 202 deletions(-)

diff --git a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-main.yaml b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-main.yaml
index 9049217a02bb8..fd646358573ff 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-main.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-main.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.18.yaml b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.18.yaml
index 7452d09a0a1db..f4a325a8570b5 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.18.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.18.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.18"
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.19.yaml b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.19.yaml
index 4292c25e6eb60..969a1d4ead30c 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.19.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.20.yaml b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.20.yaml
index 7e0709f34472a..b93f57d698414 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.20.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.21.yaml b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.21.yaml
index dadfaf18722cc..26b22d9289b7a 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.21.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-main.yaml b/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-main.yaml
index d7bb5c972e0b3..14cd998e452c7 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-main.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-main.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: make binaries
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.17.yaml b/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.17.yaml
index 81737539aac12..cb4c6558d1c92 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.17.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.17.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.17"
 binary_build_commands: make binaries
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.18.yaml b/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.18.yaml
index c53321b414662..df5afbeaf0df6 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.18.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.18.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.18"
 binary_build_commands: make binaries
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.19.yaml b/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.19.yaml
index 43035fe20e56b..76b5ac97f13fb 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.19.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.19"
 binary_build_commands: make binaries
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.20.yaml b/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.20.yaml
index 04efb7d31359e..c5d6f4137e51f 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.20.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: make binaries
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.21.yaml b/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.21.yaml
index 8285e347c2668..227480606ec2b 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: make binaries
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-main.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-main.yaml
index ba5dd119e309f..cf7ca297a01d3 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-main.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-main.yaml
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.17.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.17.yaml
index e78d3ea315b2a..02572f1c1d19b 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.17.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.17.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.17"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.18.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.18.yaml
index 058c0ccdd0fe9..32db8392f7848 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.18.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.18.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.18"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.19.yaml
index e670405de8ffa..bb5c589f27745 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   commitchecker:
     name: commitchecker
     namespace: ci
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.20.yaml
index 7dfed3bbdd3ae..6e8d2e3dbae4b 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   commitchecker:
     name: commitchecker
     namespace: ci
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.21.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.21.yaml
index 4b5728bf502ee..4b0b79ed8df08 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.21.yaml
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-master.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-master.yaml
index 06914dd5a2450..a127702cd3629 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-master.yaml
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.19.yaml
index c9eb42281f67e..5a4e89999f95f 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   commitchecker:
     name: commitchecker
     namespace: ci
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.20.yaml
index a92ef9649a7b8..29b645d4c7ba3 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   commitchecker:
     name: commitchecker
     namespace: ci
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.21.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.21.yaml
index a6fca1dfd9093..86530e9e9929d 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.21.yaml
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-master.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-master.yaml
index f108c13ca9c89..984e853e2c9a3 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-master.yaml
@@ -18,7 +18,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.17.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.17.yaml
index f85ae9139ad1d..432389a334342 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.17.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.17.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.17"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.18.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.18.yaml
index 4c4b8ec706431..66e4c70d6530b 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.18.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.18.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.18"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.19.yaml
index d899e8fc3c5c5..44d150a66fe59 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   commitchecker:
     name: commitchecker
     namespace: ci
@@ -18,7 +18,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.20.yaml
index 06b85247591f3..96d8d5e23c5ac 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   commitchecker:
     name: commitchecker
     namespace: ci
@@ -18,7 +18,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.21.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.21.yaml
index 48c4f8c978e99..a32fb8ecf93e3 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-gcp/openshift-priv-cluster-api-provider-gcp-release-4.21.yaml
@@ -18,7 +18,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-master.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-master.yaml
index b50e06010b51a..54f30ce4e60a9 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-master.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: go build -o cluster-api-provider-vsphere main.go
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.17.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.17.yaml
index a3d9d3e4a93b2..58063ba1efc94 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.17.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.17.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.17"
 binary_build_commands: go build -o cluster-api-provider-vsphere main.go
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.18.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.18.yaml
index 0792c04ac577d..d7d35e9259a6e 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.18.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.18.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.18"
 binary_build_commands: go build -o cluster-api-provider-vsphere main.go
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.19.yaml
index f457123c924cf..8300cbf321bd8 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.19.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.19"
 binary_build_commands: go build -o cluster-api-provider-vsphere main.go
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.20.yaml
index 13e16571cdf18..bf45ebc3a1d01 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.20.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: go build -o cluster-api-provider-vsphere main.go
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.21.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.21.yaml
index c3283e3b44b2a..419f17ec5723a 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: go build -o cluster-api-provider-vsphere main.go
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-master.yaml b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-master.yaml
index c5e6293640bc8..c4eafb82a93cd 100644
--- a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-master.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-master.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager-core
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.18.yaml b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.18.yaml
index 6743f45a322fd..b77cd2ed03df4 100644
--- a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.18.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.18.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.18"
 binary_build_commands: make manager-core
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.19.yaml
index c8eb2bba0d9ce..18ddee446e3fd 100644
--- a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.19.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: make manager-core
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.20.yaml
index 771d38f0e71f7..48ca27fe5667d 100644
--- a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.20.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager-core
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.21.yaml b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.21.yaml
index 27f2164b8fa0c..59a5c55bbbf73 100644
--- a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.21.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager-core
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-main.yaml b/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-main.yaml
index 675326e096ad7..1d09f14aff7e2 100644
--- a/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-main.yaml
+++ b/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-main.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.20"
 binary_build_commands: make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.19.yaml
index f885d47b913d2..7d1e33971372e 100644
--- a/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.19.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.19"
 binary_build_commands: make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.20.yaml
index 1fb3fc864bae2..b4de1180fce4b 100644
--- a/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.20.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.20"
 binary_build_commands: make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.21.yaml b/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.21.yaml
index daecb5add0149..abcff2a10b9c8 100644
--- a/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.21.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.20"
 binary_build_commands: make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-main.yaml b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-main.yaml
index 1448a73711af1..161d8ff742b3f 100644
--- a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-main.yaml
+++ b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-main.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: go build -o bin/cluster-capi-operator cmd/cluster-capi-operator
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.18.yaml b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.18.yaml
index c21bd32e6354c..1ed3a11a0de71 100644
--- a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.18.yaml
+++ b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.18.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.18"
 binary_build_commands: go build -o bin/cluster-capi-operator cmd/cluster-capi-operator
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.19.yaml
index bc70c8406f589..cf1555daec831 100644
--- a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.19.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: go build -o bin/cluster-capi-operator cmd/cluster-capi-operator
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.20.yaml
index c8c640a19035a..e0a2e70eb9250 100644
--- a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.20.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: go build -o bin/cluster-capi-operator cmd/cluster-capi-operator
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.21.yaml b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.21.yaml
index 0db8fe9f695bd..2ff2987c8ff9a 100644
--- a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: go build -o bin/cluster-capi-operator cmd/cluster-capi-operator
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main.yaml b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main.yaml
index bc81006eeeece..5a34faa2598a0 100644
--- a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main.yaml
+++ b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-main.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-control-plane-machine-set-operator
diff --git a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.18.yaml b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.18.yaml
index 0bca53cb25a2b..e3e3bfc8b8e20 100644
--- a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.18.yaml
+++ b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.18.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.18"
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-control-plane-machine-set-operator
diff --git a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.19.yaml
index 9585a9d9aeeaf..f585b23f0d665 100644
--- a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.19.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-control-plane-machine-set-operator
diff --git a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.20.yaml
index 491a977de46ed..efd473f7e5b23 100644
--- a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.20.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-control-plane-machine-set-operator
diff --git a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.21.yaml b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.21.yaml
index 4660da18f1f86..d7106919fe7c2 100644
--- a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.21.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-control-plane-machine-set-operator
diff --git a/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-main.yaml b/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-main.yaml
index 348a7b88527b6..7d6bafcfdf7c8 100644
--- a/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-main.yaml
+++ b/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-main.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.20"
 binary_build_commands: make build BUILD_TAGS=clusterapi
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.19.yaml b/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.19.yaml
index 25860891bf042..f9fd5a7922907 100644
--- a/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.19.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.19"
 binary_build_commands: make build BUILD_TAGS=clusterapi
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.20.yaml b/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.20.yaml
index a0370a9a80ac9..dc1dc860d276a 100644
--- a/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.20.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.20"
 binary_build_commands: make build BUILD_TAGS=clusterapi
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.21.yaml b/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.21.yaml
index b2e711d22baf3..183276f5158d2 100644
--- a/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.21.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.20"
 binary_build_commands: make build BUILD_TAGS=clusterapi
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-main.yaml b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-main.yaml
index 8a8e83c6d1a30..6f35216dcaa86 100644
--- a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-main.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-main.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.18.yaml b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.18.yaml
index 2d15c3f8e82e0..d3c4a675ace3a 100644
--- a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.18.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.18.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.18"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.19.yaml b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.19.yaml
index a940ed5174628..05f04089cf162 100644
--- a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   dev-scripts:
     name: test
     namespace: ocp-kni
@@ -18,7 +18,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.20.yaml b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.20.yaml
index 63d7d34ac3d65..603d649fb9f51 100644
--- a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   dev-scripts:
     name: test
     namespace: ocp-kni
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.21.yaml b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.21.yaml
index 4b1b61aa74511..af1b9837ee991 100644
--- a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.21.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-main.yaml b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-main.yaml
index 19a40de934c1f..8098188ca364a 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-main.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-main.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.19.yaml b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.19.yaml
index 4002aa5aa5a05..da0914ca6f630 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   ocp_4.19_base-rhel9:
     name: 4.19-priv
     namespace: ocp-private
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.20.yaml b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.20.yaml
index 1881b057bc6fa..f7e6def52f296 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   ocp_4.19_base-rhel9:
     name: 4.20-priv
     namespace: ocp-private
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.21.yaml b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.21.yaml
index dca36cd5cb367..6f8d511e504fe 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-main.yaml b/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-main.yaml
index 1f7bf606b4ec1..e440fa48beffa 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-main.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-main.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/machine-api-provider-azure
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.19.yaml b/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.19.yaml
index f54c0f82b6d16..9f112f713ec19 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   ocp_4.19_base-rhel9:
     name: 4.19-priv
     namespace: ocp-private
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/machine-api-provider-azure
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.20.yaml b/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.20.yaml
index 2fbd1c7652e58..7e8290612b816 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   ocp_4.19_base-rhel9:
     name: 4.20-priv
     namespace: ocp-private
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/machine-api-provider-azure
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.21.yaml b/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.21.yaml
index 4545dbc63f46a..1608679c2b02c 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/machine-api-provider-azure
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-main.yaml b/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-main.yaml
index c486a6f61d8b7..792d5a521f503 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-main.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-main.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.17.yaml b/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.17.yaml
index d1b74ccb087bc..f812345e1519a 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.17.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.17.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.17"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.18.yaml b/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.18.yaml
index 09a3d234c7d68..563a50550528c 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.18.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.18.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.18"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.19.yaml b/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.19.yaml
index 6beb07598d7c9..95c1804c66255 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   ocp_4.19_base-rhel9:
     name: 4.19-priv
     namespace: ocp-private
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.19"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.20.yaml b/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.20.yaml
index b395586c80d88..38a0bc0e8eaf1 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   ocp_4.19_base-rhel9:
     name: 4.20-priv
     namespace: ocp-private
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.21.yaml b/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.21.yaml
index 6259b12694d29..688484863b2b6 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-main.yaml b/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-main.yaml
index 9cb811e7e29f4..b092d9e638132 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-main.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-main.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.19.yaml b/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.19.yaml
index cfdc38d2dbf75..e45debfbe898c 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   ocp_4.19_base-rhel9:
     name: 4.19-priv
     namespace: ocp-private
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.20.yaml b/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.20.yaml
index cafb13ca45b4b..2067ae77cc12e 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   ocp_4.19_base-rhel9:
     name: 4.20-priv
     namespace: ocp-private
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.21.yaml b/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.21.yaml
index 34daf4c04a476..f52fa66010598 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-main.yaml b/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-main.yaml
index 6b2000948306d..b28a60b1a738a 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-main.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-main.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/machine-api-provider-nutanix
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.19.yaml b/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.19.yaml
index f4e385daf7635..3ad51f2e47458 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.19.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   ocp_4.19_base-rhel9:
     name: 4.19-priv
     namespace: ocp-private
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/machine-api-provider-nutanix
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.20.yaml b/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.20.yaml
index 2ef1907836211..4fa422fd0f225 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.20.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   ocp_4.19_base-rhel9:
     name: 4.20-priv
     namespace: ocp-private
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/machine-api-provider-nutanix
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.21.yaml b/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.21.yaml
index a8ee8db546a65..9de2ed8dacfde 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.21.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/machine-api-provider-nutanix
diff --git a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-main.yaml b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-main.yaml
index 24c478274fd93..8cbccb6fe05b6 100644
--- a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-main.yaml
+++ b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-main.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.18.yaml b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.18.yaml
index afdc851723a0b..8a0b4de6b1c65 100644
--- a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.18.yaml
+++ b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.18.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.18"
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.19.yaml b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.19.yaml
index 89a3254129407..a4d383cd101a8 100644
--- a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.19.yaml
+++ b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.19.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.20.yaml b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.20.yaml
index 77b9e0ba3d996..6e803d01f0368 100644
--- a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.20.yaml
+++ b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.20.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.21.yaml b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.21.yaml
index 4f437dbc5a253..90c8c29e875cf 100644
--- a/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.21.yaml
+++ b/ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.21.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: go build ./cmd/cloud-controller-manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-main.yaml b/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-main.yaml
index 8edb1dd813b9a..1ea753283da40 100644
--- a/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-main.yaml
+++ b/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-main.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: make binaries
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.17.yaml b/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.17.yaml
index 96ba21459f3f5..a6f8bed27208d 100644
--- a/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.17.yaml
+++ b/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.17.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.17"
 binary_build_commands: make binaries
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.18.yaml b/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.18.yaml
index 9e6ae9088c93a..d26de3edc24d9 100644
--- a/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.18.yaml
+++ b/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.18.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.18"
 binary_build_commands: make binaries
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.19.yaml b/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.19.yaml
index 18ae18e94c31e..a134f1228df3e 100644
--- a/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.19.yaml
+++ b/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.19.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.19"
 binary_build_commands: make binaries
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.20.yaml b/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.20.yaml
index 3d35f9e501068..0a46310942f4c 100644
--- a/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.20.yaml
+++ b/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.20.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: make binaries
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.21.yaml b/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.21.yaml
index 173b80c535f48..864fbb3632345 100644
--- a/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.21.yaml
+++ b/ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: make binaries
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main.yaml
index 87441b6ae5d9a..4908a58775fa7 100644
--- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main.yaml
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.17.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.17.yaml
index 15d4b98bc328e..f32790d213650 100644
--- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.17.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.17.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.17"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.18.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.18.yaml
index 96b6b299a770f..d50640859df49 100644
--- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.18.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.18.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.18"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.19.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.19.yaml
index 0a25708baa423..3c43ffed52260 100644
--- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.19.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   commitchecker:
     name: commitchecker
     namespace: ci
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.20.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.20.yaml
index 84d4e0620838e..2be028ce783f0 100644
--- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.20.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   commitchecker:
     name: commitchecker
     namespace: ci
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.21.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.21.yaml
index 05a085920cad3..7ca50f2c15a8c 100644
--- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.21.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-release-4.21.yaml
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-master.yaml b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-master.yaml
index a06c7946c0c6e..dbbd45e5fcf41 100644
--- a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-master.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-master.yaml
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.19.yaml b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.19.yaml
index 5c1e549aa3718..4046e284b347f 100644
--- a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.19.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   commitchecker:
     name: commitchecker
     namespace: ci
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.20.yaml b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.20.yaml
index f727a46ea90d9..6c2869bac4262 100644
--- a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.20.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   commitchecker:
     name: commitchecker
     namespace: ci
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.21.yaml b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.21.yaml
index a3b5eb34d3d01..ae6d4c554bcf8 100644
--- a/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.21.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.21.yaml
@@ -26,7 +26,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-master.yaml b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-master.yaml
index fafe7cd89f441..d236b0b00f42b 100644
--- a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-master.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-master.yaml
@@ -18,7 +18,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.17.yaml b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.17.yaml
index 70618bf2aa222..c053e9ee33db7 100644
--- a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.17.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.17.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.17"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.18.yaml b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.18.yaml
index efdf5aec9d43e..98bdfd2873681 100644
--- a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.18.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.18.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.18"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.19.yaml b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.19.yaml
index 33f57ed8f7738..84dd063e37a61 100644
--- a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.19.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   commitchecker:
     name: commitchecker
     namespace: ci
@@ -18,7 +18,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.20.yaml b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.20.yaml
index b8a98a04d0cb6..1e6c14a867881 100644
--- a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.20.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   commitchecker:
     name: commitchecker
     namespace: ci
@@ -18,7 +18,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.21.yaml b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.21.yaml
index 6cb211189ad40..9664e3c8a3421 100644
--- a/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.21.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.21.yaml
@@ -18,7 +18,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-master.yaml b/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-master.yaml
index 30776c703176d..90228f29094c3 100644
--- a/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-master.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-master.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: go build -o cluster-api-provider-vsphere main.go
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.17.yaml b/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.17.yaml
index b3bb3f6f90158..8d5d0ca94ac07 100644
--- a/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.17.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.17.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.17"
 binary_build_commands: go build -o cluster-api-provider-vsphere main.go
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.18.yaml b/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.18.yaml
index 09574443d5f3c..541b5dae8e68c 100644
--- a/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.18.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.18.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.18"
 binary_build_commands: go build -o cluster-api-provider-vsphere main.go
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.19.yaml b/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.19.yaml
index 3a2120171a5b1..93d929e66f2d0 100644
--- a/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.19.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.19.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.19"
 binary_build_commands: go build -o cluster-api-provider-vsphere main.go
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.20.yaml b/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.20.yaml
index 24c45150a703a..3b44eb7c9b2e0 100644
--- a/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.20.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.20.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: go build -o cluster-api-provider-vsphere main.go
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.21.yaml b/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.21.yaml
index 3dd57085a8908..a1617446ee9ba 100644
--- a/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.21.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-vsphere/openshift-cluster-api-provider-vsphere-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: go build -o cluster-api-provider-vsphere main.go
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml
index e810968c0c2bd..06172f5bec1c2 100644
--- a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml
+++ b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager-core
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.18.yaml b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.18.yaml
index 9aca095152975..36047631701b5 100644
--- a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.18.yaml
+++ b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.18.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.18"
 binary_build_commands: make manager-core
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.19.yaml b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.19.yaml
index a2185f00ce898..c4d3cfd303c30 100644
--- a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.19.yaml
+++ b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.19.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: make manager-core
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.20.yaml b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.20.yaml
index 2b89a383b4bce..c9f2623bfec19 100644
--- a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.20.yaml
+++ b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.20.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager-core
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.21.yaml b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.21.yaml
index 0bc08c1ad3b0f..2d9510eb468f2 100644
--- a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.21.yaml
+++ b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-release-4.21.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: make manager-core
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-main.yaml b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-main.yaml
index feacfcdb887f8..33f65f9349ce3 100644
--- a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-main.yaml
+++ b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-main.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.20"
 binary_build_commands: make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.19.yaml b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.19.yaml
index 9e965034f3874..ff6658c8543fe 100644
--- a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.19.yaml
+++ b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.19.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.19"
 binary_build_commands: make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.20.yaml b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.20.yaml
index 2b8b2a6b6e64e..78b50fe0a9571 100644
--- a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.20.yaml
+++ b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.20.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.20"
 binary_build_commands: make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.21.yaml b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.21.yaml
index a758296029a1b..b12efc7075deb 100644
--- a/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.21.yaml
+++ b/ci-operator/config/openshift/cluster-autoscaler-operator/openshift-cluster-autoscaler-operator-release-4.21.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.21"
 binary_build_commands: make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml
index 9d0b9d1e86673..8d5341aa7b299 100644
--- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml
+++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: go build -o bin/cluster-capi-operator cmd/cluster-capi-operator
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.18.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.18.yaml
index 9bf9f6eabba3d..d8f0956ce0d31 100644
--- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.18.yaml
+++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.18.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.18"
 binary_build_commands: go build -o bin/cluster-capi-operator cmd/cluster-capi-operator
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.19.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.19.yaml
index a47feb0464653..8866ecadf4054 100644
--- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.19.yaml
+++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.19.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: go build -o bin/cluster-capi-operator cmd/cluster-capi-operator
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.20.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.20.yaml
index eba126c4cf036..0933bbd290bc4 100644
--- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.20.yaml
+++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.20.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: go build -o bin/cluster-capi-operator cmd/cluster-capi-operator
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.21.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.21.yaml
index c45ee3746ada6..2f528fba00b6c 100644
--- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.21.yaml
+++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: go build -o bin/cluster-capi-operator cmd/cluster-capi-operator
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-main.yaml b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-main.yaml
index 6e7bc82b247b4..a19f5eab07cea 100644
--- a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-main.yaml
+++ b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-main.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 images:
diff --git a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.18.yaml b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.18.yaml
index e023baa018811..e0e29d2ca8379 100644
--- a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.18.yaml
+++ b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.18.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.18"
 build_root:
   from_repository: true
 images:
diff --git a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.19.yaml b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.19.yaml
index 20dd0cda1aff6..31b26f9dff5dc 100644
--- a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.19.yaml
+++ b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.19.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 build_root:
   from_repository: true
 images:
diff --git a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.20.yaml b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.20.yaml
index 373f6b43f2176..6872006f000d7 100644
--- a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.20.yaml
+++ b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.20.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 images:
diff --git a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.21.yaml b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.21.yaml
index 8687007f720ef..c904bb9fe1c07 100644
--- a/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.21.yaml
+++ b/ci-operator/config/openshift/cluster-control-plane-machine-set-operator/openshift-cluster-control-plane-machine-set-operator-release-4.21.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 images:
diff --git a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-main.yaml b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-main.yaml
index d7d8b06a60bad..0918cdd7c669c 100644
--- a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-main.yaml
+++ b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-main.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.20"
 binary_build_commands: make build BUILD_TAGS=clusterapi
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.19.yaml b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.19.yaml
index ebc1ad22a4518..a624a73b3790a 100644
--- a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.19.yaml
+++ b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.19.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.19"
 binary_build_commands: make build BUILD_TAGS=clusterapi
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.20.yaml b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.20.yaml
index 211a9801de363..94a1c0c51f77c 100644
--- a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.20.yaml
+++ b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.20.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.20"
 binary_build_commands: make build BUILD_TAGS=clusterapi
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.21.yaml b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.21.yaml
index fbe9f31157f0d..203ba21219add 100644
--- a/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.21.yaml
+++ b/ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-release-4.21.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.18"
+    tag: "4.20"
 binary_build_commands: make build BUILD_TAGS=clusterapi
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-main.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-main.yaml
index 4b02c82843ac2..349b55407d91d 100644
--- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-main.yaml
+++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-main.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.18.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.18.yaml
index 4abc3ef45c7d8..6f17fabca9d21 100644
--- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.18.yaml
+++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.18.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.18"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.19.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.19.yaml
index 2ce63228b73b6..2a57c30edf63a 100644
--- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.19.yaml
+++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   dev-scripts:
     name: test
     namespace: ocp-kni
@@ -18,7 +18,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.20.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.20.yaml
index 93d67493bb5b8..c84d3544ef9fd 100644
--- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.20.yaml
+++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   dev-scripts:
     name: test
     namespace: ocp-kni
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.21.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.21.yaml
index 883cd70181940..9b696731ef5d3 100644
--- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.21.yaml
+++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.21.yaml
@@ -22,7 +22,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-main.yaml b/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-main.yaml
index 6c416a41447b0..091938c13d983 100644
--- a/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-main.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-main.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.19.yaml b/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.19.yaml
index 2ace97434cab4..23b6caf91836e 100644
--- a/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.19.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   ocp_4.19_base-rhel9:
     name: "4.19"
     namespace: ocp
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.20.yaml b/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.20.yaml
index 9567ad3a4f6b1..253ba22bfbea1 100644
--- a/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.20.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   ocp_4.19_base-rhel9:
     name: "4.20"
     namespace: ocp
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.21.yaml b/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.21.yaml
index 4494eccfa2ae9..f649b3be09108 100644
--- a/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.21.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-main.yaml b/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-main.yaml
index 578d0994964d6..9278c92161ba2 100644
--- a/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-main.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-main.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 images:
diff --git a/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-release-4.19.yaml b/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-release-4.19.yaml
index b79476f15475e..234c64ef9d036 100644
--- a/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-release-4.19.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   ocp_4.19_base-rhel9:
     name: "4.19"
     namespace: ocp
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 build_root:
   from_repository: true
 images:
diff --git a/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-release-4.20.yaml b/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-release-4.20.yaml
index d5ea777e9c6d0..343497cef0265 100644
--- a/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-release-4.20.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   ocp_4.19_base-rhel9:
     name: "4.20"
     namespace: ocp
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 images:
diff --git a/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-release-4.21.yaml b/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-release-4.21.yaml
index a77d040849e97..d588925ea89ff 100644
--- a/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-release-4.21.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 images:
diff --git a/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-main.yaml b/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-main.yaml
index 714733a325026..cdc3c984611f0 100644
--- a/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-main.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-main.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.17.yaml b/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.17.yaml
index bdaa83e9b8e1a..fe66fa31dc449 100644
--- a/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.17.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.17.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.17"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.18.yaml b/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.18.yaml
index 067530913376a..12c980b64656e 100644
--- a/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.18.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.18.yaml
@@ -10,7 +10,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.18"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.19.yaml b/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.19.yaml
index 6250a8e639e5e..d0b8ed22dcc06 100644
--- a/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.19.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   ocp_4.19_base-rhel9:
     name: "4.19"
     namespace: ocp
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.19"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.20.yaml b/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.20.yaml
index 27006e09f5c1b..61548d44c91b9 100644
--- a/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.20.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   ocp_4.19_base-rhel9:
     name: "4.20"
     namespace: ocp
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.21.yaml b/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.21.yaml
index f001527d86ecf..11812cb11eb88 100644
--- a/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.21.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: "4.16"
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-main.yaml b/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-main.yaml
index b5333c1896eac..49423b0d96745 100644
--- a/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-main.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-main.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-release-4.19.yaml b/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-release-4.19.yaml
index bad80a7c8e60a..f7239bb2a08dc 100644
--- a/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-release-4.19.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   ocp_4.19_base-rhel9:
     name: "4.19"
     namespace: ocp
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-release-4.20.yaml b/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-release-4.20.yaml
index 37c1210919494..c4d754a7d13dd 100644
--- a/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-release-4.20.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   ocp_4.19_base-rhel9:
     name: "4.20"
     namespace: ocp
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-release-4.21.yaml b/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-release-4.21.yaml
index c1c05607c3fc0..5172a0bb1ef1d 100644
--- a/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-release-4.21.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 binary_build_commands: NO_DOCKER=1 make build
 build_root:
   from_repository: true
diff --git a/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main.yaml b/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main.yaml
index 99a2610a22091..1261983e3076b 100644
--- a/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 images:
diff --git a/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-release-4.19.yaml b/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-release-4.19.yaml
index 97659ac21acf3..299d298326910 100644
--- a/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-release-4.19.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-release-4.19.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.19"
   ocp_4.19_base-rhel9:
     name: "4.19"
     namespace: ocp
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.19"
 build_root:
   from_repository: true
 images:
diff --git a/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-release-4.20.yaml b/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-release-4.20.yaml
index fb6c9772c083d..b92fa8a4c137f 100644
--- a/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-release-4.20.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-release-4.20.yaml
@@ -2,7 +2,7 @@ base_images:
   cluster-api-actuator-pkg-test:
     name: cluster-api-actuator-pkg-test
     namespace: ci
-    tag: latest
+    tag: "4.20"
   ocp_4.19_base-rhel9:
     name: "4.20"
     namespace: ocp
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 images:
diff --git a/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-release-4.21.yaml b/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-release-4.21.yaml
index 6bdf00a1cc718..074cc6e1cc9da 100644
--- a/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-release-4.21.yaml
+++ b/ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-release-4.21.yaml
@@ -14,7 +14,7 @@ base_images:
   tests-private:
     name: tests-private
     namespace: ci
-    tag: latest
+    tag: "4.20"
 build_root:
   from_repository: true
 images: