diff --git a/etc/api-paste.ini b/etc/api-paste.ini
index c2ca6665d0..b8e8ee1425 100644
--- a/etc/api-paste.ini
+++ b/etc/api-paste.ini
@@ -13,13 +13,6 @@ paste.filter_factory = quantum.auth:QuantumKeystoneContext.factory
 
 [filter:authtoken]
 paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
-auth_host = 127.0.0.1
-auth_port = 35357
-auth_protocol = http
-admin_tenant_name = %SERVICE_TENANT_NAME%
-admin_user = %SERVICE_USER%
-admin_password = %SERVICE_PASSWORD%
-signing_dir = /var/lib/quantum/keystone-signing
 
 [filter:extensions]
 paste.filter_factory = quantum.api.extensions:plugin_aware_extension_middleware_factory
diff --git a/etc/quantum.conf b/etc/quantum.conf
index 01c00bfbe0..f78da1deae 100644
--- a/etc/quantum.conf
+++ b/etc/quantum.conf
@@ -207,3 +207,12 @@ notification_topics = notifications
 # root filter facility.
 # Change to "sudo" to skip the filtering and just run the comand directly
 # root_helper = sudo
+
+[keystone_authtoken]
+auth_host = 127.0.0.1
+auth_port = 35357
+auth_protocol = http
+admin_tenant_name = %SERVICE_TENANT_NAME%
+admin_user = %SERVICE_USER%
+admin_password = %SERVICE_PASSWORD%
+signing_dir = /var/lib/quantum/keystone-signing