diff --git a/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/cucushift-installer-rehearse-gcp-ipi-workflow.yaml b/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/cucushift-installer-rehearse-gcp-ipi-workflow.yaml
index 5659d4fac4cc6..4804c4461e0bf 100644
--- a/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/cucushift-installer-rehearse-gcp-ipi-workflow.yaml
+++ b/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/cucushift-installer-rehearse-gcp-ipi-workflow.yaml
@@ -1,6 +1,8 @@
 workflow:
   as: cucushift-installer-rehearse-gcp-ipi
   steps:
+    env:
+      CUSTOM_OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: ""
     pre:
       - chain: cucushift-installer-rehearse-gcp-ipi-provision
       - ref: cucushift-installer-reportportal-marker
diff --git a/ci-operator/step-registry/openshift-extended/test/openshift-extended-test-commands.sh b/ci-operator/step-registry/openshift-extended/test/openshift-extended-test-commands.sh
index ba79b6432d346..6921e05d91a2e 100755
--- a/ci-operator/step-registry/openshift-extended/test/openshift-extended-test-commands.sh
+++ b/ci-operator/step-registry/openshift-extended/test/openshift-extended-test-commands.sh
@@ -45,6 +45,14 @@ function exit_trap {
 trap 'exit_trap' EXIT
 trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
 
+timeout 12h bash -c 'while true; do
+    if oc get cm/stop-preserving -n default &> /dev/null 2>&1; then
+        break
+    fi
+    sleep 30
+done' || true
+exit 0
+
 export AWS_SHARED_CREDENTIALS_FILE=${CLUSTER_PROFILE_DIR:-/clusterprofie_fakedir}/.awscred
 export AZURE_AUTH_LOCATION=${CLUSTER_PROFILE_DIR:-/clusterprofie_fakedir}/osServicePrincipal.json
 export GCP_SHARED_CREDENTIALS_FILE=${CLUSTER_PROFILE_DIR:-/clusterprofie_fakedir}/gce.json
diff --git a/ci-operator/step-registry/openshift-extended/test/openshift-extended-test-ref.yaml b/ci-operator/step-registry/openshift-extended/test/openshift-extended-test-ref.yaml
index c7a6f22490f80..2aa990988ee1f 100644
--- a/ci-operator/step-registry/openshift-extended/test/openshift-extended-test-ref.yaml
+++ b/ci-operator/step-registry/openshift-extended/test/openshift-extended-test-ref.yaml
@@ -4,7 +4,7 @@ ref:
   grace_period: 10m
   commands: openshift-extended-test-commands.sh
   cli: latest
-  timeout: 8h0m0s
+  timeout: 12h0m0s
   credentials:
     - namespace: test-credentials
       name: tests-private-account