diff --git a/files/glance-api-paste.ini b/files/glance-api-paste.ini
index 583b70a82a..ed39fccf0b 100644
--- a/files/glance-api-paste.ini
+++ b/files/glance-api-paste.ini
@@ -1,7 +1,7 @@
 [pipeline:glance-api]
 #pipeline = versionnegotiation context apiv1app
 # NOTE: use the following pipeline for keystone
-pipeline = versionnegotiation authtoken auth-context apiv1app
+pipeline = versionnegotiation authtoken context apiv1app
 
 # To enable Image Cache Management API replace pipeline with below:
 # pipeline = versionnegotiation context imagecache apiv1app
@@ -38,12 +38,6 @@ auth_host = %KEYSTONE_AUTH_HOST%
 auth_port = %KEYSTONE_AUTH_PORT%
 auth_protocol = %KEYSTONE_AUTH_PROTOCOL%
 auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/
-# FIXME(dtroyer): remove admin_token after auth_token is updated
-admin_token = %SERVICE_TOKEN%
 admin_tenant_name = %SERVICE_TENANT_NAME%
 admin_user = %SERVICE_USERNAME%
 admin_password = %SERVICE_PASSWORD%
-
-[filter:auth-context]
-paste.filter_factory = glance.common.wsgi:filter_factory
-glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware
diff --git a/files/glance-registry-paste.ini b/files/glance-registry-paste.ini
index fe460d9e59..987a8a49c6 100644
--- a/files/glance-registry-paste.ini
+++ b/files/glance-registry-paste.ini
@@ -1,7 +1,7 @@
 [pipeline:glance-registry]
 #pipeline = context registryapp
 # NOTE: use the following pipeline for keystone
-pipeline = authtoken auth-context context registryapp
+pipeline = authtoken context registryapp
 
 [app:registryapp]
 paste.app_factory = glance.common.wsgi:app_factory
@@ -22,13 +22,6 @@ auth_host = %KEYSTONE_AUTH_HOST%
 auth_port = %KEYSTONE_AUTH_PORT%
 auth_protocol = %KEYSTONE_AUTH_PROTOCOL%
 auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/
-# FIXME(dtroyer): remove admin_token after auth_token is updated
-admin_token = %SERVICE_TOKEN%
 admin_tenant_name = %SERVICE_TENANT_NAME%
 admin_user = %SERVICE_USERNAME%
 admin_password = %SERVICE_PASSWORD%
-
-[filter:auth-context]
-context_class = glance.registry.context.RequestContext
-paste.filter_factory = glance.common.wsgi:filter_factory
-glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware