diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml
index d644f63ff3..c489f460cb 100644
--- a/deployment/manila/manila-share-container-puppet.yaml
+++ b/deployment/manila/manila-share-container-puppet.yaml
@@ -90,7 +90,7 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [ManilaBase, role_data, config_settings]
-          - manila::volume::cinder::cinder_admin_tenant_name: 'service'
+          -
             # keystone_authtoken
             manila::keystone::authtoken::password: {get_param: ManilaPassword}
             manila::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
@@ -117,6 +117,15 @@ outputs:
             manila::network::neutron::project_domain_name: 'Default'
             manila::network::neutron::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
             manila::network::neutron::region_name: {get_param: KeystoneRegion}
+            # volume
+            manila::volume::cinder::username: 'manila'
+            manila::volume::cinder::password: {get_param: ManilaPassword}
+            manila::volume::cinder::auth_type: 'password'
+            manila::volume::cinder::project_name: 'service'
+            manila::volume::cinder::user_domain_name: 'Default'
+            manila::volume::cinder::project_domain_name: 'Default'
+            manila::volume::cinder::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
+            manila::volume::cinder::region_name: {get_param: KeystoneRegion}
       service_config_settings:
         {get_attr: [ManilaBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS