diff --git a/attributes/heat_conf.rb b/attributes/heat_conf.rb
index dad5ac3..f99cea0 100644
--- a/attributes/heat_conf.rb
+++ b/attributes/heat_conf.rb
@@ -26,3 +26,4 @@ default['openstack']['orchestration']['conf']['keystone_authtoken']['project_dom
 default['openstack']['orchestration']['conf']['keystone_authtoken']['user_domain_name'] = 'Default'
 default['openstack']['orchestration']['conf']['trustee']['auth_plugin'] = 'v3password'
 default['openstack']['orchestration']['conf']['trustee']['username'] = 'heat'
+default['openstack']['orchestration']['conf']['trustee']['user_domain_name'] = node['openstack']['orchestration']['conf']['keystone_authtoken']['user_domain_name']
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a1dd002..ae8a398 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -221,7 +221,8 @@ shared_examples 'expects to create heat conf' do
           %r{^auth_url = http://127.0.0.1:35357/v3$},
           /^auth_plugin = v3password$/,
           /^username = heat$/,
-          /^password = heat-pass$/
+          /^password = heat-pass$/,
+          /^user_domain_name = Default$/
         ].each do |line|
           expect(chef_run).to render_config_file(file.name).with_section_content('trustee', line)
         end