diff --git a/cinder/values.yaml b/cinder/values.yaml
index 1553e9f75c..b29aec4658 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -893,7 +893,7 @@ conf:
           message-ttl: 70000
         priority: 0
         apply-to: all
-        pattern: '(notifications)\.'
+        pattern: '^(?!amq\.).*'
 
   backends:
     # Those options will be written to backends.conf as-is.
diff --git a/glance/values.yaml b/glance/values.yaml
index aa7be8f9e0..1f25295af3 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -446,7 +446,7 @@ conf:
           message-ttl: 70000
         priority: 0
         apply-to: all
-        pattern: '(notifications)\.'
+        pattern: '^(?!amq\.).*'
 
 network:
   api:
diff --git a/heat/values.yaml b/heat/values.yaml
index f1a8e08844..da5eea27d8 100644
--- a/heat/values.yaml
+++ b/heat/values.yaml
@@ -575,7 +575,7 @@ conf:
           message-ttl: 70000
         priority: 0
         apply-to: all
-        pattern: '(notifications)\.'
+        pattern: '^(?!amq\.).*'
 
 network:
   api:
diff --git a/keystone/values.yaml b/keystone/values.yaml
index 7423ada229..6543828de8 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -798,7 +798,7 @@ conf:
           message-ttl: 70000
         priority: 0
         apply-to: all
-        pattern: '(notifications)\.'
+        pattern: '^(?!amq\.).*'
   rally_tests:
     run_tempest: false
     tests:
diff --git a/neutron/values.yaml b/neutron/values.yaml
index fcbdee47b4..0dd9df8fba 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -1673,7 +1673,7 @@ conf:
           message-ttl: 70000
         priority: 0
         apply-to: all
-        pattern: '(notifications)\.'
+        pattern: '^(?!amq\.).*'
   ## NOTE: "besteffort" is meant for dev env with mixed compute type only.
   ##       This helps prevent sriov init script from failing due to mis-matched NIC
   ##       For prod env, target NIC should match and init script should fail otherwise.
diff --git a/nova/values.yaml b/nova/values.yaml
index b989702ee0..086c9c7c91 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -1742,7 +1742,7 @@ conf:
           message-ttl: 70000
         priority: 0
         apply-to: all
-        pattern: '(notifications)\.'
+        pattern: '^(?!amq\.).*'
 
 # Names of secrets used by bootstrap and environmental checks
 secrets: