diff --git a/contrib/devstack/lib/mistral b/contrib/devstack/lib/mistral
index 0e1fee3aa..9de7b7aea 100644
--- a/contrib/devstack/lib/mistral
+++ b/contrib/devstack/lib/mistral
@@ -110,12 +110,12 @@ function configure_mistral {
     #-------------------------
 
     # Setup keystone_authtoken section
-    iniset $MISTRAL_CONF_FILE keystone auth_host $KEYSTONE_AUTH_HOST
-    iniset $MISTRAL_CONF_FILE keystone auth_port $KEYSTONE_AUTH_PORT
-    iniset $MISTRAL_CONF_FILE keystone auth_protocol $KEYSTONE_AUTH_PROTOCOL
-    iniset $MISTRAL_CONF_FILE keystone admin_tenant_name $SERVICE_TENANT_NAME
-    iniset $MISTRAL_CONF_FILE keystone admin_user $MISTRAL_ADMIN_USER
-    iniset $MISTRAL_CONF_FILE keystone admin_password $SERVICE_PASSWORD
+    iniset $MISTRAL_CONF_FILE keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
+    iniset $MISTRAL_CONF_FILE keystone_authtoken auth_port $KEYSTONE_AUTH_PORT
+    iniset $MISTRAL_CONF_FILE keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
+    iniset $MISTRAL_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
+    iniset $MISTRAL_CONF_FILE keystone_authtoken admin_user $MISTRAL_ADMIN_USER
+    iniset $MISTRAL_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD
 
     # Setup RabbitMQ credentials
     iniset $MISTRAL_CONF_FILE DEFAULT rabbit_password $RABBIT_PASSWORD
@@ -124,7 +124,7 @@ function configure_mistral {
     iniset $MISTRAL_CONF_FILE database connection `database_connection_url mistral`
 
     # Configure keystone auth url
-    iniset $MISTRAL_CONF_FILE keystone auth_uri "http://${KEYSTONE_AUTH_HOST}:5000/v3"
+    iniset $MISTRAL_CONF_FILE keystone_authtoken auth_uri "http://${KEYSTONE_AUTH_HOST}:5000/v3"
 }