diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master.yaml
index f5684a3134448..48cd52b105960 100644
--- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master.yaml
+++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master.yaml
@@ -328,7 +328,7 @@ tests:
     workflow: openshift-e2e-azure-csi-extended
 - as: e2e-openstack
   optional: true
-  run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*)
+  run_if_changed: ^(Dockerfile\.openstack-cinder|assets\/overlays\/openstack-cinder\/.*|pkg\/driver\/openstack-cinder\/.*|pkg\/openstack-cinder\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*)
   steps:
     cluster_profile: openstack-vexxhost
     env:
@@ -337,7 +337,7 @@ tests:
       TEST_SUITE: experimental/reliability/minimal
     workflow: openshift-e2e-openstack-ipi
 - as: e2e-openstack-cinder-csi
-  run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*)
+  run_if_changed: ^(Dockerfile\.openstack-cinder|assets\/overlays\/openstack-cinder\/.*|pkg\/driver\/openstack-cinder\/.*|pkg\/openstack-cinder\/.*)
   steps:
     cluster_profile: openstack-vh-mecha-central
     env:
diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.18.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.18.yaml
index 8c63245db4d20..c6daf2ebfd9b0 100644
--- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.18.yaml
+++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.18.yaml
@@ -329,7 +329,7 @@ tests:
     workflow: openshift-e2e-azure-csi-extended
 - as: e2e-openstack
   optional: true
-  run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*)
+  run_if_changed: ^(Dockerfile\.openstack-cinder|assets\/overlays\/openstack-cinder\/.*|pkg\/driver\/openstack-cinder\/.*|pkg\/openstack-cinder\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*)
   steps:
     cluster_profile: openstack-vexxhost
     env:
@@ -338,7 +338,7 @@ tests:
       TEST_SUITE: experimental/reliability/minimal
     workflow: openshift-e2e-openstack-ipi
 - as: e2e-openstack-cinder-csi
-  run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*)
+  run_if_changed: ^(Dockerfile\.openstack-cinder|assets\/overlays\/openstack-cinder\/.*|pkg\/driver\/openstack-cinder\/.*|pkg\/openstack-cinder\/.*)
   steps:
     cluster_profile: openstack-vh-mecha-central
     env:
diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.19.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.19.yaml
index 31b161a10a2c5..6581d81d7de91 100644
--- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.19.yaml
+++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.19.yaml
@@ -328,7 +328,7 @@ tests:
     workflow: openshift-e2e-azure-csi-extended
 - as: e2e-openstack
   optional: true
-  run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*)
+  run_if_changed: ^(Dockerfile\.openstack-cinder|assets\/overlays\/openstack-cinder\/.*|pkg\/driver\/openstack-cinder\/.*|pkg\/openstack-cinder\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*)
   steps:
     cluster_profile: openstack-vexxhost
     env:
@@ -337,7 +337,7 @@ tests:
       TEST_SUITE: experimental/reliability/minimal
     workflow: openshift-e2e-openstack-ipi
 - as: e2e-openstack-cinder-csi
-  run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*)
+  run_if_changed: ^(Dockerfile\.openstack-cinder|assets\/overlays\/openstack-cinder\/.*|pkg\/driver\/openstack-cinder\/.*|pkg\/openstack-cinder\/.*)
   steps:
     cluster_profile: openstack-vh-mecha-central
     env:
diff --git a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-master-presubmits.yaml
index c99170c37c63b..7afe3a4953f07 100644
--- a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-master-presubmits.yaml
@@ -1222,7 +1222,7 @@ presubmits:
     name: pull-ci-openshift-csi-operator-master-e2e-openstack
     optional: true
     rerun_command: /test e2e-openstack
-    run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*)
+    run_if_changed: ^(Dockerfile\.openstack-cinder|assets\/overlays\/openstack-cinder\/.*|pkg\/driver\/openstack-cinder\/.*|pkg\/openstack-cinder\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*)
     spec:
       containers:
       - args:
@@ -1301,7 +1301,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-csi-operator-master-e2e-openstack-cinder-csi
     rerun_command: /test e2e-openstack-cinder-csi
-    run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*)
+    run_if_changed: ^(Dockerfile\.openstack-cinder|assets\/overlays\/openstack-cinder\/.*|pkg\/driver\/openstack-cinder\/.*|pkg\/openstack-cinder\/.*)
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.18-presubmits.yaml b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.18-presubmits.yaml
index 2a215d7b2d7b1..5df18d8f7a9bb 100644
--- a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.18-presubmits.yaml
+++ b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.18-presubmits.yaml
@@ -1222,7 +1222,7 @@ presubmits:
     name: pull-ci-openshift-csi-operator-release-4.18-e2e-openstack
     optional: true
     rerun_command: /test e2e-openstack
-    run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*)
+    run_if_changed: ^(Dockerfile\.openstack-cinder|assets\/overlays\/openstack-cinder\/.*|pkg\/driver\/openstack-cinder\/.*|pkg\/openstack-cinder\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*)
     spec:
       containers:
       - args:
@@ -1301,7 +1301,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-csi-operator-release-4.18-e2e-openstack-cinder-csi
     rerun_command: /test e2e-openstack-cinder-csi
-    run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*)
+    run_if_changed: ^(Dockerfile\.openstack-cinder|assets\/overlays\/openstack-cinder\/.*|pkg\/driver\/openstack-cinder\/.*|pkg\/openstack-cinder\/.*)
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.19-presubmits.yaml
index 4645c195aa8d1..af16261195d69 100644
--- a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.19-presubmits.yaml
+++ b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.19-presubmits.yaml
@@ -1222,7 +1222,7 @@ presubmits:
     name: pull-ci-openshift-csi-operator-release-4.19-e2e-openstack
     optional: true
     rerun_command: /test e2e-openstack
-    run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*)
+    run_if_changed: ^(Dockerfile\.openstack-cinder|assets\/overlays\/openstack-cinder\/.*|pkg\/driver\/openstack-cinder\/.*|pkg\/openstack-cinder\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*)
     spec:
       containers:
       - args:
@@ -1301,7 +1301,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-csi-operator-release-4.19-e2e-openstack-cinder-csi
     rerun_command: /test e2e-openstack-cinder-csi
-    run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*)
+    run_if_changed: ^(Dockerfile\.openstack-cinder|assets\/overlays\/openstack-cinder\/.*|pkg\/driver\/openstack-cinder\/.*|pkg\/openstack-cinder\/.*)
     spec:
       containers:
       - args: