diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml
index 72f082a1ab47f..a68fd37c91393 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml
@@ -883,9 +883,9 @@ tests:
       PLATFORM_EXTERNAL_CCM_ENABLED: "yes"
     workflow: openshift-e2e-external-aws
   timeout: 6h0m0s
-- always_run: false
-  as: e2e-aws-ovn-heterogeneous
+- as: e2e-aws-ovn-heterogeneous
   optional: true
+  run_if_changed: aws
   steps:
     cluster_profile: aws
     dependencies:
@@ -895,7 +895,17 @@ tests:
       CONTROL_ARCH: arm64
       FEATURE_GATES: '["MultiArchInstallAWS=true"]'
       FEATURE_SET: CustomNoUpgrade
-      TEST_SKIPS: oc new-app should succeed\| build can reference a cluster service
+      TEST_SKIPS: deploymentconfigs\| should expose cluster services outside the cluster\|
+        FIPS TestFIPS\| Multi-stage image builds should succeed\| Optimized image
+        builds should succeed\| build can reference a cluster service\| custom build
+        with buildah\| oc new-app should succeed\| prune builds based on settings\|
+        s2i build with a root\| verify /run filesystem contents\| oc can run\| oc
+        debug\| oc idle\| Pods cannot access\| Image append should create\| Image
+        extract should extract\| Image info should display\| Image layer subresource\|
+        oc tag should change image\| when installed on the cluster should\| OpenShift
+        alerting rules\| The HAProxy router should\| egressrouter cni resources\|
+        pod should start\| pod sysctls\| build volumes should mount given secrets
+        and configmaps into the build pod
     workflow: openshift-e2e-aws-heterogeneous-day-0
   timeout: 6h0m0s
 - always_run: false
@@ -910,7 +920,17 @@ tests:
       CONTROL_ARCH: arm64
       FEATURE_GATES: '["MultiArchInstallGCP=true"]'
       FEATURE_SET: CustomNoUpgrade
-      TEST_SKIPS: oc new-app should succeed\| build can reference a cluster service
+      TEST_SKIPS: deploymentconfigs\| should expose cluster services outside the cluster\|
+        FIPS TestFIPS\| Multi-stage image builds should succeed\| Optimized image
+        builds should succeed\| build can reference a cluster service\| custom build
+        with buildah\| oc new-app should succeed\| prune builds based on settings\|
+        s2i build with a root\| verify /run filesystem contents\| oc can run\| oc
+        debug\| oc idle\| Pods cannot access\| Image append should create\| Image
+        extract should extract\| Image info should display\| Image layer subresource\|
+        oc tag should change image\| when installed on the cluster should\| OpenShift
+        alerting rules\| The HAProxy router should\| egressrouter cni resources\|
+        pod should start\| pod sysctls\| build volumes should mount given secrets
+        and configmaps into the build pod
     workflow: openshift-e2e-gcp-ovn
   timeout: 6h0m0s
 zz_generated_metadata:
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
index f5793d45df739..7c4c847e4f385 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
@@ -4015,7 +4015,7 @@ presubmits:
     name: pull-ci-openshift-installer-master-e2e-aws-ovn-heterogeneous
     optional: true
     rerun_command: /test e2e-aws-ovn-heterogeneous
-    skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^images/(agent|alibabacloud|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/)
+    run_if_changed: aws
     spec:
       containers:
       - args: