diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml
index e538ab6c5e68e..212056908863e 100644
--- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml
@@ -75,14 +75,15 @@ tests:
     test:
     - chain: hypershift-openstack-e2e
     workflow: hypershift-aws-e2e-external
-- as: e2e-techpreview
+- as: e2e-openstack-capi-techpreview
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: openstack-vexxhost
     env:
       FEATURE_SET: TechPreviewNoUpgrade
     test:
     - as: test
-      commands: make -C openshift e2e
+      commands: openshift/e2e-tests.sh
       from: src
       resources:
         requests:
diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml
index 7b1025155b7c8..f9500bf6b6d84 100644
--- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml
@@ -75,14 +75,15 @@ tests:
     test:
     - chain: hypershift-openstack-e2e
     workflow: hypershift-aws-e2e-external
-- as: e2e-techpreview
+- as: e2e-openstack-capi-techpreview
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: openstack-vexxhost
     env:
       FEATURE_SET: TechPreviewNoUpgrade
     test:
     - as: test
-      commands: make -C openshift e2e
+      commands: openshift/e2e-tests.sh
       from: src
       resources:
         requests:
diff --git a/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main-presubmits.yaml
index b4c67a86f9997..e79b68748505a 100644
--- a/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main-presubmits.yaml
@@ -74,21 +74,22 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-hypershift,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^main$
     - ^main-
     cluster: build10
-    context: ci/prow/e2e-techpreview
+    context: ci/prow/e2e-openstack-capi-techpreview
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: openstack-vexxhost
       ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-api-provider-openstack-main-e2e-techpreview
+    name: pull-ci-openshift-cluster-api-provider-openstack-main-e2e-openstack-capi-techpreview
     path_alias: sigs.k8s.io/cluster-api-provider-openstack
-    rerun_command: /test e2e-techpreview
+    rerun_command: /test e2e-openstack-capi-techpreview
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -97,7 +98,7 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-techpreview
+        - --target=e2e-openstack-capi-techpreview
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
@@ -145,7 +146,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-techpreview,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-openstack-capi-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
diff --git a/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22-presubmits.yaml
index d566a7bae4b96..82e29a95ec46d 100644
--- a/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22-presubmits.yaml
@@ -74,21 +74,22 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-hypershift,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^release-4\.22$
     - ^release-4\.22-
     cluster: build11
-    context: ci/prow/e2e-techpreview
+    context: ci/prow/e2e-openstack-capi-techpreview
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: openstack-vexxhost
       ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-api-provider-openstack-release-4.22-e2e-techpreview
+    name: pull-ci-openshift-cluster-api-provider-openstack-release-4.22-e2e-openstack-capi-techpreview
     path_alias: sigs.k8s.io/cluster-api-provider-openstack
-    rerun_command: /test e2e-techpreview
+    rerun_command: /test e2e-openstack-capi-techpreview
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
       - args:
@@ -97,7 +98,7 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-techpreview
+        - --target=e2e-openstack-capi-techpreview
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
@@ -145,7 +146,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-techpreview,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-openstack-capi-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: