diff --git a/defaults/main.yml b/defaults/main.yml
index 0f92e90..4a16fd0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -81,8 +81,9 @@ heat_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit')
 heat_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}"
 heat_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}"
 heat_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}"
-heat_oslomsg_notify_userid: heat
-heat_oslomsg_notify_vhost: /heat
+heat_oslomsg_notify_userid: "{{ heat_oslomsg_rpc_userid }}"
+heat_oslomsg_notify_password: "{{ heat_oslomsg_rpc_password }}"
+heat_oslomsg_notify_vhost: "{{ heat_oslomsg_rpc_vhost }}"
 
 ## Heat User / Group
 heat_system_user_name: heat