diff --git a/deployment/cinder/cinder-base.yaml b/deployment/cinder/cinder-base.yaml
index 689e65e956..57c4f953a6 100644
--- a/deployment/cinder/cinder-base.yaml
+++ b/deployment/cinder/cinder-base.yaml
@@ -136,6 +136,11 @@ outputs:
         cinder::cron::db_purge::destination: {get_param: CinderCronDbPurgeDestination}
         cinder::cron::db_purge::max_delay: {get_param: CinderCronDbPurgeMaxDelay}
         cinder::glance::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
+        cinder::keystone::service_user::send_service_user_token: true
+        cinder::keystone::service_user::project_name: service
+        cinder::keystone::service_user::auth_type: password
+        cinder::keystone::service_user::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
+        cinder::keystone::service_user::password: {get_param: CinderPassword}
         cinder::nova::interface: admin
         cinder::nova::project_name: service
         cinder::nova::auth_type: password
diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml
index e4867b5c39..cac9ee52ae 100644
--- a/deployment/nova/nova-base-puppet.yaml
+++ b/deployment/nova/nova-base-puppet.yaml
@@ -256,6 +256,11 @@ outputs:
               params:
                 $NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
           nova::rabbit_use_ssl: {get_param: RpcUseSSL}
+          nova::keystone::service_user::send_service_user_token: true
+          nova::keystone::service_user::project_name: 'service'
+          nova::keystone::service_user::password: {get_param: NovaPassword}
+          nova::keystone::service_user::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
+          nova::keystone::service_user::region_name: {get_param: KeystoneRegion}
           nova::placement::project_name: 'service'
           nova::placement::password: {get_param: PlacementPassword}
           nova::placement::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}