diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 5a9c67394..4d882b784 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -494,11 +494,12 @@ mistral::api::api_workers: "%{::os_workers}"
 mistral::rabbit_userid: {{UNDERCLOUD_RABBIT_USERNAME}}
 mistral::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
 mistral::rabbit_host: {{LOCAL_IP}}
-mistral::auth_uri: "%{hiera('keystone_auth_uri')}"
-mistral::identity_uri: "%{hiera('keystone_identity_uri')}"
 mistral::database_connection: mysql+pymysql://mistral:{{UNDERCLOUD_MISTRAL_PASSWORD}}@{{LOCAL_IP}}/mistral
 mistral::rpc_backend: rabbit
-mistral::keystone_password: {{UNDERCLOUD_MISTRAL_PASSWORD}}
+mistral::keystone::authtoken::project_name: 'service'
+mistral::keystone::authtoken::auth_uri: "%{hiera('keystone_auth_uri')}"
+mistral::keystone::authtoken::auth_url: "%{hiera('keystone_identity_uri')}"
+mistral::keystone::authtoken::password: {{UNDERCLOUD_MISTRAL_PASSWORD}}
 mistral::keystone::auth::public_url: {{UNDERCLOUD_ENDPOINT_MISTRAL_PUBLIC}}
 mistral::keystone::auth::internal_url: {{UNDERCLOUD_ENDPOINT_MISTRAL_INTERNAL}}
 mistral::keystone::auth::admin_url: {{UNDERCLOUD_ENDPOINT_MISTRAL_ADMIN}}