diff --git a/defaults/main.yml b/defaults/main.yml
index cf00724..d871f40 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -97,6 +97,8 @@ sahara_service_user_name: sahara
 sahara_service_project_name: service
 sahara_service_project_domain_id: default
 sahara_service_user_domain_id: default
+sahara_service_project_domain_name: Default
+sahara_service_user_domain_name: Default
 sahara_service_publicuri: "{{ sahara_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ sahara_service_port }}"
 sahara_service_publicurl: "{{ sahara_service_publicuri }}/v1.1/%(tenant_id)s"
 sahara_service_internaluri: "{{ sahara_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ sahara_service_port }}"
diff --git a/templates/sahara.conf.j2 b/templates/sahara.conf.j2
index 9528119..215ac78 100644
--- a/templates/sahara.conf.j2
+++ b/templates/sahara.conf.j2
@@ -41,11 +41,6 @@ project_name = {{ sahara_service_project_name }}
 username = {{ sahara_service_user_name }}
 password = {{ sahara_service_password }}
 
-# parameters needed for trusts creation
-admin_tenant_name = {{ sahara_service_project_name }}
-admin_user = {{ sahara_service_user_name }}
-admin_password = {{ sahara_service_password }}
-
 memcached_servers = {{ memcached_servers }}
 
 token_cache_time = 300
@@ -71,3 +66,11 @@ ssl = {{ sahara_oslomsg_rpc_use_ssl }}
 
 [profiler]
 enabled = {{ sahara_profiler_enabled }}
+
+[trustee]
+auth_url = {{ keystone_service_adminurl }}
+username = {{ sahara_service_user_name }}
+password = {{ sahara_service_password }}
+project_name = {{ sahara_service_project_name }}
+user_domain_name = {{ sahara_service_user_domain_name }}
+project_domain_name = {{ sahara_service_project_domain_name }}