diff --git a/ci-operator/config/opendatahub-io/opendatahub-operator/.config.prowgen b/ci-operator/config/opendatahub-io/opendatahub-operator/.config.prowgen
deleted file mode 100644
index 61cbce753c64d..0000000000000
--- a/ci-operator/config/opendatahub-io/opendatahub-operator/.config.prowgen
+++ /dev/null
@@ -1,2 +0,0 @@
-skip_operator_presubmits:
-- branch: main
diff --git a/ci-operator/config/opendatahub-io/opendatahub-operator/opendatahub-io-opendatahub-operator-main.yaml b/ci-operator/config/opendatahub-io/opendatahub-operator/opendatahub-io-opendatahub-operator-main.yaml
index 41abadaab64a8..7dde4334d3e08 100644
--- a/ci-operator/config/opendatahub-io/opendatahub-operator/opendatahub-io-opendatahub-operator-main.yaml
+++ b/ci-operator/config/opendatahub-io/opendatahub-operator/opendatahub-io-opendatahub-operator-main.yaml
@@ -42,6 +42,8 @@ operator:
     with: pipeline:opendatahub-operator-rhoai
   - pullspec: REPLACE_IMAGE:v0.0.0-placeholder
     with: pipeline:opendatahub-operator
+prowgen:
+  skip_operator_presubmits: true
 releases:
   latest:
     release:
diff --git a/ci-operator/config/openshift/ci-tools/.config.prowgen b/ci-operator/config/openshift/ci-tools/.config.prowgen
index fa4a55b2c6ef9..a3dccdb79a9f2 100644
--- a/ci-operator/config/openshift/ci-tools/.config.prowgen
+++ b/ci-operator/config/openshift/ci-tools/.config.prowgen
@@ -7,4 +7,3 @@ slack_reporter:
   report_template: ':failed: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{end}}'
   job_names:
   - images
-enable_secrets_store_csi_driver: true
diff --git a/ci-operator/config/openshift/ci-tools/openshift-ci-tools-main.yaml b/ci-operator/config/openshift/ci-tools/openshift-ci-tools-main.yaml
index 909a506b4046b..31c9d26ed1507 100644
--- a/ci-operator/config/openshift/ci-tools/openshift-ci-tools-main.yaml
+++ b/ci-operator/config/openshift/ci-tools/openshift-ci-tools-main.yaml
@@ -873,6 +873,8 @@ promotion:
   to:
   - namespace: ci
     tag: latest
+prowgen:
+  enable_secrets_store_csi_driver: true
 resources:
   '*':
     requests:
diff --git a/ci-operator/config/openshift/csi-operator/.config.prowgen b/ci-operator/config/openshift/csi-operator/.config.prowgen
index b1686aa3e2658..6ce1d9c309df9 100644
--- a/ci-operator/config/openshift/csi-operator/.config.prowgen
+++ b/ci-operator/config/openshift/csi-operator/.config.prowgen
@@ -9,12 +9,3 @@ slack_reporter:
   - periodic-e2e-aws-efs-csi
   - periodic-e2e-smb-csi
   - periodic-e2e-azure-file-csi
-skip_operator_presubmits:
-- branch: release-4.17
-  variant: periodics
-- branch: release-4.18
-  variant: periodics
-- branch: release-4.19
-  variant: periodics
-- branch: release-4.20
-  variant: periodics
diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.17__periodics.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.17__periodics.yaml
index e4e1d662d1f15..8b72e33618585 100644
--- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.17__periodics.yaml
+++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.17__periodics.yaml
@@ -134,6 +134,8 @@ operator:
     with: pipeline:livenessprobe-operand
   - pullspec: quay.io/openshift/origin-kube-rbac-proxy:latest
     with: pipeline:proxy-operand
+prowgen:
+  skip_operator_presubmits: true
 releases:
   initial:
     candidate:
diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.18__periodics.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.18__periodics.yaml
index 8396b62d37f60..219b113056c61 100644
--- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.18__periodics.yaml
+++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.18__periodics.yaml
@@ -142,6 +142,8 @@ operator:
     with: pipeline:livenessprobe-operand
   - pullspec: quay.io/openshift/origin-kube-rbac-proxy:latest
     with: pipeline:proxy-operand
+prowgen:
+  skip_operator_presubmits: true
 releases:
   initial:
     candidate:
diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.19__periodics.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.19__periodics.yaml
index 703b10f79ed74..7d973b0c6bc27 100644
--- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.19__periodics.yaml
+++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.19__periodics.yaml
@@ -134,6 +134,8 @@ operator:
     with: pipeline:livenessprobe-operand
   - pullspec: quay.io/openshift/origin-kube-rbac-proxy:latest
     with: pipeline:proxy-operand
+prowgen:
+  skip_operator_presubmits: true
 releases:
   initial:
     candidate:
diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.20__periodics.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.20__periodics.yaml
index 0900d0c6b9c9d..97cf4b458a64b 100644
--- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.20__periodics.yaml
+++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.20__periodics.yaml
@@ -142,6 +142,8 @@ operator:
     with: pipeline:livenessprobe-operand
   - pullspec: quay.io/openshift/origin-kube-rbac-proxy:latest
     with: pipeline:proxy-operand
+prowgen:
+  skip_operator_presubmits: true
 releases:
   initial:
     candidate:
diff --git a/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/.config.prowgen b/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/.config.prowgen
index a167b21c68f4a..b6735daf5b6e1 100644
--- a/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/.config.prowgen
+++ b/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/.config.prowgen
@@ -6,13 +6,4 @@ slack_reporter:
   report_template: |
     ':red_jenkins_circle: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>'
   job_names: # Listing of job names (ci-operator's 'as' field) that this configuration applies to
-  - periodic-e2e-gcp-filestore-csi
-skip_operator_presubmits:
-- branch: release-4.17 
-  variant: periodics
-- branch: release-4.18
-  variant: periodics
-- branch: release-4.19
-  variant: periodics
-- branch: release-4.20
-  variant: periodics
\ No newline at end of file
+  - periodic-e2e-gcp-filestore-csi
\ No newline at end of file
diff --git a/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.17__periodics.yaml b/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.17__periodics.yaml
index 893286a30e98d..6d9c9b80ba33f 100644
--- a/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.17__periodics.yaml
+++ b/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.17__periodics.yaml
@@ -83,6 +83,8 @@ operator:
     with: pipeline:livenessprobe-operand
   - pullspec: quay.io/openshift/origin-kube-rbac-proxy:latest
     with: pipeline:proxy-operand
+prowgen:
+  skip_operator_presubmits: true
 releases:
   initial:
     candidate:
diff --git a/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.18__periodics.yaml b/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.18__periodics.yaml
index 3344c91ba429b..c73d225977805 100644
--- a/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.18__periodics.yaml
+++ b/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.18__periodics.yaml
@@ -83,6 +83,8 @@ operator:
     with: pipeline:livenessprobe-operand
   - pullspec: quay.io/openshift/origin-kube-rbac-proxy:latest
     with: pipeline:proxy-operand
+prowgen:
+  skip_operator_presubmits: true
 releases:
   initial:
     candidate:
diff --git a/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.19__periodics.yaml b/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.19__periodics.yaml
index 84fed3a323633..5689e338fa611 100644
--- a/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.19__periodics.yaml
+++ b/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.19__periodics.yaml
@@ -83,6 +83,8 @@ operator:
     with: pipeline:livenessprobe-operand
   - pullspec: quay.io/openshift/origin-kube-rbac-proxy:latest
     with: pipeline:proxy-operand
+prowgen:
+  skip_operator_presubmits: true
 releases:
   initial:
     candidate:
diff --git a/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.20__periodics.yaml b/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.20__periodics.yaml
index 5671c23875bde..4f8771042d8ee 100644
--- a/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.20__periodics.yaml
+++ b/ci-operator/config/openshift/gcp-filestore-csi-driver-operator/openshift-gcp-filestore-csi-driver-operator-release-4.20__periodics.yaml
@@ -83,6 +83,8 @@ operator:
     with: pipeline:livenessprobe-operand
   - pullspec: quay.io/openshift/origin-kube-rbac-proxy:latest
     with: pipeline:proxy-operand
+prowgen:
+  skip_operator_presubmits: true
 releases:
   initial:
     candidate:
diff --git a/ci-operator/config/psalajova/test/.config.prowgen b/ci-operator/config/psalajova/test/.config.prowgen
deleted file mode 100644
index ff7bc3bd9a15e..0000000000000
--- a/ci-operator/config/psalajova/test/.config.prowgen
+++ /dev/null
@@ -1 +0,0 @@
-enable_secrets_store_csi_driver: true
diff --git a/ci-operator/config/psalajova/test/psalajova-test-master.yaml b/ci-operator/config/psalajova/test/psalajova-test-master.yaml
index ddf05e29be653..0afba5501e2b2 100644
--- a/ci-operator/config/psalajova/test/psalajova-test-master.yaml
+++ b/ci-operator/config/psalajova/test/psalajova-test-master.yaml
@@ -3,6 +3,8 @@ build_root:
     name: release
     namespace: openshift
     tag: rhel-9-release-golang-1.20-openshift-4.17
+prowgen:
+  enable_secrets_store_csi_driver: true
 resources:
   '*':
     limits: