diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var
index 8f5108c222..532a4ea0d7 100644
--- a/Makefile.version.aarch64.var
+++ b/Makefile.version.aarch64.var
@@ -1 +1 @@
-OCP_VERSION := 4.22.0-0.nightly-arm64-2026-03-17-075144
+OCP_VERSION := 4.22.0-0.nightly-arm64-2026-03-18-221724
diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var
index 6f0d9e5106..6032be78bc 100644
--- a/Makefile.version.x86_64.var
+++ b/Makefile.version.x86_64.var
@@ -1 +1 @@
-OCP_VERSION := 4.22.0-0.nightly-2026-03-17-104634
+OCP_VERSION := 4.22.0-0.nightly-2026-03-17-033403
diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml
index 2cb2a63cea..d32135f62b 100644
--- a/assets/components/multus/kustomization.aarch64.yaml
+++ b/assets/components/multus/kustomization.aarch64.yaml
@@ -2,7 +2,7 @@
 images:
   - name: multus-cni-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:50e5e48edb99e4c89d03c0edcfc58ffbc3081d2b5b189431b6d6e8b565c749a0
+    digest: sha256:1115b5a0c140dcde82e497609385a2d9882f702f1b34548637c5091b7c43a474
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:81ee1fcc06b556e5ba7fd737137e500bbf249006d022593958c67324d8ce74e6
+    digest: sha256:200dbfd0661a52059cab048806ba380eb8feb1850fc5634c79fe80025819881c
diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json
index e20b217a04..b95c2ab3aa 100644
--- a/assets/components/multus/release-multus-aarch64.json
+++ b/assets/components/multus/release-multus-aarch64.json
@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-arm64-2026-03-17-075144"
+    "base": "4.22.0-0.nightly-arm64-2026-03-18-221724"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50e5e48edb99e4c89d03c0edcfc58ffbc3081d2b5b189431b6d6e8b565c749a0",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81ee1fcc06b556e5ba7fd737137e500bbf249006d022593958c67324d8ce74e6"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1115b5a0c140dcde82e497609385a2d9882f702f1b34548637c5091b7c43a474",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:200dbfd0661a52059cab048806ba380eb8feb1850fc5634c79fe80025819881c"
   }
 }
diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json
index 3d36ded14f..0a7d58ef4c 100644
--- a/assets/components/multus/release-multus-x86_64.json
+++ b/assets/components/multus/release-multus-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-2026-03-17-104634"
+    "base": "4.22.0-0.nightly-2026-03-17-033403"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51f90ebc8bc3eb0d031cfc41a3720fffd5d3eaad4a31141bfee675b1f8d567ce",
diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
index 8abbe64195..f1fddd8ce2 100644
--- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
+++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
@@ -2,13 +2,13 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:e1fa426d6a06aaeb7a8922e09bceaf92e124dbfd40d018484ea0272c2d3d40ec
+    digest: sha256:e2860486f8ecbffa0c9dca6bf628fb62a5c03b73dd39633db8731a563db50f33
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:d4a73641d8d2f9e84ccc5bbe5529c2a45d57378dab0c3bdb5df6ab933231683e
+    digest: sha256:611d43c0335ac507e092622b775dfac8dcebe32707b71ae248e4127154df39fd
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:3808a275427e399c43f7b769542f32e15320c8984dd7b44e372ba4f8b06696db
+    digest: sha256:f650bc4ecefe0bd39fd40f7ef72252d48b3ddb6950ffc528dea4cf8b5e980f1b
 
 patches:
   - patch: |-
@@ -16,12 +16,12 @@ patches:
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4a73641d8d2f9e84ccc5bbe5529c2a45d57378dab0c3bdb5df6ab933231683e
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:611d43c0335ac507e092622b775dfac8dcebe32707b71ae248e4127154df39fd
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OLM_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e1fa426d6a06aaeb7a8922e09bceaf92e124dbfd40d018484ea0272c2d3d40ec
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2860486f8ecbffa0c9dca6bf628fb62a5c03b73dd39633db8731a563db50f33
     target:
       kind: Deployment
       labelSelector: app=catalog-operator
diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
index 4f56144fbe..63b7a45620 100644
--- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
+++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
@@ -2,10 +2,10 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:b2c9e33a9bb2272fe959221d82a335dd3258b6fd703ab3c6bb795634f1d5685d
+    digest: sha256:5b34abc69ec49feba6e614d7d7feaa2d5ff17b59b07e7325ca7e24ef4d428aef
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:52c91cf06f1971592b333f9350a8227e2b3d7c0cd1f38205f49ef1728db1fa64
+    digest: sha256:ef54378224d5e92827f940b12961282b11e84917cc7d56f2becf08781fa20245
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
     digest: sha256:198863a1d295199013dbaf0d58077027af91abecf2af32968f7103368a0d2785
@@ -16,12 +16,12 @@ patches:
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52c91cf06f1971592b333f9350a8227e2b3d7c0cd1f38205f49ef1728db1fa64
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef54378224d5e92827f940b12961282b11e84917cc7d56f2becf08781fa20245
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OLM_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2c9e33a9bb2272fe959221d82a335dd3258b6fd703ab3c6bb795634f1d5685d
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b34abc69ec49feba6e614d7d7feaa2d5ff17b59b07e7325ca7e24ef4d428aef
     target:
       kind: Deployment
       labelSelector: app=catalog-operator
diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
index 96228b5128..34d73c3a69 100644
--- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
+++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-arm64-2026-03-17-075144"
+    "base": "4.22.0-0.nightly-arm64-2026-03-18-221724"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e1fa426d6a06aaeb7a8922e09bceaf92e124dbfd40d018484ea0272c2d3d40ec",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4a73641d8d2f9e84ccc5bbe5529c2a45d57378dab0c3bdb5df6ab933231683e",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3808a275427e399c43f7b769542f32e15320c8984dd7b44e372ba4f8b06696db"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2860486f8ecbffa0c9dca6bf628fb62a5c03b73dd39633db8731a563db50f33",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:611d43c0335ac507e092622b775dfac8dcebe32707b71ae248e4127154df39fd",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f650bc4ecefe0bd39fd40f7ef72252d48b3ddb6950ffc528dea4cf8b5e980f1b"
   }
 }
diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
index 86ea1ade36..ce57a72496 100644
--- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
+++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-2026-03-17-104634"
+    "base": "4.22.0-0.nightly-2026-03-17-033403"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2c9e33a9bb2272fe959221d82a335dd3258b6fd703ab3c6bb795634f1d5685d",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52c91cf06f1971592b333f9350a8227e2b3d7c0cd1f38205f49ef1728db1fa64",
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b34abc69ec49feba6e614d7d7feaa2d5ff17b59b07e7325ca7e24ef4d428aef",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef54378224d5e92827f940b12961282b11e84917cc7d56f2becf08781fa20245",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:198863a1d295199013dbaf0d58077027af91abecf2af32968f7103368a0d2785"
   }
 }
diff --git a/assets/optional/sriov/kustomization.aarch64.yaml b/assets/optional/sriov/kustomization.aarch64.yaml
index a7f3685f92..a9816a30c8 100644
--- a/assets/optional/sriov/kustomization.aarch64.yaml
+++ b/assets/optional/sriov/kustomization.aarch64.yaml
@@ -1,7 +1,7 @@
 images:
   - name: quay.io/openshift/sriov-network-operator
     newName: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator
-    digest: sha256:69a12d8aaf1aad7e5a16ac6c702315087fa39fdb528b84c74bf54396453132be
+    digest: sha256:5c45880dc14f79c5f4dbb20feeba6656384ea7ef1863f59fdedbdf306d693b77
 
 patches:
   - patch: |-
@@ -9,47 +9,47 @@ patches:
         path: /spec/template/spec/containers/0/env/-
         value:
           name: SRIOV_CNI_IMAGE
-          value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:eebdf46f057436296ee56b0a7f6bfcc84e4a4812d50b934296d2a1c35fe2ac52
+          value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:3d36679b58f53ad154b886843a0092f84409610b1e1ff1ae3ab021109c1eae35
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: SRIOV_DEVICE_PLUGIN_IMAGE
-          value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:34fc493f266ae38508467288b589f4df48417b576c21ca84e6d17107e227be86
+          value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:99bb0ea29b9fed45aed8391344ea9b785b1c044101332d218bcb3da585429d37
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: NETWORK_RESOURCES_INJECTOR_IMAGE
-          value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:4b62b448e901982167641915b08fa764a5072021c106fa3226695fa36841e7bb
+          value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:09e43f54273705a05c0c71c7e47324172ad57c9c468f382f7aec9cda730f83ed
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE
-          value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:e9e882c2783054c78419d27dad5aa919cc49e0640c409113f75724d15a07e34a
+          value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:fdb3456dfa64b48e42662b52c698ea7bba4d9fc6504d54f814a759c4ab0b0258
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: SRIOV_NETWORK_WEBHOOK_IMAGE
-          value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:0b5e1e7854d3bf5eefa043bece9aba0433ba04c000323d5ca5ba5f57dffce066
+          value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:6f982d7fc0ce4a370d443c1ae74adbb93e47355bcfa7a2a3f731a04496bb4c3d
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: SRIOV_INFINIBAND_CNI_IMAGE
-          value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:8b11be5ef53ffc1be2ac69dfc619d95090b800ad7f0b78d43127fcd46528f025
+          value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:cb99f378ba0cbc6878f8c2605eb1a98c4d6edaeeaea8f8262d4f923f7d6afdc4
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: RDMA_CNI_IMAGE
-          value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:67c54e01cae8b344f1b4507f1ec4f6661ebd46229f4a8df3205cc3987180cada
+          value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:e10697925700ec0c1304b817335ff4d6b5176c905f86415b14573c65c9674c80
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: METRICS_EXPORTER_IMAGE
-          value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:a25cbc6c07a8a559d03d16c8c9e4a5182f254e809ee278078aa391f8eba725e6
+          value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:98fe46af8f7116c76eb50a75e83b7027c2f4ccf2f5b5955767ba3cb69b60e493
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE
-          value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:ffe073d7c0f0a57f201cb3c5e49e3bbd39100fa425f6bf918e77e834b84e564a
+          value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:4bd4ba390e83fb3eff7d17281090981125e08ecb458969b5ac95da4342641e65
     target:
       kind: Deployment
       name: sriov-network-operator
diff --git a/assets/optional/sriov/kustomization.x86_64.yaml b/assets/optional/sriov/kustomization.x86_64.yaml
index b2441364c8..6a484a8229 100644
--- a/assets/optional/sriov/kustomization.x86_64.yaml
+++ b/assets/optional/sriov/kustomization.x86_64.yaml
@@ -1,7 +1,7 @@
 images:
   - name: quay.io/openshift/sriov-network-operator
     newName: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator
-    digest: sha256:b42970a530649ebe7a975dc766dfc0dd11a49b196589e21fb1155bef7fb576b2
+    digest: sha256:eb33beb5c0387c53709ca90e4a34bd3bc6423f40f2c3f87d1259e26838d30b69
 
 patches:
   - patch: |-
@@ -9,47 +9,47 @@ patches:
         path: /spec/template/spec/containers/0/env/-
         value:
           name: SRIOV_CNI_IMAGE
-          value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:6fc9d197b8d428f69b75f33d459b76a5cfbe49ce573a1e3d725f8339227dfe97
+          value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:419a7edf1893e5ae2ccc8bdd927ba79f0994865a41a2a41b8b003f48d11a61c2
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: SRIOV_DEVICE_PLUGIN_IMAGE
-          value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:f578b7b7d0bfba41ebfc8e46adb2c34e40ed0c08ea2d35612ead4d0792b601eb
+          value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:b134ed51c7f6e9c8b529cc26dd4f840b20b3fed57b5dabffed6ee968d3b6c542
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: NETWORK_RESOURCES_INJECTOR_IMAGE
-          value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:22c2e2a09c43faf5defe8125577af4cdf103db094c520bee1e0a1fbe1498c898
+          value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:3dcf9e4d16a3d9cb297363f5e13def08350e2e8b4af6488c70fe2a3322302460
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE
-          value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:9702ea100046cc86bf796e52faa8b12bab60ecf52cbe73a7a99d0d30cfd3e60c
+          value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:6febc5de880f61a38ea6b4e001ac567a6f05ba742714845a33cc663013332e12
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: SRIOV_NETWORK_WEBHOOK_IMAGE
-          value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:3e21af9c9161378b3a2eb62b75f47cb8079d2395502430de93b60444789b2c71
+          value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:9c27ea1bca8365b8b66d03e838d48ec7510714bc954e1f89c5f19d4a24db072b
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: SRIOV_INFINIBAND_CNI_IMAGE
-          value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:4ea4776ebc863b7e1f03ac0b843c50f169efb060f69cf04f38386175c9db7e1c
+          value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:69887c1d3777bb1f6334783926e63295bf574b762faeb481eba8550c916a9159
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: RDMA_CNI_IMAGE
-          value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:7caf160ea8d2b18c9bee0f027339d42dae82455c598669adbaf500d2ab08947e
+          value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:0aefbfbeba10fa66e6988f6b571749c4df965b4ecb99678488685be26e80c543
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: METRICS_EXPORTER_IMAGE
-          value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:f0a051c1fecfdc437977a611883bcaf39981f45d5d3345ee95448af861fd719b
+          value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:866bd03f50228e938d475fb2daa3feceeaedb532a7079e25e95af2536e5a78d7
       - op: add
         path: /spec/template/spec/containers/0/env/-
         value:
           name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE
-          value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:77988ac48ae4310b454503a6ad9a68516302560df62b97a7a1a59d182cca72dd
+          value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:602dc9f92b7a8e84e6eb998191263d186d1d10d378eeef0845435715bee812dc
     target:
       kind: Deployment
       name: sriov-network-operator
diff --git a/assets/optional/sriov/release-sriov-aarch64.json b/assets/optional/sriov/release-sriov-aarch64.json
index 782ffffcee..a9ff4d0648 100644
--- a/assets/optional/sriov/release-sriov-aarch64.json
+++ b/assets/optional/sriov/release-sriov-aarch64.json
@@ -1,17 +1,17 @@
 {
   "release": {
-    "base": "4.20.0-202602091941"
+    "base": "4.20.0-202602261925"
   },
   "images": {
-    "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:a25cbc6c07a8a559d03d16c8c9e4a5182f254e809ee278078aa391f8eba725e6",
-    "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:ffe073d7c0f0a57f201cb3c5e49e3bbd39100fa425f6bf918e77e834b84e564a",
-    "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:4b62b448e901982167641915b08fa764a5072021c106fa3226695fa36841e7bb",
-    "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:67c54e01cae8b344f1b4507f1ec4f6661ebd46229f4a8df3205cc3987180cada",
-    "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:eebdf46f057436296ee56b0a7f6bfcc84e4a4812d50b934296d2a1c35fe2ac52",
-    "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:34fc493f266ae38508467288b589f4df48417b576c21ca84e6d17107e227be86",
-    "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:8b11be5ef53ffc1be2ac69dfc619d95090b800ad7f0b78d43127fcd46528f025",
-    "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:e9e882c2783054c78419d27dad5aa919cc49e0640c409113f75724d15a07e34a",
-    "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:69a12d8aaf1aad7e5a16ac6c702315087fa39fdb528b84c74bf54396453132be",
-    "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:0b5e1e7854d3bf5eefa043bece9aba0433ba04c000323d5ca5ba5f57dffce066"
+    "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:98fe46af8f7116c76eb50a75e83b7027c2f4ccf2f5b5955767ba3cb69b60e493",
+    "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:4bd4ba390e83fb3eff7d17281090981125e08ecb458969b5ac95da4342641e65",
+    "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:09e43f54273705a05c0c71c7e47324172ad57c9c468f382f7aec9cda730f83ed",
+    "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:e10697925700ec0c1304b817335ff4d6b5176c905f86415b14573c65c9674c80",
+    "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:3d36679b58f53ad154b886843a0092f84409610b1e1ff1ae3ab021109c1eae35",
+    "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:99bb0ea29b9fed45aed8391344ea9b785b1c044101332d218bcb3da585429d37",
+    "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:cb99f378ba0cbc6878f8c2605eb1a98c4d6edaeeaea8f8262d4f923f7d6afdc4",
+    "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:fdb3456dfa64b48e42662b52c698ea7bba4d9fc6504d54f814a759c4ab0b0258",
+    "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:5c45880dc14f79c5f4dbb20feeba6656384ea7ef1863f59fdedbdf306d693b77",
+    "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:6f982d7fc0ce4a370d443c1ae74adbb93e47355bcfa7a2a3f731a04496bb4c3d"
   }
 }
diff --git a/assets/optional/sriov/release-sriov-x86_64.json b/assets/optional/sriov/release-sriov-x86_64.json
index 82df31a2a4..ffb0e88e87 100644
--- a/assets/optional/sriov/release-sriov-x86_64.json
+++ b/assets/optional/sriov/release-sriov-x86_64.json
@@ -1,17 +1,17 @@
 {
   "release": {
-    "base": "4.20.0-202602091941"
+    "base": "4.20.0-202602261925"
   },
   "images": {
-    "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:f0a051c1fecfdc437977a611883bcaf39981f45d5d3345ee95448af861fd719b",
-    "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:77988ac48ae4310b454503a6ad9a68516302560df62b97a7a1a59d182cca72dd",
-    "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:22c2e2a09c43faf5defe8125577af4cdf103db094c520bee1e0a1fbe1498c898",
-    "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:7caf160ea8d2b18c9bee0f027339d42dae82455c598669adbaf500d2ab08947e",
-    "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:6fc9d197b8d428f69b75f33d459b76a5cfbe49ce573a1e3d725f8339227dfe97",
-    "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:f578b7b7d0bfba41ebfc8e46adb2c34e40ed0c08ea2d35612ead4d0792b601eb",
-    "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:4ea4776ebc863b7e1f03ac0b843c50f169efb060f69cf04f38386175c9db7e1c",
-    "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:9702ea100046cc86bf796e52faa8b12bab60ecf52cbe73a7a99d0d30cfd3e60c",
-    "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:b42970a530649ebe7a975dc766dfc0dd11a49b196589e21fb1155bef7fb576b2",
-    "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:3e21af9c9161378b3a2eb62b75f47cb8079d2395502430de93b60444789b2c71"
+    "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:866bd03f50228e938d475fb2daa3feceeaedb532a7079e25e95af2536e5a78d7",
+    "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:602dc9f92b7a8e84e6eb998191263d186d1d10d378eeef0845435715bee812dc",
+    "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:3dcf9e4d16a3d9cb297363f5e13def08350e2e8b4af6488c70fe2a3322302460",
+    "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:0aefbfbeba10fa66e6988f6b571749c4df965b4ecb99678488685be26e80c543",
+    "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:419a7edf1893e5ae2ccc8bdd927ba79f0994865a41a2a41b8b003f48d11a61c2",
+    "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:b134ed51c7f6e9c8b529cc26dd4f840b20b3fed57b5dabffed6ee968d3b6c542",
+    "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:69887c1d3777bb1f6334783926e63295bf574b762faeb481eba8550c916a9159",
+    "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:6febc5de880f61a38ea6b4e001ac567a6f05ba742714845a33cc663013332e12",
+    "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:eb33beb5c0387c53709ca90e4a34bd3bc6423f40f2c3f87d1259e26838d30b69",
+    "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:9c27ea1bca8365b8b66d03e838d48ec7510714bc954e1f89c5f19d4a24db072b"
   }
 }
diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
index 19b9f7dc65..188d5f94e5 100644
--- a/assets/release/release-aarch64.json
+++ b/assets/release/release-aarch64.json
@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-arm64-2026-03-17-075144"
+    "base": "4.22.0-0.nightly-arm64-2026-03-18-221724"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0b7fa7b9b9bd631a47b8ae5ab70a26655455996259709d6e8948b63d6fee442",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:799ebfc08db9b6420d384180e216650820676ffe21d803d86759adfd373e1251",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6444e2927dee2d1815e966a809f18c5d49663bc1cdfcb41b3b08999100a21187",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3808a275427e399c43f7b769542f32e15320c8984dd7b44e372ba4f8b06696db",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b39c6156a982aa07d5f8404c03d297ac69f2f0c9f54cb77f3150b3730cfa76a1",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77166b4745872f5d64c6d0da42e03b954f7186124884acbe150ed1d114c75e9f",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5489bb620c32d2547f502a958586769b81a6b5fa91ed477d6fe9a9ac171b91d6",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:047e27d1b4a16028da3a6944fade35a1709c1d8be3911d2f79672f83d764928f",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b6ec514ad1dcf7277ef3529d9ba911b828b45fb0613fff291d855c96c3a0b06",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea0cc24d89fef9ec26d0eb939e58206a23e54ec6e07832597606e687536062cf",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f650bc4ecefe0bd39fd40f7ef72252d48b3ddb6950ffc528dea4cf8b5e980f1b",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84c3405afab08db465d3e2575d584815df2673355f96c5ce2b1b0c8985056759",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:118d5b7f3126f6b576ad725692cfc284d99f3af3bc85ee802bfc2fd1fc4fdd63",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd7a20091b0f7ab7f6e4631028aeab79a36e787cc8bccc5e2924c5e892b7c6d2",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:266f908a1eae281e1b7265febfa419c2af4dff18a7cdef88703b7c5060f300b6"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6920fa716e223a2dd914942abbb16da7cd9adff61ad6dc6c9b38c2e815357fc1"
   }
 }
diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json
index fa39878fce..9d55fa4aa0 100644
--- a/assets/release/release-x86_64.json
+++ b/assets/release/release-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-2026-03-17-104634"
+    "base": "4.22.0-0.nightly-2026-03-17-033403"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f20f857ce786727b82e9f8260037bddd444e4dc898757549d47d9f2db71667a7",
diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf
index dddba3ff74..b9a99fc9a8 100644
--- a/packaging/crio.conf.d/10-microshift_arm64.conf
+++ b/packaging/crio.conf.d/10-microshift_arm64.conf
@@ -2,6 +2,6 @@
 # for community builds on top of OKD, this setting has no effect
 [crio.image]
 global_auth_file="/etc/crio/openshift-pull-secret"
-pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77166b4745872f5d64c6d0da42e03b954f7186124884acbe150ed1d114c75e9f"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:118d5b7f3126f6b576ad725692cfc284d99f3af3bc85ee802bfc2fd1fc4fdd63"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"
diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
index f85129bff9..1c00006f58 100644
--- a/scripts/auto-rebase/changelog.txt
+++ b/scripts/auto-rebase/changelog.txt
@@ -1,56 +1,34 @@
-- api embedded-component 5e946e2d43b71b30614a146906ffc7027b267b63 to b3c6104577797f804d921ac05ad91aa4186818f2
-  - 81c614a2 2026-03-16T09:51:00-04:00 features: remove MachineConfigNodes and PinnedImages feature gates
-  - 11342435 2026-03-16T09:50:56-04:00 MCO: remove v1alpha1 CRDs for MachineConfigNodes and PinnedImages
-  - 7b00e56d 2026-03-13T16:08:58-07:00 *: Renenerate after removing v1alpha1 (Cluster)ImagePolicy
-  - 85c1377d 2026-03-13T15:56:47-07:00 config/v1alpha1: Drop (Cluster)ImagePolicy since the hard cut to v1
-  - af55ae29 2026-03-13T13:06:09-07:00 CORS-4348: feature gate for EU Sovereign Cloud support
-
-- cluster-dns-operator embedded-component d98f998ef32c2f2dadad13684432e14dcac191b7 to 7709285a381bc9ca24f833bab4789d327a856440
-  - 740bb11 2026-03-12T11:09:09-04:00 Fix gofmt issues in test file
-  - 67c40dd 2026-03-12T10:32:51-04:00 Address test feedback from PR review
-  - e5607e2 2026-03-11T20:26:12-04:00 Address PR review comments
-  - 6a46518 2026-03-09T13:55:08-04:00 Dynamically set kube-rbac-proxy TLS args
-
-- cluster-kube-apiserver-operator embedded-component 8a099d417645f3788106cedb71e7e4d35ff18a97 to deb703d26f017aea26d4619a7422094ab12b3e65
-  - 2884691 2026-03-12T21:27:26+01:00 Always set service-account-jwks-uri to LB URL even with custom issuer
-  - 85ccf93 2026-03-11T11:16:54+01:00 OCPBUGS-78146: move event-ttl test to its own suite
-
-- cluster-kube-controller-manager-operator embedded-component a7ff6a4647805362618c61a031196cc791cb9963 to 41ab963edfef9473111879069620971365231c49
-  - 1e5d6a7 2026-02-09T11:17:14+01:00 chore: add permissions on endpointslice to Prometheus Role and use serviceDiscoveryRole: EndpointSlice in ServiceMonitors
-
-- cluster-network-operator embedded-component a57b306cf55cb72521ab6f1e0e5ba63d2875d230 to 3b5ef2d8b37e2e040f5b98a07848a63774aa3012
-  - 2ebfbc8 2026-02-17T11:42:54Z add network-check-target + networking-console-plugin service accounts
-
-- operator-framework-olm embedded-component 425bb657d646f0485b841eead9ae903ea982a119 to c6dfbbd1a88049508b85c543fb5a631557e135e6
-  - 8e0301fb 2026-03-16T14:37:48+08:00 Fix admin context race condition in parallel tests
-  - 77c60679 2026-03-13T00:04:12Z delete obsolete files and shift webhook testing to use a kube-native approach (#3792)
-  - 21afb955 2026-03-13T00:03:24Z fix e2e: replace defunct gcr.io/kubebuilder/kube-rbac-proxy with quay.io/brancz (#3795)
-
-- service-ca-operator embedded-component 4003a556c0efc7289b93d33985cd7d59e27794e9 to de11f78073eb847fca80ca6265882c69cb7a747b
-  - 12916e0 2026-03-12T17:41:50-04:00 vendor: bump(*)
-  - 7ce51e2 2026-03-12T17:41:50-04:00 Updating ose-service-ca-operator-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/992b0dc3f0e12d86e7466dadf1eb51b2584a9a83/images/ose-service-ca-operator.yml
-
-- oc image-amd64 f7a24ec33be5c7d13ddc96b487969d749bbdac92 to cb542c5177b98b84b1ae921bee0d1e264b9ca00c
-  - 1f395ca9 2026-03-16T17:14:43+05:30 Fixing manifest ci failure
-  - 4ead568f 2026-03-13T20:07:29Z RFE-7406: Include the K8s ingress resource in namespace inspect collection (#2004)
-
-- router image-amd64 a6ba7ddae926f1466d32c72d05b71cebdce69123 to 1c68a10861fa13a1210fa65c91c36cca3367cc93
-  - a0ed627 2026-02-06T19:16:25+01:00 NE-2418: Add haproxy_max_connections metric
-  - b76cd01 2025-11-11T14:35:28-05:00 Do not install weak dependencies such as logrotate
-
-- service-ca-operator image-amd64 4003a556c0efc7289b93d33985cd7d59e27794e9 to de11f78073eb847fca80ca6265882c69cb7a747b
-  - 12916e0 2026-03-12T17:41:50-04:00 vendor: bump(*)
-  - 7ce51e2 2026-03-12T17:41:50-04:00 Updating ose-service-ca-operator-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/992b0dc3f0e12d86e7466dadf1eb51b2584a9a83/images/ose-service-ca-operator.yml
-
-- oc image-arm64 f7a24ec33be5c7d13ddc96b487969d749bbdac92 to cb542c5177b98b84b1ae921bee0d1e264b9ca00c
-  - 1f395ca9 2026-03-16T17:14:43+05:30 Fixing manifest ci failure
-  - 4ead568f 2026-03-13T20:07:29Z RFE-7406: Include the K8s ingress resource in namespace inspect collection (#2004)
-
-- router image-arm64 a6ba7ddae926f1466d32c72d05b71cebdce69123 to 1c68a10861fa13a1210fa65c91c36cca3367cc93
-  - a0ed627 2026-02-06T19:16:25+01:00 NE-2418: Add haproxy_max_connections metric
-  - b76cd01 2025-11-11T14:35:28-05:00 Do not install weak dependencies such as logrotate
-
-- service-ca-operator image-arm64 4003a556c0efc7289b93d33985cd7d59e27794e9 to de11f78073eb847fca80ca6265882c69cb7a747b
-  - 12916e0 2026-03-12T17:41:50-04:00 vendor: bump(*)
-  - 7ce51e2 2026-03-12T17:41:50-04:00 Updating ose-service-ca-operator-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/992b0dc3f0e12d86e7466dadf1eb51b2584a9a83/images/ose-service-ca-operator.yml
+- cluster-kube-controller-manager-operator embedded-component 41ab963edfef9473111879069620971365231c49 to a7ff6a4647805362618c61a031196cc791cb9963
+
+
+- operator-framework-olm embedded-component c6dfbbd1a88049508b85c543fb5a631557e135e6 to bf71e98f7511ae273bf6885ac0951d2b3841340b
+
+
+- oc image-arm64 cb542c5177b98b84b1ae921bee0d1e264b9ca00c to ee23f0583edad80c6fa3a3eefdcd6b063a97a371
+  - 84e31f76 2026-03-18T13:05:19+03:00 Add .coderabbit.yaml and AGENTS.md configurations
+  - dedf6262 2026-03-12T09:54:20+03:00 Update golang.org/x libraries to latest
+  - 562dc43d 2026-03-12T09:24:13+03:00 Fix lifecycle_test failure
+  - 1cf5f00c 2026-03-12T09:24:13+03:00 Skip new resources that do not have Describer
+  - 17310cf9 2026-03-12T09:24:13+03:00 Update manifest Include signature
+  - 6bbea279 2026-03-12T09:24:13+03:00 Bump openshift libraries
+  - 95fad07b 2026-03-12T09:24:13+03:00 Bump some of other packages to keep up to date
+  - b0c5ec0d 2026-03-12T09:24:13+03:00 Update metadata for Go 1.25 k8s 1.35
+  - 232cf7dd 2026-03-12T09:24:13+03:00 React to the changes coming from 1.35
+  - c6cedc89 2026-03-12T09:24:12+03:00 Bump k8s 1.35.2
+
+- router image-arm64 1c68a10861fa13a1210fa65c91c36cca3367cc93 to bb228d66f7305649c419e7f29c82d37364a41e50
+  - e74ec3c 2026-03-06T10:22:43-03:00 Configure tls version and ciphers for metrics
+  - f4de387 2026-03-05T18:39:11-03:00 bump library-go version
+
+- kube-rbac-proxy image-arm64 bdd87a0646eae5683bb83fe30e3649471b757ebf to d12e274605248f6c59373240a7eae7a7a357dcb3
+  - db13357 2026-03-16T16:51:48+01:00 go.mod: adjust Go version for downstream CI
+  - 22ca3af 2026-03-16T13:05:10+01:00 vendor: bump
+  - 8b45d57 2026-03-16T10:11:33+01:00 *: cut v0.21.1 release
+  - 2eac21f 2026-03-16T10:11:33+01:00 go*: update dependencies
+  - 898a9f4 2026-02-26T13:05:33+01:00 *: cut v0.21.0 release
+  - 6ca41ac 2026-02-26T09:33:36+01:00 go*: update dependencies
+
+- service-ca-operator image-arm64 de11f78073eb847fca80ca6265882c69cb7a747b to 9885e2eb052d38c15366ba001d94fd7c40fe0ec1
+  - e863ac3 2026-03-18T15:05:49+08:00 test/e2e: migrate forced-ca-rotation to OTE serial-disruptive suite
+  - e7f8a9d 2026-03-18T03:05:59+08:00 test/e2e: migrate time-based-ca-rotation to OTE serial-disruptive suite
 
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
index 223e110cfd..fec07b5ac4 100644
--- a/scripts/auto-rebase/commits.txt
+++ b/scripts/auto-rebase/commits.txt
@@ -3,7 +3,7 @@ https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-c
 https://github.com/openshift/cluster-dns-operator embedded-component 7709285a381bc9ca24f833bab4789d327a856440
 https://github.com/openshift/cluster-ingress-operator embedded-component 88b7301f88ba24577de72a84d52675f51ea30886
 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component deb703d26f017aea26d4619a7422094ab12b3e65
-https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 41ab963edfef9473111879069620971365231c49
+https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component a7ff6a4647805362618c61a031196cc791cb9963
 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component a51975da7993b40c35a892e3437f354cb3e133d7
 https://github.com/openshift/cluster-network-operator embedded-component 3b5ef2d8b37e2e040f5b98a07848a63774aa3012
 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 8e04fd3a6d1bbdb878a83fa13fde240c593504cc
@@ -14,7 +14,7 @@ https://github.com/openshift/kubernetes embedded-component 2034d92b4a3a51d42e306
 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 72835e43c7754356645e41031f3a99926b4d42e6
 https://github.com/openshift/machine-config-operator embedded-component 5f0d9d7cb472e9aa565bd1e2b0f71f875677de3d
 https://github.com/openshift/openshift-controller-manager embedded-component 26d20feae8892f648f5b06ed3f5492fe6ffb4532
-https://github.com/openshift/operator-framework-olm embedded-component c6dfbbd1a88049508b85c543fb5a631557e135e6
+https://github.com/openshift/operator-framework-olm embedded-component bf71e98f7511ae273bf6885ac0951d2b3841340b
 https://github.com/openshift/route-controller-manager embedded-component 624742d93f3a7885cf7f70985f1e23ff60da580d
 https://github.com/openshift/service-ca-operator embedded-component de11f78073eb847fca80ca6265882c69cb7a747b
 https://github.com/openshift/oc image-amd64 cb542c5177b98b84b1ae921bee0d1e264b9ca00c
@@ -25,11 +25,11 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 bdd87a0646eae5683bb83fe
 https://github.com/openshift/ovn-kubernetes image-amd64 eedfcd073cbae0eea97638716019b2b39f141a41
 https://github.com/openshift/kubernetes image-amd64 2034d92b4a3a51d42e306ba405fc10a89768ac69
 https://github.com/openshift/service-ca-operator image-amd64 de11f78073eb847fca80ca6265882c69cb7a747b
-https://github.com/openshift/oc image-arm64 cb542c5177b98b84b1ae921bee0d1e264b9ca00c
+https://github.com/openshift/oc image-arm64 ee23f0583edad80c6fa3a3eefdcd6b063a97a371
 https://github.com/openshift/coredns image-arm64 0dded2d232dab43c107b1dab9d0d9fdfd8259622
 https://github.com/openshift/csi-external-snapshotter image-arm64 d1bc3ffaa9759c13a06c2ec61c541342e71bd109
-https://github.com/openshift/router image-arm64 1c68a10861fa13a1210fa65c91c36cca3367cc93
-https://github.com/openshift/kube-rbac-proxy image-arm64 bdd87a0646eae5683bb83fe30e3649471b757ebf
+https://github.com/openshift/router image-arm64 bb228d66f7305649c419e7f29c82d37364a41e50
+https://github.com/openshift/kube-rbac-proxy image-arm64 d12e274605248f6c59373240a7eae7a7a357dcb3
 https://github.com/openshift/ovn-kubernetes image-arm64 eedfcd073cbae0eea97638716019b2b39f141a41
 https://github.com/openshift/kubernetes image-arm64 2034d92b4a3a51d42e306ba405fc10a89768ac69
-https://github.com/openshift/service-ca-operator image-arm64 de11f78073eb847fca80ca6265882c69cb7a747b
+https://github.com/openshift/service-ca-operator image-arm64 9885e2eb052d38c15366ba001d94fd7c40fe0ec1
diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh
index 9676b466cb..119a3ac437 100755
--- a/scripts/auto-rebase/last_rebase.sh
+++ b/scripts/auto-rebase/last_rebase.sh
@@ -1,2 +1,2 @@
 #!/bin/bash -x
-./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-03-17-104634" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-03-17-075144"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-03-17-033403" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-03-18-221724"