diff --git a/ci-operator/step-registry/opct/conformance/external-aws/opct-conformance-external-aws-workflow.yaml b/ci-operator/step-registry/opct/conformance/external-aws/opct-conformance-external-aws-workflow.yaml
index a8cfab2f8450c..6af06fe01eaa7 100644
--- a/ci-operator/step-registry/opct/conformance/external-aws/opct-conformance-external-aws-workflow.yaml
+++ b/ci-operator/step-registry/opct/conformance/external-aws/opct-conformance-external-aws-workflow.yaml
@@ -16,7 +16,7 @@ workflow:
     env:
       PROVIDER_NAME: aws
       PLATFORM_EXTERNAL_CCM_ENABLED: no
-      OPCT_CLI_IMAGE: "quay.io/opct/opct:v0.6.0"
+      OPCT_CLI_IMAGE: "quay.io/opct/opct:v0.6.1"
   documentation: |-
     The OPCT Conformance External E2E workflow executes the common end-to-end test suite using
     OPCT tool.
diff --git a/ci-operator/step-registry/opct/conformance/test/run/opct-conformance-test-run-commands.sh b/ci-operator/step-registry/opct/conformance/test/run/opct-conformance-test-run-commands.sh
index 2554a1d9c7984..a9168ef4c7100 100644
--- a/ci-operator/step-registry/opct/conformance/test/run/opct-conformance-test-run-commands.sh
+++ b/ci-operator/step-registry/opct/conformance/test/run/opct-conformance-test-run-commands.sh
@@ -19,8 +19,16 @@ if [ -n "${OPCT_DEV_EXTRA_CMD:-}" ]; then
     ${OPCT_CLI} run --watch ${OPCT_DEV_EXTRA_CMD:-}
 elif [ "${OPCT_RUN_MODE:-}" == "upgrade" ]; then
     echo "Running OPCT with upgrade mode"
-    ${OPCT_CLI} run --watch --mode=upgrade --upgrade-to-image="${TARGET_RELEASE_IMAGE}"
+    ${OPCT_CLI} run \
+        --watch \
+        --mode=upgrade \
+        --upgrade-to-image="${TARGET_RELEASE_IMAGE}" \
+        --validation-timeout=900 \
+        --validation-retry-interval=30
 else
     echo "Running OPCT with regular mode"
-    ${OPCT_CLI} run --watch
+    ${OPCT_CLI} run \
+        --watch \
+        --validation-timeout=900 \
+        --validation-retry-interval=30
 fi
diff --git a/ci-operator/step-registry/opct/test/platform-external-vsphere/opct-test-platform-external-vsphere-workflow.yaml b/ci-operator/step-registry/opct/test/platform-external-vsphere/opct-test-platform-external-vsphere-workflow.yaml
index 86cab22af2734..ca0076896f51a 100644
--- a/ci-operator/step-registry/opct/test/platform-external-vsphere/opct-test-platform-external-vsphere-workflow.yaml
+++ b/ci-operator/step-registry/opct/test/platform-external-vsphere/opct-test-platform-external-vsphere-workflow.yaml
@@ -14,7 +14,7 @@ workflow:
       - ref: upi-deprovision-vsphere-dns
       - ref: ipi-deprovision-vsphere-lease
     env:
-      OPCT_CLI_IMAGE: "quay.io/opct/opct:v0.6.0"
+      OPCT_CLI_IMAGE: "quay.io/opct/opct:v0.6.1"
   documentation: |-
     The OPCT workflow installs OpenShift on vSphere using platform type None, then
     the run test steps using conformance workflow using OPCT, gather's the results archive, and
diff --git a/ci-operator/step-registry/opct/test/platform-none-vsphere/opct-test-platform-none-vsphere-workflow.yaml b/ci-operator/step-registry/opct/test/platform-none-vsphere/opct-test-platform-none-vsphere-workflow.yaml
index 328f2700948ef..0851da74cfc8f 100644
--- a/ci-operator/step-registry/opct/test/platform-none-vsphere/opct-test-platform-none-vsphere-workflow.yaml
+++ b/ci-operator/step-registry/opct/test/platform-none-vsphere/opct-test-platform-none-vsphere-workflow.yaml
@@ -14,7 +14,7 @@ workflow:
       - ref: upi-deprovision-vsphere-dns
       - ref: ipi-deprovision-vsphere-lease
     env:
-      OPCT_CLI_IMAGE: "quay.io/opct/opct:v0.6.0"
+      OPCT_CLI_IMAGE: "quay.io/opct/opct:v0.6.1"
   documentation: |-
     The OPCT workflow installs OpenShift on vSphere using platform type None, then
     the run test steps using conformance workflow using OPCT, gather's the results archive, and