diff --git a/openstack/nova-hypervisor-agents/templates/etc-secret.yaml b/openstack/nova-hypervisor-agents/templates/etc-secret.yaml
index c1dc5f83e57..7313f7bab29 100644
--- a/openstack/nova-hypervisor-agents/templates/etc-secret.yaml
+++ b/openstack/nova-hypervisor-agents/templates/etc-secret.yaml
@@ -30,3 +30,5 @@ stringData:
     [service_user]
     username = nova
     password = {{ required ".Values.global.nova_service_password is missing" .Values.global.nova_service_password | include "resolve_secret" }}
+
+    {{- include "ini_sections.audit_middleware_notifications" . }}
diff --git a/openstack/nova-hypervisor-agents/templates/etc/_nova.conf.tpl b/openstack/nova-hypervisor-agents/templates/etc/_nova.conf.tpl
index f84ebd9feb6..033b2273c2c 100644
--- a/openstack/nova-hypervisor-agents/templates/etc/_nova.conf.tpl
+++ b/openstack/nova-hypervisor-agents/templates/etc/_nova.conf.tpl
@@ -38,8 +38,6 @@ until_refresh = {{ .Values.usage_until_refresh | default 0 }}
 
 {{- include "osprofiler" . }}
 
-{{ include "ini_sections.oslo_messaging_rabbit" .}}
-
 [oslo_concurrency]
 lock_path = /var/lib/nova/tmp
 
@@ -104,9 +102,6 @@ project_domain_name = "{{.Values.global.keystone_service_domain | default "Defau
 valid_interfaces = public
 region_name = {{.Values.global.region}}
 
-{{- include "ini_sections.audit_middleware_notifications" . }}
-
-
 [barbican]
 backend = barbican
 auth_endpoint = {{ include "identity_service_url" . }}