diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index aec050b17a..b091222ba4 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -171,11 +171,7 @@ function configure_manila {
     # Remove old conf file if exists
     rm -f $MANILA_CONF
 
-    iniset $MANILA_CONF keystone_authtoken identity_uri $KEYSTONE_AUTH_URI
-    iniset $MANILA_CONF keystone_authtoken admin_tenant_name $SERVICE_PROJECT_NAME
-    iniset $MANILA_CONF keystone_authtoken admin_user manila
-    iniset $MANILA_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
-    iniset $MANILA_CONF keystone_authtoken signing_dir $MANILA_AUTH_CACHE_DIR
+    configure_auth_token_middleware $MANILA_CONF manila  $MANILA_AUTH_CACHE_DIR
 
     iniset $MANILA_CONF DEFAULT auth_strategy keystone
     iniset $MANILA_CONF DEFAULT debug True