diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml
index 5a7a96b09..dd62864b7 100644
--- a/ansible/roles/kolla-openstack/defaults/main.yml
+++ b/ansible/roles/kolla-openstack/defaults/main.yml
@@ -266,7 +266,7 @@ kolla_openstack_custom_config_rules_default:
   - glob: "**/multipath.conf"
     strategy: template
     priority: 1000
-  - glob: "**/rabbitmq*.conf"
+  - glob: "rabbitmq/**/*"
     strategy: template
     priority: 1000
   - glob: "**/*wsgi*.conf"
diff --git a/releasenotes/notes/add-custom-rabbitmq-conf-7c3927e1024f0be1.yaml b/releasenotes/notes/add-custom-rabbitmq-conf-7c3927e1024f0be1.yaml
new file mode 100644
index 000000000..b47d7f567
--- /dev/null
+++ b/releasenotes/notes/add-custom-rabbitmq-conf-7c3927e1024f0be1.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Added fix for the custom RabbitMQ configuration. Fixed incorrect path and
+    glob, so now you can template also all other configuration files such as
+    ``advanced.config``, ``definitions.json``, ``enabled_plugins``, and
+    ``erl_inetrc`` together with ``rabbitmq.conf`` and ``rabbitmq-env.conf``.