diff --git a/ansible/roles/freezer/templates/freezer.conf.j2 b/ansible/roles/freezer/templates/freezer.conf.j2
index 6301f2cb3191b484d96ecf2eee31d1a5d469a669..3da301ceff64ec90e597a10b98c1574bb2dfe127 100644
--- a/ansible/roles/freezer/templates/freezer.conf.j2
+++ b/ansible/roles/freezer/templates/freezer.conf.j2
@@ -16,9 +16,9 @@ os_username = {{ openstack_auth.username }}
 os_password = {{ openstack_auth.password }}
 os_auth_url = {{ openstack_auth.auth_url }}
 os_project_name = {{ keystone_admin_project }}
-os_project_domain_name = {{ openstack_auth.domain_name }}
 # TODO: transition to system scoped token when freezer supports that
-# configuration option
+# configuration option, os_project_domain_name should be removed.
+os_project_domain_name = {{ default_project_domain_name }}
 os_user_domain_name = {{ openstack_auth.user_domain_name }}
 {% endif %}