diff --git a/ansible/roles/manila/defaults/main.yml b/ansible/roles/manila/defaults/main.yml
index 58f8cdd5bb..664f88be03 100644
--- a/ansible/roles/manila/defaults/main.yml
+++ b/ansible/roles/manila/defaults/main.yml
@@ -38,7 +38,7 @@ manila_v2_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{
 manila_logging_debug: "{{ openstack_logging_debug }}"
 
 manila_keystone_user: "manila"
-
-manila_tenant_name: "manila_tenant"
+manila_service_instance_user: "manila"
+manila_service_instance_password: "manila"
 
 openstack_manila_auth: "{'auth_url':'{{ openstack_auth.auth_url }}','username':'{{ openstack_auth.username }}','password':'{{ openstack_auth.password }}','project_name':'{{ openstack_auth.project_name }}'}"
diff --git a/ansible/roles/manila/templates/manila.conf.j2 b/ansible/roles/manila/templates/manila.conf.j2
index ab4013980d..5f1ff9fa75 100644
--- a/ansible/roles/manila/templates/manila.conf.j2
+++ b/ansible/roles/manila/templates/manila.conf.j2
@@ -67,8 +67,8 @@ driver_handles_share_servers = False
 # service VMs in Nova. And following are data for some specific image.
 # We used one defined in [1]
 # [1] https://github.com/openstack/manila/blob/6785cad9/devstack/plugin.sh#L86
-service_instance_password = {{ service_instance_password }}
-service_instance_user = {{ service_instance_user }}
+service_instance_password = {{ manila_service_instance_password }}
+service_instance_user = {{ manila_service_instance_user }}
 service_image_name = manila-service-image
 
 # These will be used for keypair creation and inserted into service VMs.
diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml
index 626a7ae429..a98911c3b5 100644
--- a/etc/kolla/passwords.yml
+++ b/etc/kolla/passwords.yml
@@ -69,13 +69,6 @@ manila_keystone_password: "password"
 
 memcache_secret_key: "password"
 
-####################
-# Manila options
-####################
-service_instance_password: "manila"
-service_instance_user: "manila"
-
-
 ####################
 # RabbitMQ options
 ####################