diff --git a/roles/openshift_setup/README.md b/roles/openshift_setup/README.md
index c8b0b4c3ef..e748274afb 100644
--- a/roles/openshift_setup/README.md
+++ b/roles/openshift_setup/README.md
@@ -26,5 +26,4 @@ effect if `cifmw_openshift_setup_ca_registry_to_add` is set.
             mirrors:
               - mirror.quay.rdoproject.org
         ```
-* `cifmw_openshift_setup_metal3_watch_all_ns`: (Boolean) Tells Metal3 BMO to watch resources out of its namespace. Defaults to `false`.
 * `cifmw_openshift_setup_apply_marketplace_fix`: (Boolean) Apply openshift-marketplace workaround which is recreating all pods in the namespace. NOTE: same step is done in `base` job.
diff --git a/roles/openshift_setup/defaults/main.yml b/roles/openshift_setup/defaults/main.yml
index 3f514ae50b..2133089aeb 100644
--- a/roles/openshift_setup/defaults/main.yml
+++ b/roles/openshift_setup/defaults/main.yml
@@ -24,7 +24,6 @@ cifmw_openshift_setup_skip_internal_registry: false
 cifmw_openshift_setup_skip_internal_registry_tls_verify: false
 cifmw_openshift_setup_ca_bundle_path: "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"
 cifmw_openshift_setup_digest_mirrors: []
-cifmw_openshift_setup_metal3_watch_all_ns: false
 cifmw_openshift_setup_operator_override_catalog_name: "redhat-operators-4.17"
 cifmw_openshift_setup_operator_override_catalog_namespace: "openshift-marketplace"
 cifmw_openshift_setup_operator_override_catalog_image: "registry.redhat.io/redhat/redhat-operator-index:v4.17"
diff --git a/roles/openshift_setup/tasks/main.yml b/roles/openshift_setup/tasks/main.yml
index 8b19bb697d..3e48b3e70f 100644
--- a/roles/openshift_setup/tasks/main.yml
+++ b/roles/openshift_setup/tasks/main.yml
@@ -213,10 +213,6 @@
       spec:
         repositoryDigestMirrors: "{{ cifmw_openshift_setup_digest_mirrors }}"
 
-- name: Metal3 tweaks
-  when: not cifmw_openshift_setup_dry_run
-  ansible.builtin.include_tasks: metal3_config.yml
-
 - name: Patch network operator when using OVNKubernetes backend
   ansible.builtin.import_tasks: patch_network_operator.yml
 
diff --git a/roles/openshift_setup/tasks/metal3_config.yml b/roles/openshift_setup/tasks/metal3_config.yml
deleted file mode 100644
index 0653914538..0000000000
--- a/roles/openshift_setup/tasks/metal3_config.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- name: Make Metal3 watch all namespaces
-  when:
-    - cifmw_openshift_setup_metal3_watch_all_ns | bool
-  environment:
-    KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
-    PATH: "{{ cifmw_path }}"
-  block:
-    - name: Fetch Metal3 configuration name
-      ansible.builtin.command:
-        cmd: "oc get Provisioning -o name"
-      register: _cifmw_openshift_setup_provisioning_name
-      changed_when: false
-
-    - name: Apply the patch to Metal3 Provisioning
-      ansible.builtin.command:
-        cmd: >-
-          oc patch {{ _cifmw_openshift_setup_provisioning_name.stdout }}
-          --type='json'
-          -p='[{"op": "replace", "path": "/spec/watchAllNamespaces", "value": true}]'
-      register: _cifmw_openshift_setup_provisioning_ns_patch_out
-      changed_when: "'no change' not in _cifmw_openshift_setup_provisioning_ns_patch_out.stdout"
diff --git a/scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-2nodesets.yml b/scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-2nodesets.yml
index f491145b4c..f83e476f68 100644
--- a/scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-2nodesets.yml
+++ b/scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-2nodesets.yml
@@ -104,7 +104,8 @@ cifmw_config_bmh: true
 # BMH are deployed in a differnt NS than the secret OSP BMO
 # references in each BMH. Metal3 requires the referenced
 # secrets to be in the same NS or be allowed to access them
-cifmw_openshift_setup_metal3_watch_all_ns: true
+cifmw_devscripts_config_overrides_patch_bmo_watch_all_namespaces:
+  bmo_watch_all_namespaces: true
 
 # Use EDPM image for computes
 cifmw_update_containers_edpm_image_url: "{{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/edpm-hardened-uefi:{{ cifmw_update_containers_tag }}"
diff --git a/scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-hci.yml b/scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-hci.yml
index 4aa27ae06d..c20e433037 100644
--- a/scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-hci.yml
+++ b/scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-hci.yml
@@ -104,7 +104,8 @@ cifmw_config_bmh: true
 # BMH are deployed in a differnt NS than the secret OSP BMO
 # references in each BMH. Metal3 requires the referenced
 # secrets to be in the same NS or be allowed to access them
-cifmw_openshift_setup_metal3_watch_all_ns: true
+cifmw_devscripts_config_overrides_patch_bmo_watch_all_namespaces:
+  bmo_watch_all_namespaces: true
 
 # Use EDPM image for computes
 cifmw_update_containers_edpm_image_url: "{{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/edpm-hardened-uefi:{{ cifmw_update_containers_tag }}"
diff --git a/scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-networker.yml b/scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-networker.yml
index 5c12324eb4..2158e72b6b 100644
--- a/scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-networker.yml
+++ b/scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-networker.yml
@@ -104,7 +104,8 @@ cifmw_config_bmh: true
 # BMH are deployed in a differnt NS than the secret OSP BMO
 # references in each BMH. Metal3 requires the referenced
 # secrets to be in the same NS or be allowed to access them
-cifmw_openshift_setup_metal3_watch_all_ns: true
+cifmw_devscripts_config_overrides_patch_bmo_watch_all_namespaces:
+  bmo_watch_all_namespaces: true
 
 # Use EDPM image for computes
 cifmw_update_containers_edpm_image_url: "{{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/edpm-hardened-uefi:{{ cifmw_update_containers_tag }}"
diff --git a/scenarios/reproducers/va-nfv-ovs-dpdk-sriov.yml b/scenarios/reproducers/va-nfv-ovs-dpdk-sriov.yml
index 965edd9310..11d50ee59c 100644
--- a/scenarios/reproducers/va-nfv-ovs-dpdk-sriov.yml
+++ b/scenarios/reproducers/va-nfv-ovs-dpdk-sriov.yml
@@ -104,7 +104,8 @@ cifmw_config_bmh: true
 # BMH are deployed in a differnt NS than the secret OSP BMO
 # references in each BMH. Metal3 requires the referenced
 # secrets to be in the same NS or be allowed to access them
-cifmw_openshift_setup_metal3_watch_all_ns: true
+cifmw_devscripts_config_overrides_patch_bmo_watch_all_namespaces:
+  bmo_watch_all_namespaces: true
 
 # Use EDPM image for computes
 cifmw_update_containers_edpm_image_url: "{{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/edpm-hardened-uefi:{{ cifmw_update_containers_tag }}"
diff --git a/scenarios/reproducers/va-nfv-ovs-dpdk.yml b/scenarios/reproducers/va-nfv-ovs-dpdk.yml
index 8b895d0f26..7808626270 100644
--- a/scenarios/reproducers/va-nfv-ovs-dpdk.yml
+++ b/scenarios/reproducers/va-nfv-ovs-dpdk.yml
@@ -104,7 +104,8 @@ cifmw_config_bmh: true
 # BMH are deployed in a differnt NS than the secret OSP BMO
 # references in each BMH. Metal3 requires the referenced
 # secrets to be in the same NS or be allowed to access them
-cifmw_openshift_setup_metal3_watch_all_ns: true
+cifmw_devscripts_config_overrides_patch_bmo_watch_all_namespaces:
+  bmo_watch_all_namespaces: true
 
 # Use EDPM image for computes
 cifmw_update_containers_edpm_image_url: "{{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/edpm-hardened-uefi:{{ cifmw_update_containers_tag }}"
diff --git a/scenarios/reproducers/va-nfv-ovs-sriov.yml b/scenarios/reproducers/va-nfv-ovs-sriov.yml
index 73ab35f5cb..7e4d2d2f20 100644
--- a/scenarios/reproducers/va-nfv-ovs-sriov.yml
+++ b/scenarios/reproducers/va-nfv-ovs-sriov.yml
@@ -102,7 +102,8 @@ cifmw_config_bmh: true
 # BMH are deployed in a differnt NS than the secret OSP BMO
 # references in each BMH. Metal3 requires the referenced
 # secrets to be in the same NS or be allowed to access them
-cifmw_openshift_setup_metal3_watch_all_ns: true
+cifmw_devscripts_config_overrides_patch_bmo_watch_all_namespaces:
+  bmo_watch_all_namespaces: true
 
 # Use EDPM image for computes
 cifmw_update_containers_edpm_image_url: "{{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/edpm-hardened-uefi:{{ cifmw_update_containers_tag }}"