diff --git a/ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main.yaml b/ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main.yaml
index 917eb8cf7c8c0..f0912d8c1f96a 100644
--- a/ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main.yaml
+++ b/ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main.yaml
@@ -1,6 +1,10 @@
-binary_build_commands: make install
 build_root:
   from_repository: true
+images:
+  items:
+  - dockerfile_path: Dockerfile.clients
+    to: terraform-provider-rhcs-clients
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
 resources:
   '*':
     limits:
@@ -9,13 +13,11 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: unit
-  commands: |-
-    go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.20.1
-    unset GOFLAGS
-    make unit-test
+- as: pre-push-checks
+  commands: make pre-push-checks
   container:
-    from: src
+    from: terraform-provider-rhcs-clients
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
 zz_generated_metadata:
   branch: main
   org: terraform-redhat
diff --git a/ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main__e2e-presubmits.yaml b/ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main__e2e-presubmits.yaml
index 08d1df36d46c5..ad9d2f56e99d7 100644
--- a/ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main__e2e-presubmits.yaml
+++ b/ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main__e2e-presubmits.yaml
@@ -5,6 +5,7 @@ images:
   items:
   - dockerfile_path: build/ci-tf-e2e.Dockerfile
     to: rhcs-tf-e2e
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
 releases:
   latest:
     integration:
@@ -19,7 +20,7 @@ resources:
       memory: 200Mi
 tests:
 - as: rosa-sts-advanced-critical-high-presubmit
-  skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -35,7 +36,7 @@ tests:
     - ref: rhcs-e2e-tests
     workflow: rhcs-aws-sts
 - as: rosa-sts-private-critical-high-presubmit
-  skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -53,6 +54,7 @@ tests:
 - always_run: false
   as: rosa-sts-advanced-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -70,6 +72,7 @@ tests:
 - always_run: false
   as: rosa-sts-private-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -87,6 +90,7 @@ tests:
 - always_run: false
   as: rosa-sts-shared-vpc-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -105,6 +109,7 @@ tests:
 - always_run: false
   as: rosa-sts-advanced-day1-negative-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -121,6 +126,7 @@ tests:
 - always_run: false
   as: rosa-sts-private-day1-negative-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -137,6 +143,7 @@ tests:
 - always_run: false
   as: rosa-sts-upgrade-y-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -155,6 +162,7 @@ tests:
 - always_run: false
   as: rosa-sts-upgrade-z-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -173,6 +181,7 @@ tests:
 - always_run: false
   as: rosa-classic-full-resources-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -190,7 +199,7 @@ tests:
     workflow: rhcs-aws-sts
 - always_run: false
   as: rosa-hcp-advanced-critical-high-presubmit
-  skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -206,7 +215,7 @@ tests:
     workflow: rhcs-aws-sts
 - always_run: false
   as: rosa-hcp-private-critical-high-presubmit
-  skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -223,6 +232,7 @@ tests:
 - always_run: false
   as: rosa-hcp-arm-critical-high-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -240,6 +250,7 @@ tests:
 - always_run: false
   as: rosa-hcp-advanced-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -256,6 +267,7 @@ tests:
 - always_run: false
   as: rosa-hcp-private-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -272,6 +284,7 @@ tests:
 - always_run: false
   as: rosa-hcp-arm-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -289,6 +302,7 @@ tests:
 - always_run: false
   as: rosa-hcp-network-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -305,6 +319,7 @@ tests:
 - always_run: false
   as: rosa-hcp-encryption-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -321,6 +336,7 @@ tests:
 - always_run: false
   as: rosa-hcp-upgrade-y-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -339,6 +355,7 @@ tests:
 - always_run: false
   as: rosa-hcp-upgrade-z-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -357,6 +374,7 @@ tests:
 - always_run: false
   as: rosa-hcp-full-resources-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
@@ -375,6 +393,7 @@ tests:
 - always_run: false
   as: rosa-day1-supplemental-optional-presubmit
   optional: true
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
   steps:
     cluster_profile: oex-aws-qe
     env:
diff --git a/ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main__e2e.yaml b/ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main__e2e.yaml
index 2a325b69df1ba..7178324d30170 100644
--- a/ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main__e2e.yaml
+++ b/ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main__e2e.yaml
@@ -5,6 +5,7 @@ images:
   items:
   - dockerfile_path: build/ci-tf-e2e.Dockerfile
     to: rhcs-tf-e2e
+  skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
 releases:
   latest:
     integration:
diff --git a/ci-operator/jobs/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main-presubmits.yaml b/ci-operator/jobs/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main-presubmits.yaml
index 98a10624677b9..f9078133f39ec 100644
--- a/ci-operator/jobs/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main-presubmits.yaml
+++ b/ci-operator/jobs/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main-presubmits.yaml
@@ -1,7 +1,7 @@
 presubmits:
   terraform-redhat/terraform-provider-rhcs:
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^main$
     - ^main-
@@ -18,6 +18,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-images
     rerun_command: /test e2e-images
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -60,7 +61,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-images,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^main$
     - ^main-
@@ -77,6 +78,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-images
     rerun_command: /test e2e-presubmits-images
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -139,6 +141,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-classic-full-resources-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-classic-full-resources-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -226,6 +229,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-day1-supplemental-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-day1-supplemental-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -312,7 +316,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-advanced-critical-high-presubmit
     rerun_command: /test e2e-presubmits-rosa-hcp-advanced-critical-high-presubmit
-    skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -400,6 +404,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-advanced-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-hcp-advanced-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -487,6 +492,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-arm-critical-high-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-hcp-arm-critical-high-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -574,6 +580,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-arm-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-hcp-arm-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -661,6 +668,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-encryption-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-hcp-encryption-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -748,6 +756,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-full-resources-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-hcp-full-resources-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -835,6 +844,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-network-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-hcp-network-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -921,7 +931,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-private-critical-high-presubmit
     rerun_command: /test e2e-presubmits-rosa-hcp-private-critical-high-presubmit
-    skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -1009,6 +1019,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-private-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-hcp-private-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -1096,6 +1107,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-upgrade-y-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-hcp-upgrade-y-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -1183,6 +1195,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-upgrade-z-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-hcp-upgrade-z-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -1269,7 +1282,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-advanced-critical-high-presubmit
     rerun_command: /test e2e-presubmits-rosa-sts-advanced-critical-high-presubmit
-    skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -1357,6 +1370,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-advanced-day1-negative-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-sts-advanced-day1-negative-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -1444,6 +1458,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-advanced-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-sts-advanced-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -1530,7 +1545,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-private-critical-high-presubmit
     rerun_command: /test e2e-presubmits-rosa-sts-private-critical-high-presubmit
-    skip_if_only_changed: ^(LICENSE|OWNERS|README\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -1618,6 +1633,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-private-day1-negative-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-sts-private-day1-negative-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -1705,6 +1721,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-private-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-sts-private-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -1792,6 +1809,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-shared-vpc-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-sts-shared-vpc-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -1879,6 +1897,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-upgrade-y-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-sts-upgrade-y-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -1966,6 +1985,7 @@ presubmits:
     name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-upgrade-z-optional-presubmit
     optional: true
     rerun_command: /test e2e-presubmits-rosa-sts-upgrade-z-optional-presubmit
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
@@ -2033,28 +2053,88 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-presubmits-rosa-sts-upgrade-z-optional-presubmit,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
+    branches:
+    - ^main$
+    - ^main-
+    cluster: build06
+    context: ci/prow/images
+    decorate: true
+    decoration_config:
+      sparse_checkout_files:
+      - .ci-operator.yaml
+      - Dockerfile.clients
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-images
+    rerun_command: /test images
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        command:
+        - ci-operator
+        image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /secrets/manifest-tool
+          name: manifest-tool-local-pusher
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
     branches:
     - ^main$
     - ^main-
     cluster: build06
-    context: ci/prow/unit
+    context: ci/prow/pre-push-checks
     decorate: true
     decoration_config:
       sparse_checkout_files:
       - .ci-operator.yaml
+      - Dockerfile.clients
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-unit
-    rerun_command: /test unit
+    name: pull-ci-terraform-redhat-terraform-provider-rhcs-main-pre-push-checks
+    rerun_command: /test pre-push-checks
+    skip_if_only_changed: ^(LICENSE|OWNERS|.*\.md|\.gitignore|\.goreleaser\.yaml|\.golang-ci\.yml|renovate\.json|\.ci-operator\.yaml)$|^(?:docs|\.github|\.tekton|subsystem|examples)(?:/|$)
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
-        - --target=unit
+        - --target=pre-push-checks
         command:
         - ci-operator
         env:
@@ -2095,4 +2175,4 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
+    trigger: (?m)^/test( | .* )pre-push-checks,?($|\s.*)
diff --git a/core-services/prow/02_config/terraform-redhat/terraform-provider-rhcs/_prowconfig.yaml b/core-services/prow/02_config/terraform-redhat/terraform-provider-rhcs/_prowconfig.yaml
index b58f4a61d6626..e0683cc06489f 100644
--- a/core-services/prow/02_config/terraform-redhat/terraform-provider-rhcs/_prowconfig.yaml
+++ b/core-services/prow/02_config/terraform-redhat/terraform-provider-rhcs/_prowconfig.yaml
@@ -6,6 +6,9 @@ branch-protection:
           branches:
             main:
               protect: true
+              required_status_checks:
+                contexts:
+                - ci/prow/pre-push-checks
           protect: false
 tide:
   merge_method: