diff --git a/ci-operator/jobs/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.9-presubmits.yaml
index 7389c065b0c3b..bc5060d9694bf 100644
--- a/ci-operator/jobs/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/kubevirt/hyperconverged-cluster-operator/kubevirt-hyperconverged-cluster-operator-release-4.9-presubmits.yaml
@@ -1,7 +1,7 @@
 presubmits:
   kubevirt/hyperconverged-cluster-operator:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -14,6 +14,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-kubevirt-hyperconverged-cluster-operator-release-4.9-ci-index
     rerun_command: /test ci-index
+    run_if_changed: ^(build/.*|cmd/.*|deploy/crds/.*|deploy/index-image/.*|hack/.*|pkg/.*|Makefile|go\.mod|go\.sum)$
     spec:
       containers:
       - args:
@@ -49,7 +50,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -62,6 +63,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-kubevirt-hyperconverged-cluster-operator-release-4.9-ci-index-hco-upgrade-bundle
     rerun_command: /test ci-index-hco-upgrade-bundle
+    run_if_changed: ^(build/.*|cmd/.*|deploy/crds/.*|deploy/index-image/.*|hack/.*|pkg/.*|Makefile|go\.mod|go\.sum)$
     spec:
       containers:
       - args:
@@ -97,7 +99,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )ci-index-hco-upgrade-bundle,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -110,6 +112,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-kubevirt-hyperconverged-cluster-operator-release-4.9-ci-index-hco-upgrade-prev-bundle
     rerun_command: /test ci-index-hco-upgrade-prev-bundle
+    run_if_changed: ^(build/.*|cmd/.*|deploy/crds/.*|deploy/index-image/.*|hack/.*|pkg/.*|Makefile|go\.mod|go\.sum)$
     spec:
       containers:
       - args:
@@ -145,7 +148,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )ci-index-hco-upgrade-prev-bundle,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -158,6 +161,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-kubevirt-hyperconverged-cluster-operator-release-4.9-hco-e2e-image-index-aws
     rerun_command: /test hco-e2e-image-index-aws
+    run_if_changed: ^(build/.*|cmd/.*|deploy/crds/.*|deploy/index-image/.*|hack/.*|pkg/.*|tests/.*|Makefile|go\.mod|go\.sum)$
     spec:
       containers:
       - args:
@@ -211,7 +215,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )hco-e2e-image-index-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -224,6 +228,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-kubevirt-hyperconverged-cluster-operator-release-4.9-hco-e2e-image-index-azure
     rerun_command: /test hco-e2e-image-index-azure
+    run_if_changed: ^(build/.*|cmd/.*|deploy/crds/.*|deploy/index-image/.*|hack/.*|pkg/.*|tests/.*|Makefile|go\.mod|go\.sum)$
     spec:
       containers:
       - args:
@@ -277,7 +282,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )hco-e2e-image-index-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -290,6 +295,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-kubevirt-hyperconverged-cluster-operator-release-4.9-hco-e2e-image-index-gcp
     rerun_command: /test hco-e2e-image-index-gcp
+    run_if_changed: ^(build/.*|cmd/.*|deploy/crds/.*|deploy/index-image/.*|hack/.*|pkg/.*|tests/.*|Makefile|go\.mod|go\.sum)$
     spec:
       containers:
       - args:
@@ -345,7 +351,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )hco-e2e-image-index-gcp,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -358,6 +364,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-kubevirt-hyperconverged-cluster-operator-release-4.9-hco-e2e-kv-smoke-azure
     rerun_command: /test hco-e2e-kv-smoke-azure
+    run_if_changed: ^(build/.*|cmd/.*|deploy/crds/.*|deploy/index-image/.*|hack/.*|pkg/.*|tests/.*|Makefile|go\.mod|go\.sum)$
     spec:
       containers:
       - args:
@@ -411,7 +418,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )hco-e2e-kv-smoke-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -424,6 +431,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-kubevirt-hyperconverged-cluster-operator-release-4.9-hco-e2e-kv-smoke-gcp
     rerun_command: /test hco-e2e-kv-smoke-gcp
+    run_if_changed: ^(build/.*|cmd/.*|deploy/crds/.*|deploy/index-image/.*|hack/.*|pkg/.*|tests/.*|Makefile|go\.mod|go\.sum)$
     spec:
       containers:
       - args:
@@ -479,7 +487,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )hco-e2e-kv-smoke-gcp,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -492,6 +500,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-kubevirt-hyperconverged-cluster-operator-release-4.9-hco-e2e-upgrade-index-aws
     rerun_command: /test hco-e2e-upgrade-index-aws
+    run_if_changed: ^(build/.*|cmd/.*|deploy/crds/.*|deploy/index-image/.*|hack/.*|pkg/.*|Makefile|go\.mod|go\.sum)$
     spec:
       containers:
       - args:
@@ -545,7 +554,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )hco-e2e-upgrade-index-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -558,6 +567,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-kubevirt-hyperconverged-cluster-operator-release-4.9-hco-e2e-upgrade-index-azure
     rerun_command: /test hco-e2e-upgrade-index-azure
+    run_if_changed: ^(build/.*|cmd/.*|deploy/crds/.*|deploy/index-image/.*|hack/.*|pkg/.*|Makefile|go\.mod|go\.sum)$
     spec:
       containers:
       - args:
@@ -611,7 +621,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )hco-e2e-upgrade-index-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -624,6 +634,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-kubevirt-hyperconverged-cluster-operator-release-4.9-hco-e2e-upgrade-prev-index-aws
     rerun_command: /test hco-e2e-upgrade-prev-index-aws
+    run_if_changed: ^(build/.*|cmd/.*|deploy/crds/.*|deploy/index-image/.*|hack/.*|pkg/.*|Makefile|go\.mod|go\.sum)$
     spec:
       containers:
       - args:
@@ -677,7 +688,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )hco-e2e-upgrade-prev-index-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -690,6 +701,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-kubevirt-hyperconverged-cluster-operator-release-4.9-hco-e2e-upgrade-prev-index-azure
     rerun_command: /test hco-e2e-upgrade-prev-index-azure
+    run_if_changed: ^(build/.*|cmd/.*|deploy/crds/.*|deploy/index-image/.*|hack/.*|pkg/.*|Makefile|go\.mod|go\.sum)$
     spec:
       containers:
       - args:
@@ -743,7 +755,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )hco-e2e-upgrade-prev-index-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -756,6 +768,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-kubevirt-hyperconverged-cluster-operator-release-4.9-images
     rerun_command: /test images
+    run_if_changed: ^(build/.*|cmd/.*|deploy/crds/.*|deploy/index-image/.*|hack/.*|pkg/.*|Makefile|go\.mod|go\.sum)$
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift-psap/ci-artifacts/openshift-psap-ci-artifacts-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift-psap/ci-artifacts/openshift-psap-ci-artifacts-release-4.9-presubmits.yaml
index b76533a2a0102..655e55ac01ad8 100644
--- a/ci-operator/jobs/openshift-psap/ci-artifacts/openshift-psap-ci-artifacts-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift-psap/ci-artifacts/openshift-psap-ci-artifacts-release-4.9-presubmits.yaml
@@ -49,3 +49,30 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.9
+    cluster: build01
+    context: ci/prow/yamllint
+    decorate: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-psap-ci-artifacts-yamllint
+    rerun_command: /test yamllint
+    spec:
+      containers:
+      - args:
+        - -c
+        - config/yamllint.conf
+        - playbooks
+        - roles
+        command:
+        - yamllint
+        image: quay.io/kubermatic/yamllint:0.1
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+    trigger: (?m)^/test( | .* )yamllint,?($|\s.*)
diff --git a/ci-operator/jobs/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-release-4.9-presubmits.yaml
index 2b2f6229bdce9..c8e260b464eb1 100644
--- a/ci-operator/jobs/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-release-4.9-presubmits.yaml
@@ -1,7 +1,7 @@
 presubmits:
   openshift-psap/special-resource-operator:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
diff --git a/ci-operator/jobs/openshift/baremetal-operator/openshift-baremetal-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/baremetal-operator/openshift-baremetal-operator-release-4.9-presubmits.yaml
index fa7f4f674ba8b..9030c7487c14b 100644
--- a/ci-operator/jobs/openshift/baremetal-operator/openshift-baremetal-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/baremetal-operator/openshift-baremetal-operator-release-4.9-presubmits.yaml
@@ -1,7 +1,7 @@
 presubmits:
   openshift/baremetal-operator:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -11,6 +11,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-baremetal-operator-release-4.9-e2e-metal-ipi
+    optional: true
     path_alias: github.com/metal3-io/baremetal-operator
     rerun_command: /test e2e-metal-ipi
     spec:
@@ -68,7 +69,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -78,6 +79,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-baremetal-operator-release-4.9-e2e-metal-ipi-ovn-dualstack
+    optional: true
     path_alias: github.com/metal3-io/baremetal-operator
     rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
@@ -269,7 +271,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-serial-ipv4,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
diff --git a/ci-operator/jobs/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-master-presubmits.yaml b/ci-operator/jobs/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-master-presubmits.yaml
index dce9fc84adf7d..701c45d9d79ed 100644
--- a/ci-operator/jobs/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-master-presubmits.yaml
@@ -207,8 +207,6 @@ presubmits:
     cluster: build01
     context: ci/prow/e2e-openstack
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-baremetal-runtimecfg-master-e2e-openstack
diff --git a/ci-operator/jobs/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.9-presubmits.yaml
index 265f9bb1b7c00..2262ef86ddd84 100644
--- a/ci-operator/jobs/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.9-presubmits.yaml
@@ -11,6 +11,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-baremetal-runtimecfg-release-4.9-e2e-metal-ipi
+    optional: true
     rerun_command: /test e2e-metal-ipi
     spec:
       containers:
@@ -67,7 +68,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -77,6 +78,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-baremetal-runtimecfg-release-4.9-e2e-metal-ipi-ovn-dualstack
+    optional: true
     rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
       containers:
@@ -198,6 +200,79 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - release-4.9
+    cluster: build01
+    context: ci/prow/e2e-openstack
+    decorate: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-baremetal-runtimecfg-release-4.9-e2e-openstack
+    optional: true
+    rerun_command: /test e2e-openstack
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --repo=baremetal-runtimecfg
+        - --secret-dir=/usr/local/e2e-openstack-cluster-profile
+        - --target=e2e-openstack
+        - --template=/usr/local/e2e-openstack
+        command:
+        - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: openstack
+        - name: JOB_NAME_SAFE
+          value: e2e-openstack
+        - name: TEST_COMMAND
+          value: run-minimal-tests
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack
+          name: job-definition
+          subPath: cluster-launch-installer-openstack-e2e.yaml
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-openstack
+      - configMap:
+          name: prow-job-cluster-launch-installer-openstack-e2e
+        name: job-definition
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+    trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.9-presubmits.yaml
index 49f9d3cee36c3..3bf3405669c0d 100644
--- a/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.9-presubmits.yaml
@@ -1,7 +1,7 @@
 presubmits:
   openshift/cloud-credential-operator:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -12,6 +12,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cloud-credential-operator-release-4.9-coverage
     rerun_command: /test coverage
+    run_if_changed: \.go$
     spec:
       containers:
       - args:
@@ -54,7 +55,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )coverage,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -65,6 +66,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cloud-credential-operator-release-4.9-e2e-aws
     rerun_command: /test e2e-aws
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -118,7 +120,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -128,6 +130,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cloud-credential-operator-release-4.9-e2e-aws-manual-oidc
+    optional: true
     rerun_command: /test e2e-aws-manual-oidc
     spec:
       containers:
@@ -391,7 +394,7 @@ presubmits:
           secretName: registry-pull-credentials
     trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -402,6 +405,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cloud-credential-operator-release-4.9-e2e-upgrade
     rerun_command: /test e2e-upgrade
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -455,7 +459,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -466,6 +470,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cloud-credential-operator-release-4.9-images
     rerun_command: /test images
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -501,7 +506,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -512,6 +517,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cloud-credential-operator-release-4.9-unit
     rerun_command: /test unit
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -547,7 +553,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )unit,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -558,6 +564,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cloud-credential-operator-release-4.9-verify
     rerun_command: /test verify
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -593,7 +600,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )verify,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -604,6 +611,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cloud-credential-operator-release-4.9-verify-deps
     rerun_command: /test verify-deps
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.9-presubmits.yaml
index 0373e0f7e5f36..f052475e15415 100644
--- a/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.9-presubmits.yaml
@@ -76,6 +76,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cloud-provider-openstack-release-4.9-e2e-openstack-csi-cinder
+    optional: true
     path_alias: k8s.io/cloud-provider-openstack
     rerun_command: /test e2e-openstack-csi-cinder
     run_if_changed: ^pkg/csi/cinder/
diff --git a/ci-operator/jobs/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.9-presubmits.yaml
index 6f1131b8ee348..9ffeeddd2ef61 100644
--- a/ci-operator/jobs/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-api-provider-azure/openshift-cluster-api-provider-azure-release-4.9-presubmits.yaml
@@ -136,7 +136,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -148,6 +148,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-api-provider-azure-release-4.9-e2e-upgrade
+    optional: true
     path_alias: sigs.k8s.io/cluster-api-provider-azure
     rerun_command: /test e2e-upgrade
     spec:
diff --git a/ci-operator/jobs/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.9-presubmits.yaml
index 03014c39b48a7..03a4392a1ebfd 100644
--- a/ci-operator/jobs/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-release-4.9-presubmits.yaml
@@ -11,6 +11,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-api-provider-baremetal-release-4.9-e2e-metal-ipi
+    optional: true
     rerun_command: /test e2e-metal-ipi
     spec:
       containers:
@@ -77,6 +78,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-api-provider-baremetal-release-4.9-e2e-metal-ipi-ovn-dualstack
+    optional: true
     rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
       containers:
@@ -209,6 +211,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-api-provider-baremetal-release-4.9-e2e-metal-ipi-upgrade
+    optional: true
     rerun_command: /test e2e-metal-ipi-upgrade
     spec:
       containers:
@@ -275,6 +278,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-api-provider-baremetal-release-4.9-e2e-metal-ipi-virtualmedia
+    optional: true
     rerun_command: /test e2e-metal-ipi-virtualmedia
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.9-presubmits.yaml
index bf7432ce7fff5..dbbf3ab54da73 100644
--- a/ci-operator/jobs/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-release-4.9-presubmits.yaml
@@ -11,7 +11,6 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-api-provider-gcp-release-4.9-e2e-gcp
-    optional: true
     rerun_command: /test e2e-gcp
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.9-presubmits.yaml
index 563cfba596e1c..cd7924ca551a1 100644
--- a/ci-operator/jobs/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.9-presubmits.yaml
@@ -54,6 +54,8 @@ presubmits:
     cluster: build02
     context: ci/prow/e2e-libvirt
     decorate: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-api-provider-libvirt-release-4.9-e2e-libvirt
     rerun_command: /test e2e-libvirt
     spec:
@@ -77,6 +79,134 @@ presubmits:
           value: |
             cat >tests <<EOTESTS
             "[Conformance][Area:Networking][Feature:Router] The HAProxy router should override the route host for overridden domains with a custom value [Suite:openshift/conformance/parallel/minimal]"
+            "[Conformance][Area:Networking][Feature:Router] The HAProxy router should override the route host with a custom value [Suite:openshift/conformance/parallel/minimal]"
+            "[Conformance][Area:Networking][Feature:Router] The HAProxy router should run even if it has no access to update status [Suite:openshift/conformance/parallel/minimal]"
+            "[Conformance][templates] templateinstance creation with invalid object reports error  should report a failure on creation [Suite:openshift/conformance/parallel/minimal]"
+            "[Conformance][templates] templateinstance cross-namespace test should create and delete objects across namespaces [Suite:openshift/conformance/parallel/minimal]"
+            "[Conformance][templates] templateinstance impersonation tests should pass impersonation creation tests [Suite:openshift/conformance/parallel/minimal]"
+            "[Conformance][templates] templateinstance impersonation tests should pass impersonation deletion tests [Suite:openshift/conformance/parallel/minimal]"
+            "[Conformance][templates] templateinstance impersonation tests should pass impersonation update tests [Suite:openshift/conformance/parallel/minimal]"
+            "[Conformance][templates] templateinstance object kinds test should create and delete objects from varying API groups [Suite:openshift/conformance/parallel/minimal]"
+            "[Conformance][templates] templateinstance security tests  should pass security tests [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:AnnotationTrigger] Annotation trigger reconciles after the image is overwritten [Suite:openshift/conformance/parallel]"
+            "[Feature:Builds] buildconfig secret injector  should inject secrets to the appropriate buildconfigs [Suite:openshift/conformance/parallel]"
+            "[Feature:Builds][Conformance] imagechangetriggers  imagechangetriggers should trigger builds of all types [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:Builds][Conformance] oc new-app  should fail with a --name longer than 58 characters [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:Builds][Conformance] remove all builds when build configuration is removed  oc delete buildconfig should start builds and delete the buildconfig [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:Builds][Conformance] s2i build with a quota  Building from a template should create an s2i build with a quota and run it [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:Builds][Conformance][valueFrom] process valueFrom in build strategy environment variables  should fail resolving unresolvable valueFrom in docker build environment variable references [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:Builds][Conformance][valueFrom] process valueFrom in build strategy environment variables  should fail resolving unresolvable valueFrom in sti build environment variable references [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:Builds][pruning] prune builds based on settings in the buildconfig  [Conformance] buildconfigs should have a default history limit set when created via the group api [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:Builds][pruning] prune builds based on settings in the buildconfig  should prune builds after a buildConfig change [Suite:openshift/conformance/parallel]"
+            "[Feature:Builds][pruning] prune builds based on settings in the buildconfig  should prune canceled builds based on the failedBuildsHistoryLimit setting [Suite:openshift/conformance/parallel]"
+            "[Feature:Builds][pruning] prune builds based on settings in the buildconfig  should prune errored builds based on the failedBuildsHistoryLimit setting [Suite:openshift/conformance/parallel]"
+            "[Feature:Builds][pullsecret][Conformance] docker build using a pull secret  Building from a template should create a docker build that pulls using a secret run it [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:DeploymentConfig] deploymentconfigs ignores deployer and lets the config with a NewReplicationControllerCreated reason [Conformance] should let the deployment config with a NewReplicationControllerCreated reason [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:DeploymentConfig] deploymentconfigs initially [Conformance] should not deploy if pods never transition to ready [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:DeploymentConfig] deploymentconfigs should respect image stream tag reference policy [Conformance] resolve the image pull spec [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:DeploymentConfig] deploymentconfigs when run iteratively [Conformance] should immediately start a new deployment [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:DeploymentConfig] deploymentconfigs with env in params referencing the configmap [Conformance] should expand the config map key to a value [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:ImageLayers][registry] Image layer subresource should identify a deleted image as missing [Suite:openshift/conformance/parallel]"
+            "[Feature:ImageLookup][registry][Conformance] Image policy should perform lookup when the pod has the resolve-names annotation [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:ImageLookup][registry][Conformance] Image policy should update standard Kube object image fields when local names are on [Suite:openshift/conformance/parallel/minimal]"
+            "[Feature:Machines][Smoke] Managed cluster should have machine resources [Suite:openshift/conformance/parallel]"
+            "[Feature:Platform] Managed cluster should have operators on the cluster version [Suite:openshift/conformance/parallel]"
+            "[Feature:Platform] OLM should list catalogsources [Suite:openshift/conformance/parallel]"
+            "[Feature:Platform] OLM should list clusterserviceversions [Suite:openshift/conformance/parallel]"
+            "[Feature:Platform] OLM should list installplans [Suite:openshift/conformance/parallel]"
+            "[Feature:Platform] OLM should list operatorgroups [Suite:openshift/conformance/parallel]"
+            "[Feature:Platform] OLM should list packagemanifests [Suite:openshift/conformance/parallel]"
+            "[Feature:Platform] OLM should list subscriptions [Suite:openshift/conformance/parallel]"
+            "[Feature:Platform][Smoke] Managed cluster should ensure pods use images from our release image with proper ImagePullPolicy [Suite:openshift/conformance/parallel]"
+            "[Feature:Platform][Smoke] Managed cluster should start all core operators [Suite:openshift/conformance/parallel]"
+            "[k8s.io] Container Runtime blackbox test when running a container with a new image should be able to pull from private registry with secret [NodeConformance] [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[k8s.io] Container Runtime blackbox test when running a container with a new image should be able to pull image from docker hub [NodeConformance] [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[k8s.io] Container Runtime blackbox test when starting a container that exits should report termination message from log output if TerminationMessagePolicy FallbackToLogOnError is set [NodeConformance] [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[k8s.io] Container Runtime blackbox test when starting a container that exits should report termination message if TerminationMessagePath is set as non-root user and at a non-default path [NodeConformance] [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[k8s.io] Docker Containers should be able to override the image's default arguments (docker cmd) [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[k8s.io] InitContainer [NodeConformance] should invoke init containers on a RestartAlways pod [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[k8s.io] InitContainer [NodeConformance] should not start app containers and fail the pod if init containers fail on a RestartNever pod [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[k8s.io] Pods should be submitted and removed [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[k8s.io] Probing container with readiness probe should not be ready before initial delay and never restart [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[k8s.io] Probing container with readiness probe that fails should never be ready and never restart [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[k8s.io] Security Context When creating a container with runAsUser should run the container with uid 0 [NodeConformance] [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[k8s.io] Security Context When creating a pod with privileged should run the container as unprivileged when false [NodeConformance] [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[k8s.io] Security Context When creating a pod with readOnlyRootFilesystem should run the container with readonly rootfs when readOnlyRootFilesystem=true [NodeConformance] [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[k8s.io] Security Context when creating containers with AllowPrivilegeEscalation should not allow privilege escalation when false [NodeConformance] [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[k8s.io] Variable Expansion should allow composing env vars into new env vars [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[k8s.io] Variable Expansion should allow substituting values in a container's command [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[k8s.io] [sig-node] Pods Extended [k8s.io] Pods Set QOS Class should be submitted and removed  [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[k8s.io] [sig-node] Security Context [Feature:SecurityContext] should support pod.Spec.SecurityContext.SupplementalGroups [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[k8s.io] [sig-node] Security Context [Feature:SecurityContext] should support seccomp alpha unconfined annotation on the container [Feature:Seccomp] [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[k8s.io] [sig-node] Security Context [Feature:SecurityContext] should support seccomp alpha unconfined annotation on the pod [Feature:Seccomp] [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[k8s.io] [sig-node] Security Context [Feature:SecurityContext] should support seccomp default which is unconfined [Feature:Seccomp] [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-api-machinery] Garbage collector should orphan RS created by deployment when deleteOptions.PropagationPolicy is Orphan [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-api-machinery] Generated clientset should create v1beta1 cronJobs, delete cronJobs, watch cronJobs [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-api-machinery] Servers with support for API chunking should return chunks of results for list calls [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-api-machinery] Servers with support for Table transformation should return a 406 for a backend which does not implement metadata [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-api-machinery] Servers with support for Table transformation should return chunks of table results for list calls [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-api-machinery] Watchers should be able to restart watching from the last resource version observed by the previous watch [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-api-machinery] Watchers should be able to start watching from a specific resource version [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-api-machinery] Watchers should observe add, update, and delete watch notifications on configmaps [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-apps] CronJob should remove from active list jobs that have been deleted [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-apps] Deployment RollingUpdateDeployment should delete old pods and create new ones [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-apps] Deployment deployment reaping should cascade to its replica sets and pods [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-apps] Deployment deployment should delete old replica sets [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-apps] Deployment deployment should support proportional scaling [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-apps] Deployment iterative rollouts should eventually progress [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-apps] DisruptionController evictions: maxUnavailable deny evictions, integer => should not allow an eviction [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-apps] DisruptionController evictions: no PDB => should allow an eviction [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-apps] DisruptionController evictions: too few pods, replicaSet, percentage => should not allow an eviction [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-apps] DisruptionController should update PodDisruptionBudget status [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-apps] Job should delete a job [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-apps] StatefulSet [k8s.io] Basic StatefulSet functionality [StatefulSetBasic] Should recreate evicted statefulset [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-auth] Certificates API should support building a client with a CSR [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-auth] ServiceAccounts should allow opting out of API token automount  [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-auth] [Feature:NodeAuthorizer] A node shouldn't be able to create another node [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-auth] [Feature:NodeAuthorizer] A node shouldn't be able to delete another node [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-auth] [Feature:NodeAuthorizer] Getting a non-existent secret should exit with the Forbidden error, not a NotFound error [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-cli] Kubectl client [k8s.io] Kubectl apply should reuse port when apply to an existing SVC [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-cli] Kubectl client [k8s.io] Kubectl run default should create an rc or deployment from an image  [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-cli] Kubectl client [k8s.io] Kubectl run job should create a job from an image when restart is OnFailure  [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-cli] Kubectl client [k8s.io] Kubectl run pod should create a pod from an image when restart is Never  [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-cli] Kubectl client [k8s.io] Kubectl version should check is all data is printed  [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-cli] Kubectl client [k8s.io] Proxy server should support --unix-socket=/path  [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-cli] Kubectl client [k8s.io] Simple pod should support exec [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-cli] Kubectl client [k8s.io] Simple pod should support exec through kubectl proxy [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-cli] Kubectl client [k8s.io] Simple pod should support port-forward [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-cli] Kubectl client [k8s.io] Update Demo should scale a replication controller  [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-instrumentation] MetricsGrabber should grab all metrics from a Kubelet. [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-network] DNS should support configurable pod resolv.conf [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-network] Networking Granular Checks: Pods should function for intra-pod communication: http [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-network] Services should be able to update NodePorts with two same port numbers but different protocols [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-network] Services should check NodePort out-of-range [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-network] Services should use same NodePort with same port but different protocols [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-scheduling] ResourceQuota [Feature:PodPriority] should verify ResourceQuota's priority class scope (cpu, memory quota set) against a pod with same priority class. [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-scheduling] ResourceQuota [Feature:ScopeSelectors] should verify ResourceQuota with terminating scopes through scope selectors. [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-scheduling] ResourceQuota should create a ResourceQuota and capture the life of a persistent volume claim with a storage class. [sig-storage] [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-scheduling] ResourceQuota should create a ResourceQuota and capture the life of a replication controller. [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-scheduling] ResourceQuota should verify ResourceQuota with best effort scope. [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-scheduling] ResourceQuota should verify ResourceQuota with terminating scopes. [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-storage] ConfigMap binary data should be reflected in volume [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-storage] ConfigMap should be consumable from pods in volume [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-storage] ConfigMap should be consumable from pods in volume with mappings and Item mode set [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-storage] ConfigMap should be consumable from pods in volume with mappings as non-root [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-storage] Downward API volume should provide container's cpu request [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-storage] Downward API volume should provide podname as non-root with fsgroup [NodeFeature:FSGroup] [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-storage] Downward API volume should provide podname as non-root with fsgroup and defaultMode [NodeFeature:FSGroup] [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-storage] EmptyDir volumes should support (non-root,0644,tmpfs) [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-storage] EmptyDir volumes should support (root,0644,tmpfs) [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-storage] EmptyDir volumes volume on tmpfs should have the correct mode [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-storage] EmptyDir volumes when FSGroup is specified [NodeFeature:FSGroup] volume on tmpfs should have the correct mode using FSGroup [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-storage] Ephemeralstorage When pod refers to non-existent ephemeral storage should allow deletion of pod with invalid volume : configmap [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-storage] Ephemeralstorage When pod refers to non-existent ephemeral storage should allow deletion of pod with invalid volume : secret [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-storage] In-tree Volumes [Driver: emptydir] [Testpattern: Inline-volume (default fs)] subPath should support readOnly directory specified in the volumeMount [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-storage] In-tree Volumes [Driver: hostPath] [Testpattern: Inline-volume (default fs)] subPath should be able to unmount after the subpath directory is deleted [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-storage] In-tree Volumes [Driver: hostPath] [Testpattern: Inline-volume (default fs)] subPath should support existing single file [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-storage] In-tree Volumes [Driver: hostPath] [Testpattern: Inline-volume (default fs)] subPath should support file as subpath [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-storage] In-tree Volumes [Driver: hostPath] [Testpattern: Inline-volume (default fs)] subPath should support non-existent path [Suite:openshift/conformance/parallel] [Suite:k8s]"
+            "[sig-storage] Secrets should be consumable from pods in volume with mappings [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
+            "[sig-storage] Subpath Atomic writer volumes should support subpaths with downward pod [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]"
             EOTESTS
             TEST_SUITE="--file=tests" run-tests
         image: ci-operator:latest
diff --git a/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.9-presubmits.yaml
index 649f0a29886ad..ac734dc417dd5 100644
--- a/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.9-presubmits.yaml
@@ -132,7 +132,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-openstack-parallel,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -142,6 +142,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-api-provider-openstack-release-4.9-e2e-upgrade
+    optional: true
     path_alias: sigs.k8s.io/cluster-api-provider-openstack
     rerun_command: /test e2e-upgrade
     spec:
diff --git a/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.9-presubmits.yaml
index f3eb3972a4253..167fa165fa67c 100644
--- a/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.9-presubmits.yaml
@@ -75,6 +75,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-authentication-operator-release-4.9-e2e-agnostic-ipv6
+    optional: true
     rerun_command: /test e2e-agnostic-ipv6
     spec:
       containers:
@@ -195,7 +196,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -205,6 +206,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-authentication-operator-release-4.9-e2e-aws-single-node
+    optional: true
     rerun_command: /test e2e-aws-single-node
     spec:
       containers:
@@ -325,7 +327,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-console-login,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -336,6 +338,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-authentication-operator-release-4.9-e2e-gcp-operator-encryption-perf
     rerun_command: /test e2e-gcp-operator-encryption-perf
+    run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-perf)|^(test/library/encryption)
     spec:
       containers:
       - args:
@@ -391,7 +394,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-operator-encryption-perf,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -402,6 +405,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-authentication-operator-release-4.9-e2e-gcp-operator-encryption-rotation
     rerun_command: /test e2e-gcp-operator-encryption-rotation
+    run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-rotation)|^(test/library/encryption)
     spec:
       containers:
       - args:
@@ -523,7 +527,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-operator,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -534,6 +538,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-authentication-operator-release-4.9-e2e-operator-encryption
     rerun_command: /test e2e-operator-encryption
+    run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption)|^(test/library/encryption)
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9-presubmits.yaml
index e1367c49da10f..120f0898e4fc4 100644
--- a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9-presubmits.yaml
@@ -65,7 +65,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -75,6 +75,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-baremetal-operator-release-4.9-e2e-aws
+    optional: true
     rerun_command: /test e2e-aws
     spec:
       containers:
@@ -129,7 +130,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -139,6 +140,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-baremetal-operator-release-4.9-e2e-metal-assisted
+    optional: true
     rerun_command: /test e2e-metal-assisted
     spec:
       containers:
@@ -261,7 +263,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -271,6 +273,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-baremetal-operator-release-4.9-e2e-metal-ipi-ovn-dualstack
+    optional: true
     rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
       containers:
@@ -459,7 +462,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-serial-ipv4,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -469,6 +472,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-baremetal-operator-release-4.9-e2e-metal-ipi-upgrade
+    optional: true
     rerun_command: /test e2e-metal-ipi-upgrade
     spec:
       containers:
@@ -525,7 +529,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -535,6 +539,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-baremetal-operator-release-4.9-e2e-metal-ipi-virtualmedia
+    optional: true
     rerun_command: /test e2e-metal-ipi-virtualmedia
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.9-presubmits.yaml
index b1c1cfdd9abb3..7200db2626387 100644
--- a/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.9-presubmits.yaml
@@ -65,7 +65,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -75,6 +75,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-bootstrap-release-4.9-e2e-metal-single-node-live-iso
+    optional: true
     rerun_command: /test e2e-metal-single-node-live-iso
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.9-presubmits.yaml
index 838535f1f8136..c225c6814e1ad 100644
--- a/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.9-presubmits.yaml
@@ -79,6 +79,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-cloud-controller-manager-operator-release-4.9-e2e-aws-ccm
+    optional: true
     rerun_command: /test e2e-aws-ccm
     spec:
       containers:
@@ -133,7 +134,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-ccm,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -145,6 +146,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-cloud-controller-manager-operator-release-4.9-e2e-aws-ccm-install
+    optional: true
     rerun_command: /test e2e-aws-ccm-install
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.9-presubmits.yaml
index e1d6257d5cb17..22af3152896c7 100644
--- a/ci-operator/jobs/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.9-presubmits.yaml
@@ -65,7 +65,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -75,6 +75,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-config-operator-release-4.9-e2e-azure
+    optional: true
     rerun_command: /test e2e-azure
     spec:
       containers:
@@ -129,7 +130,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -139,6 +140,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-config-operator-release-4.9-e2e-gcp
+    optional: true
     rerun_command: /test e2e-gcp
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.9-presubmits.yaml
index 27c892be1197f..7d3edaaafc828 100644
--- a/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.9-presubmits.yaml
@@ -193,7 +193,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -203,6 +203,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-dns-operator-release-4.9-e2e-aws-single-node
+    optional: true
     rerun_command: /test e2e-aws-single-node
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9-presubmits.yaml
index 76e7dde0dc20c..a67220f2e608c 100644
--- a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9-presubmits.yaml
@@ -1,7 +1,7 @@
 presubmits:
   openshift/cluster-etcd-operator:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -260,7 +260,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -325,7 +325,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -390,7 +390,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-disruptive-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -400,6 +400,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-etcd-operator-release-4.9-e2e-aws-single-node
+    optional: true
     rerun_command: /test e2e-aws-single-node
     spec:
       containers:
@@ -586,7 +587,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -653,7 +654,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -720,7 +721,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-disruptive-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -853,7 +854,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-five-control-plane-replicas,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -863,6 +864,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-etcd-operator-release-4.9-e2e-gcp-upgrade-five-control-plane-replicas
+    optional: true
     rerun_command: /test e2e-gcp-upgrade-five-control-plane-replicas
     spec:
       containers:
@@ -1053,7 +1055,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -1063,6 +1065,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-etcd-operator-release-4.9-e2e-metal-single-node-live-iso
+    optional: true
     rerun_command: /test e2e-metal-single-node-live-iso
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.9-presubmits.yaml
index cddf31ee1bf8d..92199d4588fd2 100644
--- a/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.9-presubmits.yaml
@@ -527,7 +527,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -537,6 +537,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-image-registry-operator-release-4.9-e2e-ovirt
+    optional: true
     rerun_command: /test e2e-ovirt
     spec:
       containers:
@@ -667,6 +668,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-image-registry-operator-release-4.9-e2e-vsphere
+    optional: true
     rerun_command: /test e2e-vsphere
     run_if_changed: ^(.*(vsphere|baremetal).*)\.go$
     spec:
diff --git a/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.9-presubmits.yaml
index 2403f141cdec5..f3a4926d204c2 100644
--- a/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.9-presubmits.yaml
@@ -129,7 +129,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -139,6 +139,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-ingress-operator-release-4.9-e2e-aws-single-node
+    optional: true
     rerun_command: /test e2e-aws-single-node
     spec:
       containers:
@@ -258,7 +259,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -268,6 +269,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-ingress-operator-release-4.9-e2e-azure-operator
+    optional: true
     rerun_command: /test e2e-azure-operator
     spec:
       containers:
@@ -322,7 +324,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure-operator,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -332,6 +334,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-ingress-operator-release-4.9-e2e-gcp-operator
+    optional: true
     rerun_command: /test e2e-gcp-operator
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.9-presubmits.yaml
index e55eebd32b46b..bce334d3f8864 100644
--- a/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.9-presubmits.yaml
@@ -139,6 +139,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.9-e2e-aws-single-node
+    optional: true
     rerun_command: /test e2e-aws-single-node
     spec:
       containers:
@@ -259,7 +260,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-operator,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -270,6 +271,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.9-e2e-gcp-operator-encryption
     rerun_command: /test e2e-gcp-operator-encryption
+    run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption)|^(test/library/encryption)
     spec:
       containers:
       - args:
@@ -325,7 +327,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-operator-encryption,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -336,6 +338,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.9-e2e-gcp-operator-encryption-perf
     rerun_command: /test e2e-gcp-operator-encryption-perf
+    run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-perf)|^(test/library/encryption)
     spec:
       containers:
       - args:
@@ -391,7 +394,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-operator-encryption-perf,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -402,6 +405,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.9-e2e-gcp-operator-encryption-rotation
     rerun_command: /test e2e-gcp-operator-encryption-rotation
+    run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-rotation)|^(test/library/encryption)
     spec:
       containers:
       - args:
@@ -457,7 +461,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-operator-encryption-rotation,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -467,6 +471,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.9-e2e-metal-single-node-live-iso
+    optional: true
     rerun_command: /test e2e-metal-single-node-live-iso
     spec:
       containers:
@@ -709,6 +714,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-kube-apiserver-operator-release-4.9-k8s-e2e-gcp-serial
+    optional: true
     rerun_command: /test k8s-e2e-gcp-serial
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.9-presubmits.yaml
index 225d0e9e89ffd..6857d45cadd18 100644
--- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.9-presubmits.yaml
@@ -75,6 +75,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-machine-approver-release-4.9-e2e-aws-disruptive
+    optional: true
     rerun_command: /test e2e-aws-disruptive
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.9-presubmits.yaml
index 05a439ffcc080..b38fc19cb2ca4 100644
--- a/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.9-presubmits.yaml
@@ -203,6 +203,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-monitoring-operator-release-4.9-e2e-aws-single-node
+    optional: true
     rerun_command: /test e2e-aws-single-node
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml
index 0d00ee8c4a839..55d2e56c11d94 100644
--- a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml
@@ -661,8 +661,6 @@ presubmits:
     cluster: build02
     context: ci/prow/e2e-openstack-ovn
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-network-operator-master-e2e-openstack-ovn
diff --git a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.9-presubmits.yaml
index 8eb67903eb6de..c111251f2d8fc 100644
--- a/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.9-presubmits.yaml
@@ -203,6 +203,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-network-operator-release-4.9-e2e-azure-ovn
+    optional: true
     rerun_command: /test e2e-azure-ovn
     spec:
       containers:
@@ -257,7 +258,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -267,6 +268,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-network-operator-release-4.9-e2e-azure-ovn-dualstack
+    optional: true
     rerun_command: /test e2e-azure-ovn-dualstack
     spec:
       containers:
@@ -596,6 +598,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-network-operator-release-4.9-e2e-metal-ipi-ovn-ipv6-ipsec
+    optional: true
     rerun_command: /test e2e-metal-ipi-ovn-ipv6-ipsec
     spec:
       containers:
@@ -651,6 +654,83 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6-ipsec,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.9
+    cluster: build02
+    context: ci/prow/e2e-openstack-ovn
+    decorate: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-network-operator-release-4.9-e2e-openstack-ovn
+    optional: true
+    rerun_command: /test e2e-openstack-ovn
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --repo=cluster-network-operator
+        - --secret-dir=/usr/local/e2e-openstack-ovn-cluster-profile
+        - --target=e2e-openstack-ovn
+        - --template=/usr/local/e2e-openstack-ovn
+        command:
+        - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: openstack
+        - name: CLUSTER_VARIANT
+          value: ovn
+        - name: JOB_NAME_SAFE
+          value: e2e-openstack-ovn
+        - name: KURYR_ENABLED
+          value: "false"
+        - name: TEST_COMMAND
+          value: TEST_SUITE=openshift/conformance/parallel run-tests
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-ovn-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-ovn
+          name: job-definition
+          subPath: cluster-launch-installer-openstack-e2e.yaml
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-openstack
+      - configMap:
+          name: prow-job-cluster-launch-installer-openstack-e2e
+        name: job-definition
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+    trigger: (?m)^/test( | .* )e2e-openstack-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -662,6 +742,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-network-operator-release-4.9-e2e-ovn-hybrid-step-registry
+    optional: true
     rerun_command: /test e2e-ovn-hybrid-step-registry
     spec:
       containers:
@@ -726,6 +807,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-network-operator-release-4.9-e2e-ovn-ipsec-step-registry
+    optional: true
     rerun_command: /test e2e-ovn-ipsec-step-registry
     spec:
       containers:
@@ -790,6 +872,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-network-operator-release-4.9-e2e-ovn-step-registry
+    optional: true
     rerun_command: /test e2e-ovn-step-registry
     spec:
       containers:
@@ -854,6 +937,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-network-operator-release-4.9-e2e-vsphere-ovn
+    optional: true
     rerun_command: /test e2e-vsphere-ovn
     spec:
       containers:
@@ -918,6 +1002,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-network-operator-release-4.9-e2e-vsphere-windows
+    optional: true
     rerun_command: /test e2e-vsphere-windows
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.9-presubmits.yaml
index 140426c891af2..853ddfbe48535 100644
--- a/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.9-presubmits.yaml
@@ -129,7 +129,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -140,6 +140,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-openshift-apiserver-operator-release-4.9-e2e-gcp-operator-encryption
     rerun_command: /test e2e-gcp-operator-encryption
+    run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption)|^(test/library/encryption)
     spec:
       containers:
       - args:
@@ -195,7 +196,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-operator-encryption,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -206,6 +207,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-openshift-apiserver-operator-release-4.9-e2e-gcp-operator-encryption-rotation
     rerun_command: /test e2e-gcp-operator-encryption-rotation
+    run_if_changed: ^(vendor/github.com/openshift/library-go/pkg/operator/encryption)|^(test/e2e-encryption-rotation)|^(test/library/encryption)
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master-presubmits.yaml
index 0f15fc4e1a864..57f44236d8c6c 100644
--- a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-master-presubmits.yaml
@@ -463,8 +463,6 @@ presubmits:
     cluster: build02
     context: ci/prow/e2e-openstack
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-storage-operator-master-e2e-openstack
diff --git a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.9-presubmits.yaml
index cbff4fd4ca600..6f2e5e9c17838 100644
--- a/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.9-presubmits.yaml
@@ -457,7 +457,80 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-csi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
+    branches:
+    - release-4.9
+    cluster: build02
+    context: ci/prow/e2e-openstack
+    decorate: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-storage-operator-release-4.9-e2e-openstack
+    optional: true
+    rerun_command: /test e2e-openstack
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --repo=cluster-storage-operator
+        - --secret-dir=/usr/local/e2e-openstack-cluster-profile
+        - --target=e2e-openstack
+        - --template=/usr/local/e2e-openstack
+        command:
+        - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: openstack
+        - name: JOB_NAME_SAFE
+          value: e2e-openstack
+        - name: TEST_COMMAND
+          value: run-minimal-tests
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack
+          name: job-definition
+          subPath: cluster-launch-installer-openstack-e2e.yaml
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-openstack
+      - configMap:
+          name: prow-job-cluster-launch-installer-openstack-e2e
+        name: job-definition
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+    trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -467,6 +540,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-storage-operator-release-4.9-e2e-ovirt
+    optional: true
     rerun_command: /test e2e-ovirt
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9-presubmits.yaml
index 947d32155ffbf..d8ae986c57502 100644
--- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9-presubmits.yaml
@@ -1,7 +1,7 @@
 presubmits:
   openshift/cluster-version-operator:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -12,6 +12,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-version-operator-release-4.9-e2e-agnostic
     rerun_command: /test e2e-agnostic
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -65,7 +66,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -76,6 +77,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-version-operator-release-4.9-e2e-agnostic-operator
     rerun_command: /test e2e-agnostic-operator
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -129,7 +131,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-operator,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -140,6 +142,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-version-operator-release-4.9-e2e-agnostic-upgrade
     rerun_command: /test e2e-agnostic-upgrade
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -260,7 +263,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -271,6 +274,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-version-operator-release-4.9-gofmt
     rerun_command: /test gofmt
+    run_if_changed: \.go$
     spec:
       containers:
       - args:
@@ -306,7 +310,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )gofmt,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -317,6 +321,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-version-operator-release-4.9-golangci-lint
     rerun_command: /test golangci-lint
+    run_if_changed: \.go$
     spec:
       containers:
       - args:
@@ -352,7 +357,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )golangci-lint,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -363,6 +368,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-version-operator-release-4.9-images
     rerun_command: /test images
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -398,7 +404,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -409,6 +415,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-version-operator-release-4.9-unit
     rerun_command: /test unit
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift/console-operator/openshift-console-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/console-operator/openshift-console-operator-release-4.9-presubmits.yaml
index b17189e6a04d2..672791a0aeff4 100644
--- a/ci-operator/jobs/openshift/console-operator/openshift-console-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/console-operator/openshift-console-operator-release-4.9-presubmits.yaml
@@ -193,7 +193,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -203,6 +203,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-console-operator-release-4.9-e2e-aws-single-node
+    optional: true
     rerun_command: /test e2e-aws-single-node
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.9-presubmits.yaml
index bc700a5d11c58..26d5a907cfd84 100644
--- a/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/coredns/openshift-coredns-release-4.9-presubmits.yaml
@@ -208,6 +208,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-coredns-release-4.9-e2e-metal-ipi
+    optional: true
     path_alias: github.com/coredns/coredns
     rerun_command: /test e2e-metal-ipi
     spec:
@@ -265,7 +266,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -275,6 +276,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-coredns-release-4.9-e2e-metal-ipi-dualstack
+    optional: true
     path_alias: github.com/coredns/coredns
     rerun_command: /test e2e-metal-ipi-dualstack
     spec:
diff --git a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.9-presubmits.yaml
index 8f3e0b5c59b22..615c36a4dc319 100644
--- a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.9-presubmits.yaml
@@ -76,6 +76,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-csi-driver-manila-operator-release-4.9-e2e-openstack-csi
+    optional: true
     rerun_command: /test e2e-openstack-csi
     spec:
       containers:
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 a08ee102ab95d..2225207871bf1 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
@@ -2136,8 +2136,6 @@ presubmits:
     cluster: build01
     context: ci/prow/e2e-openstack-upi
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-master-e2e-openstack-upi
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.9-presubmits.yaml
index 853b79bdb97b8..c96a9bb765416 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.9-presubmits.yaml
@@ -131,7 +131,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -143,6 +143,7 @@ presubmits:
     name: pull-ci-openshift-installer-release-4.9-e2e-aws-fips
     optional: true
     rerun_command: /test e2e-aws-fips
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -445,7 +446,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-shared-vpc,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -455,6 +456,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-e2e-aws-single-node
+    optional: true
     rerun_command: /test e2e-aws-single-node
     spec:
       containers:
@@ -509,7 +511,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -520,6 +522,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-e2e-aws-upgrade
     rerun_command: /test e2e-aws-upgrade
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -652,7 +655,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-upi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -664,6 +667,7 @@ presubmits:
     name: pull-ci-openshift-installer-release-4.9-e2e-aws-workers-rhel7
     optional: true
     rerun_command: /test e2e-aws-workers-rhel7
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -782,7 +786,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -792,6 +796,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-e2e-azure-resourcegroup
+    optional: true
     rerun_command: /test e2e-azure-resourcegroup
     spec:
       containers:
@@ -911,7 +916,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure-shared-vpc,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -921,6 +926,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-e2e-azure-upi
+    optional: true
     rerun_command: /test e2e-azure-upi
     spec:
       containers:
@@ -1001,6 +1007,7 @@ presubmits:
     name: pull-ci-openshift-installer-release-4.9-e2e-crc
     optional: true
     rerun_command: /test e2e-crc
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -1390,7 +1397,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-upi-xpn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -1400,6 +1407,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-e2e-kubevirt
+    optional: true
     rerun_command: /test e2e-kubevirt
     spec:
       containers:
@@ -1587,7 +1595,7 @@ presubmits:
           secretName: registry-pull-credentials
     trigger: (?m)^/test( | .* )e2e-metal,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -1597,6 +1605,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-e2e-metal-assisted
+    optional: true
     rerun_command: /test e2e-metal-assisted
     spec:
       containers:
@@ -1653,7 +1662,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -1663,6 +1672,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-e2e-metal-ipi
+    optional: true
     rerun_command: /test e2e-metal-ipi
     spec:
       containers:
@@ -1719,7 +1729,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -1729,6 +1739,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-e2e-metal-ipi-ovn-dualstack
+    optional: true
     rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
       containers:
@@ -1785,7 +1796,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -1795,7 +1806,9 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-e2e-metal-ipi-ovn-ipv6
+    optional: true
     rerun_command: /test e2e-metal-ipi-ovn-ipv6
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -1851,7 +1864,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -1861,6 +1874,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-e2e-metal-ipi-virtualmedia
+    optional: true
     rerun_command: /test e2e-metal-ipi-virtualmedia
     spec:
       containers:
@@ -1917,7 +1931,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-virtualmedia,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -1927,7 +1941,9 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-e2e-metal-single-node-live-iso
+    optional: true
     rerun_command: /test e2e-metal-single-node-live-iso
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -2113,6 +2129,81 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-openstack-parallel,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - release-4.9
+    cluster: build01
+    context: ci/prow/e2e-openstack-upi
+    decorate: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-installer-release-4.9-e2e-openstack-upi
+    optional: true
+    rerun_command: /test e2e-openstack-upi
+    run_if_changed: (^upi/openstack/.*)|(^images/openstack/Dockerfile.ci$)
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --secret-dir=/usr/local/e2e-openstack-upi-cluster-profile
+        - --target=e2e-openstack-upi
+        - --template=/usr/local/e2e-openstack-upi
+        command:
+        - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: openstack
+        - name: JOB_NAME_SAFE
+          value: e2e-openstack-upi
+        - name: KURYR_ENABLED
+          value: "false"
+        - name: TEST_COMMAND
+          value: TEST_SUITE=openshift/conformance/parallel run-tests
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-upi-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-upi
+          name: job-definition
+          subPath: cluster-launch-installer-openstack-upi-e2e.yaml
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-openstack
+      - configMap:
+          name: prow-job-cluster-launch-installer-openstack-upi-e2e
+        name: job-definition
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+    trigger: (?m)^/test( | .* )e2e-openstack-upi,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
@@ -2247,7 +2338,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: vsphere
@@ -2257,6 +2348,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-e2e-vsphere-upi
+    optional: true
     rerun_command: /test e2e-vsphere-upi
     spec:
       containers:
@@ -2311,7 +2403,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-vsphere-upi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -2322,6 +2414,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-gofmt
     rerun_command: /test gofmt
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -2357,7 +2450,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )gofmt,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -2368,6 +2461,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-golint
     rerun_command: /test golint
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -2403,7 +2497,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )golint,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -2414,6 +2508,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-govet
     rerun_command: /test govet
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -2449,7 +2544,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )govet,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -2460,6 +2555,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-images
     rerun_command: /test images
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -2495,7 +2591,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -2506,6 +2602,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-openstack-manifests
     rerun_command: /test openstack-manifests
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -2559,7 +2656,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )openstack-manifests,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -2569,6 +2666,7 @@ presubmits:
       ci.openshift.io/manually-branched: "true"
     name: pull-ci-openshift-installer-release-4.9-shellcheck
     rerun_command: /test shellcheck
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -2586,7 +2684,7 @@ presubmits:
             cpu: 500m
     trigger: (?m)^/test shellcheck
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -2597,6 +2695,7 @@ presubmits:
     name: pull-ci-openshift-installer-release-4.9-tf-fmt
     optional: true
     rerun_command: /test tf-fmt
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -2614,7 +2713,7 @@ presubmits:
             cpu: 500m
     trigger: (?m)^/test( | .* )tf-fmt,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -2624,6 +2723,7 @@ presubmits:
       ci.openshift.io/manually-branched: "true"
     name: pull-ci-openshift-installer-release-4.9-tf-lint
     rerun_command: /test tf-lint
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -2641,7 +2741,7 @@ presubmits:
             cpu: 500m
     trigger: (?m)^/test tf-lint
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -2652,6 +2752,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-unit
     rerun_command: /test unit
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -2733,7 +2834,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )verify-codegen,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -2744,6 +2845,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-installer-release-4.9-verify-vendor
     rerun_command: /test verify-vendor
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -2779,7 +2881,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )verify-vendor,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -2789,6 +2891,7 @@ presubmits:
       ci.openshift.io/manually-branched: "true"
     name: pull-ci-openshift-installer-release-4.9-yaml-lint
     rerun_command: /test yaml-lint
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.9-presubmits.yaml
index 9d6366b90a103..72d5c656f368e 100644
--- a/ci-operator/jobs/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-release-4.9-presubmits.yaml
@@ -67,7 +67,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -77,6 +77,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-ironic-rhcos-downloader-release-4.9-e2e-metal-ipi-ovn-dualstack
+    optional: true
     rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
       containers:
@@ -265,7 +266,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-serial-ipv4,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
diff --git a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.9-presubmits.yaml
index 6c9b17f326e6c..7d871946e0b42 100644
--- a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.9-presubmits.yaml
@@ -1,7 +1,49 @@
 presubmits:
   openshift/kubernetes:
   - agent: kubernetes
-    always_run: true
+    always_run: false
+    branches:
+    - release-4.9
+    cluster: build02
+    context: ci/prow/artifacts
+    decorate: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-kubernetes-release-4.9-artifacts
+    path_alias: k8s.io/kubernetes
+    rerun_command: /test artifacts
+    run_if_changed: ^(hack/)|^(openshift-hack/)|(Makefile)|(.*_(windows|linux|darwin|unsupported)(_test)?\.go)$
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --repo=kubernetes
+        - --target=artifacts
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+    trigger: (?m)^/test( | .* )artifacts,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -80,6 +122,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-kubernetes-release-4.9-e2e-agnostic-cmd
+    optional: true
     path_alias: k8s.io/kubernetes
     rerun_command: /test e2e-agnostic-cmd
     spec:
@@ -135,7 +178,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-cmd,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -147,6 +190,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-kubernetes-release-4.9-e2e-aws
+    optional: true
     path_alias: k8s.io/kubernetes
     rerun_command: /test e2e-aws
     spec:
@@ -214,6 +258,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-kubernetes-release-4.9-e2e-aws-csi
+    optional: true
     path_alias: k8s.io/kubernetes
     rerun_command: /test e2e-aws-csi
     spec:
@@ -269,7 +314,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-csi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -281,6 +326,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-kubernetes-release-4.9-e2e-aws-disruptive
+    optional: true
     path_alias: k8s.io/kubernetes
     rerun_command: /test e2e-aws-disruptive
     spec:
@@ -336,7 +382,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -350,6 +396,7 @@ presubmits:
     name: pull-ci-openshift-kubernetes-release-4.9-e2e-aws-downgrade
     path_alias: k8s.io/kubernetes
     rerun_command: /test e2e-aws-downgrade
+    run_if_changed: ^(openshift-hack/images/hyperkube/.*|)$
     spec:
       containers:
       - args:
@@ -470,7 +517,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-fips,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -537,7 +584,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-jenkins,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -549,6 +596,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-kubernetes-release-4.9-e2e-aws-multitenant
+    optional: true
     path_alias: k8s.io/kubernetes
     rerun_command: /test e2e-aws-multitenant
     spec:
@@ -604,7 +652,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-multitenant,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -616,6 +664,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-kubernetes-release-4.9-e2e-aws-ovn
+    optional: true
     path_alias: k8s.io/kubernetes
     rerun_command: /test e2e-aws-ovn
     spec:
@@ -806,7 +855,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -820,6 +869,7 @@ presubmits:
     name: pull-ci-openshift-kubernetes-release-4.9-e2e-aws-upgrade
     path_alias: k8s.io/kubernetes
     rerun_command: /test e2e-aws-upgrade
+    run_if_changed: ^(openshift-hack/images/hyperkube/.*|)$
     spec:
       containers:
       - args:
@@ -873,7 +923,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -885,6 +935,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-kubernetes-release-4.9-e2e-azure
+    optional: true
     path_alias: k8s.io/kubernetes
     rerun_command: /test e2e-azure
     spec:
@@ -940,7 +991,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -954,6 +1005,7 @@ presubmits:
     name: pull-ci-openshift-kubernetes-release-4.9-e2e-azure-upgrade
     path_alias: k8s.io/kubernetes
     rerun_command: /test e2e-azure-upgrade
+    run_if_changed: ^(openshift-hack/images/hyperkube/.*|)$
     spec:
       containers:
       - args:
@@ -1145,7 +1197,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -1157,6 +1209,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-kubernetes-release-4.9-e2e-metal-ipi
+    optional: true
     path_alias: k8s.io/kubernetes
     rerun_command: /test e2e-metal-ipi
     spec:
@@ -1214,7 +1267,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -1226,6 +1279,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-kubernetes-release-4.9-e2e-metal-ipi-ovn-dualstack
+    optional: true
     path_alias: k8s.io/kubernetes
     rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
@@ -1283,7 +1337,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -1295,6 +1349,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-kubernetes-release-4.9-e2e-metal-ipi-ovn-ipv6
+    optional: true
     path_alias: k8s.io/kubernetes
     rerun_command: /test e2e-metal-ipi-ovn-ipv6
     spec:
@@ -1352,7 +1407,82 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
+    branches:
+    - release-4.9
+    cluster: build02
+    context: ci/prow/e2e-openstack
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-kubernetes-release-4.9-e2e-openstack
+    optional: true
+    rerun_command: /test e2e-openstack
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --repo=kubernetes
+        - --secret-dir=/usr/local/e2e-openstack-cluster-profile
+        - --target=e2e-openstack
+        - --template=/usr/local/e2e-openstack
+        command:
+        - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: openstack
+        - name: JOB_NAME_SAFE
+          value: e2e-openstack
+        - name: TEST_COMMAND
+          value: run-minimal-tests
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack
+          name: job-definition
+          subPath: cluster-launch-installer-openstack-e2e.yaml
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-openstack
+      - configMap:
+          name: prow-job-cluster-launch-installer-openstack-e2e
+        name: job-definition
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+    trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
     branches:
     - release-4.9
     cluster: vsphere
@@ -1364,6 +1494,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-kubernetes-release-4.9-e2e-vsphere
+    optional: true
     path_alias: k8s.io/kubernetes
     rerun_command: /test e2e-vsphere
     spec:
diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.9-presubmits.yaml
index 0a2151608bbdb..745a2491fac3b 100644
--- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.9-presubmits.yaml
@@ -75,6 +75,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-machine-api-operator-release-4.9-e2e-aws-disruptive
+    optional: true
     rerun_command: /test e2e-aws-disruptive
     spec:
       containers:
@@ -586,7 +587,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-operator,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -596,7 +597,9 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-machine-api-operator-release-4.9-e2e-libvirt
+    optional: true
     rerun_command: /test e2e-libvirt
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -652,7 +655,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-libvirt,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -718,7 +721,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -794,6 +797,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-machine-api-operator-release-4.9-e2e-metal-ipi-ovn-ipv6
+    optional: true
     rerun_command: /test e2e-metal-ipi-ovn-ipv6
     spec:
       containers:
@@ -850,7 +854,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -916,7 +920,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -1057,6 +1061,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-machine-api-operator-release-4.9-e2e-vsphere
+    optional: true
     rerun_command: /test e2e-vsphere
     spec:
       containers:
@@ -1121,6 +1126,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-machine-api-operator-release-4.9-e2e-vsphere-operator
+    optional: true
     rerun_command: /test e2e-vsphere-operator
     spec:
       containers:
@@ -1249,6 +1255,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-machine-api-operator-release-4.9-e2e-vsphere-upgrade
+    optional: true
     rerun_command: /test e2e-vsphere-upgrade
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9-presubmits.yaml
index 3d6262b16a118..bc94ebbec7cb6 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.9-presubmits.yaml
@@ -65,7 +65,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )cluster-bootimages,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -76,6 +76,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-machine-config-operator-release-4.9-e2e-agnostic-upgrade
     rerun_command: /test e2e-agnostic-upgrade
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -206,6 +207,7 @@ presubmits:
     name: pull-ci-openshift-machine-config-operator-release-4.9-e2e-aws-disruptive
     optional: true
     rerun_command: /test e2e-aws-disruptive
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -324,7 +326,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-proxy,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -336,6 +338,7 @@ presubmits:
     name: pull-ci-openshift-machine-config-operator-release-4.9-e2e-aws-serial
     optional: true
     rerun_command: /test e2e-aws-serial
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -454,7 +457,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -464,6 +467,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-machine-config-operator-release-4.9-e2e-aws-upgrade
+    optional: true
     rerun_command: /test e2e-aws-upgrade
     spec:
       containers:
@@ -584,7 +588,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-upgrade-single-node,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -596,6 +600,7 @@ presubmits:
     name: pull-ci-openshift-machine-config-operator-release-4.9-e2e-aws-workers-rhel7
     optional: true
     rerun_command: /test e2e-aws-workers-rhel7
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -714,7 +719,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -724,6 +729,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-machine-config-operator-release-4.9-e2e-azure-upgrade
+    optional: true
     rerun_command: /test e2e-azure-upgrade
     spec:
       containers:
@@ -980,7 +986,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-single-node,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -990,6 +996,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-machine-config-operator-release-4.9-e2e-gcp-upgrade
+    optional: true
     rerun_command: /test e2e-gcp-upgrade
     spec:
       containers:
@@ -1046,7 +1053,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -1113,7 +1120,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -1125,6 +1132,7 @@ presubmits:
     name: pull-ci-openshift-machine-config-operator-release-4.9-e2e-metal-ipi
     optional: true
     rerun_command: /test e2e-metal-ipi
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -1180,7 +1188,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -1247,7 +1255,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -1257,6 +1265,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-machine-config-operator-release-4.9-e2e-metal-ipi-ovn-ipv6
+    optional: true
     rerun_command: /test e2e-metal-ipi-ovn-ipv6
     spec:
       containers:
@@ -1510,7 +1519,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-ovirt,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -1520,6 +1529,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-machine-config-operator-release-4.9-e2e-ovirt-upgrade
+    optional: true
     rerun_command: /test e2e-ovirt-upgrade
     spec:
       containers:
@@ -1576,7 +1586,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-ovirt-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -1588,6 +1598,7 @@ presubmits:
     name: pull-ci-openshift-machine-config-operator-release-4.9-e2e-ovn-step-registry
     optional: true
     rerun_command: /test e2e-ovn-step-registry
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -1706,7 +1717,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: vsphere
@@ -1718,6 +1729,7 @@ presubmits:
     name: pull-ci-openshift-machine-config-operator-release-4.9-e2e-vsphere-upgrade
     optional: true
     rerun_command: /test e2e-vsphere-upgrade
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
@@ -1836,7 +1848,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-vsphere-upi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -1847,6 +1859,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-machine-config-operator-release-4.9-images
     rerun_command: /test images
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift/oc/openshift-oc-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/oc/openshift-oc-release-4.9-presubmits.yaml
index b8405ac425b94..77c80667b46b1 100644
--- a/ci-operator/jobs/openshift/oc/openshift-oc-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/oc/openshift-oc-release-4.9-presubmits.yaml
@@ -378,6 +378,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-oc-release-4.9-e2e-metal-ipi-ovn-ipv6
+    optional: true
     rerun_command: /test e2e-metal-ipi-ovn-ipv6
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.9-presubmits.yaml
index 5624bc336614a..d49a5f7d72350 100644
--- a/ci-operator/jobs/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.9-presubmits.yaml
@@ -268,6 +268,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-openshift-apiserver-release-4.9-e2e-cmd
+    optional: true
     rerun_command: /test e2e-cmd
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.9-presubmits.yaml
index b918636c3e3ff..af667ed9d0b36 100644
--- a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.9-presubmits.yaml
@@ -14,6 +14,7 @@ presubmits:
       job-release: "4.8"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-openshift-tests-private-release-4.9-e2e-aws
+    optional: true
     rerun_command: /test e2e-aws
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/openshift-tests/openshift-openshift-tests-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/openshift-tests/openshift-openshift-tests-release-4.9-presubmits.yaml
index c7347cbc3469b..0ab70fa2868f5 100644
--- a/ci-operator/jobs/openshift/openshift-tests/openshift-openshift-tests-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/openshift-tests/openshift-openshift-tests-release-4.9-presubmits.yaml
@@ -14,6 +14,7 @@ presubmits:
       job-release: "4.8"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-openshift-tests-release-4.9-e2e-aws
+    optional: true
     rerun_command: /test e2e-aws
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/openstack-cinder-csi-driver-operator/openshift-openstack-cinder-csi-driver-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/openstack-cinder-csi-driver-operator/openshift-openstack-cinder-csi-driver-operator-release-4.9-presubmits.yaml
index 9b9b74ecc93e3..326fbea59c7a9 100644
--- a/ci-operator/jobs/openshift/openstack-cinder-csi-driver-operator/openshift-openstack-cinder-csi-driver-operator-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/openstack-cinder-csi-driver-operator/openshift-openstack-cinder-csi-driver-operator-release-4.9-presubmits.yaml
@@ -11,6 +11,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-openstack-cinder-csi-driver-operator-release-4.9-e2e-openstack
+    optional: true
     rerun_command: /test e2e-openstack
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-release-4.9-presubmits.yaml
index a50543c54b4f6..b19bd3b0d1d00 100644
--- a/ci-operator/jobs/openshift/origin/openshift-origin-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/origin/openshift-origin-release-4.9-presubmits.yaml
@@ -1,46 +1,5 @@
 presubmits:
   openshift/origin:
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - release-4.9
-    cluster: build01
-    context: ci/prow/artifacts
-    decorate: true
-    labels:
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-origin-release-4.9-artifacts
-    rerun_command: /test artifacts
-    run_if_changed: ^(hack/)|(Makefile)|(.*_(windows|linux|darwin|unsupported)(_test)?\.go)$
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --give-pr-author-access-to-namespace=true
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --repo=origin
-        - --target=artifacts
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-    trigger: (?m)^/test( | .* )artifacts,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -54,6 +13,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-origin-release-4.9-e2e-agnostic-cmd
+    optional: true
     rerun_command: /test e2e-agnostic-cmd
     spec:
       containers:
@@ -108,7 +68,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-agnostic-cmd,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -120,6 +80,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-origin-release-4.9-e2e-aws
+    optional: true
     rerun_command: /test e2e-aws
     spec:
       containers:
@@ -188,7 +149,6 @@ presubmits:
     name: pull-ci-openshift-origin-release-4.9-e2e-aws-csi
     optional: true
     rerun_command: /test e2e-aws-csi
-    skip_report: true
     spec:
       containers:
       - args:
@@ -321,7 +281,6 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-origin-release-4.9-e2e-aws-fips
-    optional: true
     rerun_command: /test e2e-aws-fips
     spec:
       containers:
@@ -644,7 +603,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -656,6 +615,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-origin-release-4.9-e2e-aws-proxy
+    optional: true
     rerun_command: /test e2e-aws-proxy
     spec:
       containers:
@@ -843,7 +803,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -855,6 +815,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-origin-release-4.9-e2e-aws-upgrade
+    optional: true
     rerun_command: /test e2e-aws-upgrade
     spec:
       containers:
@@ -1388,7 +1349,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -1400,6 +1361,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-origin-release-4.9-e2e-metal-ipi
+    optional: true
     rerun_command: /test e2e-metal-ipi
     spec:
       containers:
@@ -1456,7 +1418,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -1468,6 +1430,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-origin-release-4.9-e2e-metal-ipi-ovn-dualstack
+    optional: true
     rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
       containers:
@@ -1592,7 +1555,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -1604,6 +1567,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-origin-release-4.9-e2e-metal-ipi-virtualmedia
+    optional: true
     rerun_command: /test e2e-metal-ipi-virtualmedia
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift/os/openshift-os-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-release-4.9-presubmits.yaml
index a88151302928b..5f9c97258ead6 100644
--- a/ci-operator/jobs/openshift/os/openshift-os-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/os/openshift-os-release-4.9-presubmits.yaml
@@ -1,7 +1,7 @@
 presubmits:
   openshift/os:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build02
@@ -15,6 +15,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-os-release-4.9-build-test-qemu
     rerun_command: /test build-test-qemu
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -50,7 +51,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )build-test-qemu,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -63,6 +64,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-os-release-4.9-images
     rerun_command: /test images
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -98,7 +100,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -111,6 +113,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-os-release-4.9-validate
     rerun_command: /test validate
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master-presubmits.yaml b/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master-presubmits.yaml
index 8bd1a47808b2c..ab166d6d38d23 100644
--- a/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master-presubmits.yaml
@@ -542,8 +542,6 @@ presubmits:
     cluster: build01
     context: ci/prow/e2e-openstack-ovn
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-ovn-kubernetes-master-e2e-openstack-ovn
diff --git a/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.9-presubmits.yaml
index 1c40de92df2df..9ad48bd0f8954 100644
--- a/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.9-presubmits.yaml
+++ b/ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.9-presubmits.yaml
@@ -139,6 +139,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-ovn-kubernetes-release-4.9-e2e-azure-ovn
+    optional: true
     rerun_command: /test e2e-azure-ovn
     spec:
       containers:
@@ -203,7 +204,6 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-ovn-kubernetes-release-4.9-e2e-gcp-ovn
-    optional: true
     rerun_command: /test e2e-gcp-ovn
     spec:
       containers:
@@ -270,6 +270,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-ovn-kubernetes-release-4.9-e2e-gcp-ovn-upgrade
+    optional: true
     rerun_command: /test e2e-gcp-ovn-upgrade
     spec:
       containers:
@@ -336,7 +337,6 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-ovn-kubernetes-release-4.9-e2e-metal-ipi-ovn-dualstack
-    optional: true
     rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
       containers:
@@ -458,6 +458,83 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.9
+    cluster: build01
+    context: ci/prow/e2e-openstack-ovn
+    decorate: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-ovn-kubernetes-release-4.9-e2e-openstack-ovn
+    optional: true
+    rerun_command: /test e2e-openstack-ovn
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --repo=ovn-kubernetes
+        - --secret-dir=/usr/local/e2e-openstack-ovn-cluster-profile
+        - --target=e2e-openstack-ovn
+        - --template=/usr/local/e2e-openstack-ovn
+        command:
+        - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: openstack
+        - name: CLUSTER_VARIANT
+          value: ovn
+        - name: JOB_NAME_SAFE
+          value: e2e-openstack-ovn
+        - name: KURYR_ENABLED
+          value: "false"
+        - name: TEST_COMMAND
+          value: TEST_SUITE=openshift/conformance/parallel run-tests
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-ovn-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-ovn
+          name: job-definition
+          subPath: cluster-launch-installer-openstack-e2e.yaml
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-openstack
+      - configMap:
+          name: prow-job-cluster-launch-installer-openstack-e2e
+        name: job-definition
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+    trigger: (?m)^/test( | .* )e2e-openstack-ovn,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -469,6 +546,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-ovn-kubernetes-release-4.9-e2e-ovn-hybrid-step-registry
+    optional: true
     rerun_command: /test e2e-ovn-hybrid-step-registry
     spec:
       containers:
@@ -533,6 +611,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-ovn-kubernetes-release-4.9-e2e-vsphere-ovn
+    optional: true
     rerun_command: /test e2e-vsphere-ovn
     spec:
       containers:
@@ -597,6 +676,7 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-ovn-kubernetes-release-4.9-e2e-vsphere-windows
+    optional: true
     rerun_command: /test e2e-vsphere-windows
     spec:
       containers:
diff --git a/core-services/template-deprecation/_allowlist.yaml b/core-services/template-deprecation/_allowlist.yaml
index dd250ab8a17a3..cdbced8292fca 100644
--- a/core-services/template-deprecation/_allowlist.yaml
+++ b/core-services/template-deprecation/_allowlist.yaml
@@ -802,6 +802,9 @@ templates:
           pull-ci-openshift-baremetal-runtimecfg-master-e2e-openstack:
             generated: false
             kind: presubmit
+          pull-ci-openshift-baremetal-runtimecfg-release-4.9-e2e-openstack:
+            generated: false
+            kind: presubmit
           pull-ci-openshift-cloud-credential-operator-master-e2e-openstack:
             generated: false
             kind: presubmit
@@ -838,9 +841,15 @@ templates:
           pull-ci-openshift-cluster-network-operator-master-e2e-openstack-ovn:
             generated: false
             kind: presubmit
+          pull-ci-openshift-cluster-network-operator-release-4.9-e2e-openstack-ovn:
+            generated: false
+            kind: presubmit
           pull-ci-openshift-cluster-storage-operator-master-e2e-openstack:
             generated: false
             kind: presubmit
+          pull-ci-openshift-cluster-storage-operator-release-4.9-e2e-openstack:
+            generated: false
+            kind: presubmit
           pull-ci-openshift-installer-fcos-e2e-openstack:
             generated: false
             kind: presubmit
@@ -865,6 +874,9 @@ templates:
           pull-ci-openshift-kubernetes-master-e2e-openstack:
             generated: false
             kind: presubmit
+          pull-ci-openshift-kubernetes-release-4.9-e2e-openstack:
+            generated: false
+            kind: presubmit
           pull-ci-openshift-machine-api-operator-release-4.4-e2e-openstack:
             generated: false
             kind: presubmit
@@ -877,6 +889,9 @@ templates:
           pull-ci-openshift-ovn-kubernetes-master-e2e-openstack-ovn:
             generated: false
             kind: presubmit
+          pull-ci-openshift-ovn-kubernetes-release-4.9-e2e-openstack-ovn:
+            generated: false
+            kind: presubmit
           release-openshift-ocp-installer-e2e-openstack-4.5:
             generated: false
             kind: release
@@ -897,6 +912,9 @@ templates:
           pull-ci-openshift-installer-release-4.4-e2e-openstack-upi:
             generated: false
             kind: presubmit
+          pull-ci-openshift-installer-release-4.9-e2e-openstack-upi:
+            generated: false
+            kind: presubmit
     template_name: prow-job-cluster-launch-installer-openstack-upi-e2e
   prow-job-cluster-launch-installer-remote-libvirt-e2e:
     blockers: