diff --git a/service/files/glance-api.conf.j2 b/service/files/glance-api.conf.j2
index b1ef83d..46ea986 100644
--- a/service/files/glance-api.conf.j2
+++ b/service/files/glance-api.conf.j2
@@ -19,17 +19,7 @@ show_multiple_locations = true
 connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
 max_retries = -1
 
-[keystone_authtoken]
-auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
-auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
-auth_type = password
-project_domain_id = default
-user_domain_id = default
-project_name = service
-username = {{ glance.user }}
-password = {{ glance.password }}
-memcached_servers = {{ address('memcached', memcached.port) }}
-
+{{ keystone_authtoken.keystone_authtoken(glance.user, glance.password) }}
 
 [paste_deploy]
 flavor = keystone
diff --git a/service/files/glance-registry.conf.j2 b/service/files/glance-registry.conf.j2
index 4591da6..e22bf02 100644
--- a/service/files/glance-registry.conf.j2
+++ b/service/files/glance-registry.conf.j2
@@ -12,17 +12,6 @@ bind_port = {{ glance.registry_port.cont }}
 connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
 max_retries = -1
 
-[keystone_authtoken]
-auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
-auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
-auth_type = password
-project_domain_id = default
-user_domain_id = default
-project_name = service
-username = {{ glance.user }}
-password = {{ glance.password }}
-memcached_servers = {{ address('memcached', memcached.port) }}
-
 [paste_deploy]
 flavor = keystone
 
diff --git a/service/glance-api.yaml b/service/glance-api.yaml
index e0bdaf1..9166132 100644
--- a/service/glance-api.yaml
+++ b/service/glance-api.yaml
@@ -30,15 +30,14 @@ service:
           command: glance-manage db_sync
         - name: glance-user-create
           dependencies:
-            - keystone
+            - keystone-create-domain
           type: single
-          command: openstack user create --domain default --password {{ glance.password  }} {{ glance.user }}
+          command: openstack user create --domain {{ service_account.domain }} --password {{ glance.password  }} {{ glance.user }}
         - name: glance-role-add
           dependencies:
             - glance-user-create
-            - keystone-create-project
           type: single
-          command: openstack role add --project service --user {{ glance.user }} admin
+          command: openstack role add --domain {{ service_account.domain }} --user {{ glance.user }} admin
         - name: glance-service-create
           dependencies:
             - keystone