diff --git a/heat/files/mitaka/heat.conf.Debian b/heat/files/mitaka/heat.conf.Debian
index 7c1ac1a..72856bf 100644
--- a/heat/files/mitaka/heat.conf.Debian
+++ b/heat/files/mitaka/heat.conf.Debian
@@ -445,8 +445,8 @@
 username = {{ server.identity.user }}
 password = {{ server.identity.password }}
 user_domain_name = default
-project_domain_id=Default
-user_domain_id=Default
+project_domain_id = {{ server.identity.get('domain', 'default') }}
+user_domain_id = {{ server.identity.get('domain', 'default') }}
 
 [matchmaker_redis]