diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 3e23e2f..e35ab95 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -8,6 +8,9 @@ configs:
       password: password
       name: murano
 
+    username: murano
+    password: murano
+
     logging_debug: false
 
     networking:
diff --git a/service/files/murano.conf.j2 b/service/files/murano.conf.j2
index f6bc686..51f7a57 100644
--- a/service/files/murano.conf.j2
+++ b/service/files/murano.conf.j2
@@ -18,16 +18,7 @@ connection = mysql+pymysql://{{ murano.db.username }}:{{ murano.db.password }}@{
 use_trusts = True
 packages_service = murano
 
-[keystone_authtoken]
-auth_version = v3
-auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
-auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3
-auth_plugin = password
-project_domain_id = default
-user_domain_id = default
-project_name = service
-username = {{ murano.db.username }}
-password = {{ murano.db.password }}
+{{ keystone_authtoken.keystone_authtoken(murano.username, murano.password) }}
 
 [rabbitmq]
 host = {{ k8s_external_ip }}
diff --git a/service/murano-api.yaml b/service/murano-api.yaml
index bedbb7b..ff5af44 100644
--- a/service/murano-api.yaml
+++ b/service/murano-api.yaml
@@ -30,12 +30,12 @@ service:
             - murano.conf
         - name: murano-user-create
           type: single
-          command: openstack user create --project service --password {{ murano.db.password }} {{ murano.db.username }}
+          command: openstack user create --domain {{ service_account.domain }} --password {{ murano.password }} {{ murano.username }}
           dependencies:
-            - keystone-create-project
+            - keystone-create-domain
         - name: murano-role-add
           type: single
-          command: openstack role add --project service --user {{ murano.db.username }} admin
+          command: openstack role add --domain {{ service_account.domain }} --user {{ murano.username }} admin
           dependencies:
             - murano-user-create
         - name: murano-service-create