diff --git a/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main.yaml b/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main.yaml
index b88d06ecfe381..2dd45017dc8c3 100644
--- a/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main.yaml
+++ b/ci-operator/config/cri-o/cri-o/cri-o-cri-o-main.yaml
@@ -81,11 +81,13 @@ resources:
 rpm_build_commands: hack/build-rpms.sh
 tests:
 - as: e2e-aws-ovn
+  optional: true
   skip_if_only_changed: ^(?:docs|tutorials|logo|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|SECURITY_CONTACTS|PROJECT|LICENSE)$
   steps:
     cluster_profile: openshift-org-aws
     workflow: openshift-e2e-aws
 - as: e2e-gcp-ovn
+  optional: true
   skip_if_only_changed: ^(?:docs|tutorials|logo|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|SECURITY_CONTACTS|PROJECT|LICENSE)$
   steps:
     cluster_profile: openshift-org-gcp
diff --git a/ci-operator/jobs/cri-o/cri-o/cri-o-cri-o-main-presubmits.yaml b/ci-operator/jobs/cri-o/cri-o/cri-o-cri-o-main-presubmits.yaml
index 05b244107865d..1c7398ad83e3f 100644
--- a/ci-operator/jobs/cri-o/cri-o/cri-o-cri-o-main-presubmits.yaml
+++ b/ci-operator/jobs/cri-o/cri-o/cri-o-cri-o-main-presubmits.yaml
@@ -1167,6 +1167,7 @@ presubmits:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-cri-o-cri-o-main-e2e-aws-ovn
+    optional: true
     rerun_command: /test e2e-aws-ovn
     skip_if_only_changed: ^(?:docs|tutorials|logo|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|SECURITY_CONTACTS|PROJECT|LICENSE)$
     spec:
@@ -1250,6 +1251,7 @@ presubmits:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-cri-o-cri-o-main-e2e-gcp-ovn
+    optional: true
     rerun_command: /test e2e-gcp-ovn
     skip_if_only_changed: ^(?:docs|tutorials|logo|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|SECURITY_CONTACTS|PROJECT|LICENSE)$
     spec: