diff --git a/etc/glance-api-paste.ini b/etc/glance-api-paste.ini
index a1c85f56..37b3f35a 100644
--- a/etc/glance-api-paste.ini
+++ b/etc/glance-api-paste.ini
@@ -71,7 +71,9 @@ auth_host = 127.0.0.1
 auth_port = 35357
 auth_protocol = http
 auth_uri = http://127.0.0.1:5000/
-admin_token = 999888777666
+admin_tenant_name = %SERVICE_TENANT_NAME%
+admin_user = %SERVICE_USER%
+admin_password = %SERVICE_PASSWORD%
 
 [filter:auth-context]
 paste.filter_factory = glance.common.wsgi:filter_factory
diff --git a/etc/glance-registry-paste.ini b/etc/glance-registry-paste.ini
index 4aabeb4b..010117ea 100644
--- a/etc/glance-registry-paste.ini
+++ b/etc/glance-registry-paste.ini
@@ -28,7 +28,9 @@ auth_host = 127.0.0.1
 auth_port = 35357
 auth_protocol = http
 auth_uri = http://127.0.0.1:5000/
-admin_token = 999888777666
+admin_tenant_name = %SERVICE_TENANT_NAME%
+admin_user = %SERVICE_USER%
+admin_password = %SERVICE_PASSWORD%
 
 [filter:auth-context]
 context_class = glance.registry.context.RequestContext