diff --git a/ci-operator/config/openshift/cert-manager-operator/openshift-cert-manager-operator-master.yaml b/ci-operator/config/openshift/cert-manager-operator/openshift-cert-manager-operator-master.yaml
index a9092aa43bbac..d3a97448d2c9a 100644
--- a/ci-operator/config/openshift/cert-manager-operator/openshift-cert-manager-operator-master.yaml
+++ b/ci-operator/config/openshift/cert-manager-operator/openshift-cert-manager-operator-master.yaml
@@ -196,9 +196,8 @@ tests:
         requests:
           cpu: 100m
     workflow: openshift-e2e-aws-upi-proxy
-- always_run: false
-  as: e2e-operator-aws-sts
-  optional: true
+- as: e2e-operator-aws-sts
+  skip_if_only_changed: ^(docs/|deploy/|jsonnet/)|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: openshift-org-aws
     dependencies:
@@ -218,9 +217,8 @@ tests:
         requests:
           cpu: 100m
     workflow: openshift-e2e-aws-manual-oidc-sts
-- always_run: false
-  as: e2e-operator-gcp-ovn
-  optional: true
+- as: e2e-operator-gcp-ovn
+  skip_if_only_changed: ^(docs/|deploy/|jsonnet/)|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: openshift-org-gcp
     dependencies:
diff --git a/ci-operator/jobs/openshift/cert-manager-operator/openshift-cert-manager-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cert-manager-operator/openshift-cert-manager-operator-master-presubmits.yaml
index 0a47b4e6a4770..887ce023d3643 100644
--- a/ci-operator/jobs/openshift/cert-manager-operator/openshift-cert-manager-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cert-manager-operator/openshift-cert-manager-operator-master-presubmits.yaml
@@ -266,8 +266,8 @@ presubmits:
       job-release: "4.22"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cert-manager-operator-master-e2e-operator-aws-sts
-    optional: true
     rerun_command: /test e2e-operator-aws-sts
+    skip_if_only_changed: ^(docs/|deploy/|jsonnet/)|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -622,8 +622,8 @@ presubmits:
       job-release: "4.22"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cert-manager-operator-master-e2e-operator-gcp-ovn
-    optional: true
     rerun_command: /test e2e-operator-gcp-ovn
+    skip_if_only_changed: ^(docs/|deploy/|jsonnet/)|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args: