diff --git a/ci/scenarios/edpm.yml b/ci/scenarios/edpm.yml
index 460a9fb3..14799bde 100644
--- a/ci/scenarios/edpm.yml
+++ b/ci/scenarios/edpm.yml
@@ -63,20 +63,7 @@ cifmw_edpm_prepare_kustomizations:
           metadata:
             name: controlplane
           spec:
-            nova:
-              template:
-                notificationsBusInstance: rabbitmq-notifications
-        target:
-          kind: OpenStackControlPlane
-      - patch: |-
-          apiVersion: core.openstack.org/v1beta1
-          kind: OpenStackControlPlane
-          metadata:
-            name: controlplane
-          spec:
-            cinder:
-              template:
-                notificationsBusInstance: rabbitmq-notifications
+            notificationsBusInstance: rabbitmq-notifications
         target:
           kind: OpenStackControlPlane
       - patch: |-
@@ -88,7 +75,6 @@ cifmw_edpm_prepare_kustomizations:
             rabbitmq:
               templates:
                 rabbitmq-notifications:
-                  delayStartSeconds: 30
                   override:
                     service:
                       metadata:
@@ -107,11 +93,10 @@ cifmw_edpm_prepare_kustomizations:
           spec:
             watcher:
               enabled: true
-              template:
-                notificationsBusInstance: rabbitmq-notifications
         target:
           kind: OpenStackControlPlane
 
+
 cifmw_edpm_prepare_timeout: 60
 
 cifmw_install_yamls_whitelisted_vars: