diff --git a/service/files/glance-api.conf.j2 b/service/files/glance-api.conf.j2
index 502364a..c27d094 100644
--- a/service/files/glance-api.conf.j2
+++ b/service/files/glance-api.conf.j2
@@ -27,7 +27,7 @@ auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
 auth_type = password
 project_domain_id = default
 user_domain_id = default
-project_name = {{ openstack.project_name }}
+project_name = service
 username = {{ glance.user }}
 password = {{ glance.password }}
 memcached_servers = {{ address('memcached', memcached.port) }}
diff --git a/service/files/glance-swift-store.conf.j2 b/service/files/glance-swift-store.conf.j2
index a50fd52..d6cfb8a 100644
--- a/service/files/glance-swift-store.conf.j2
+++ b/service/files/glance-swift-store.conf.j2
@@ -1,7 +1,7 @@
 [swift]
 auth_version = 3
 auth_address = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
-user = {{ openstack.project_name }}:{{ glance.user }}
+user = service:{{ glance.user }}
 key = {{ glance.password }}
 project_domain_id = default
 user_domain_id = default
diff --git a/service/glance-api.yaml b/service/glance-api.yaml
index 0b602e2..a3b4f9b 100644
--- a/service/glance-api.yaml
+++ b/service/glance-api.yaml
@@ -36,7 +36,7 @@ service:
           dependencies:
             - glance-user-create
           type: single
-          command: openstack role add --project {{ openstack.project_name }} --user {{ glance.user }} admin
+          command: openstack role add --project service --user {{ glance.user }} admin
         - name: glance-service-create
           dependencies:
             - keystone