diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 15ccc94b480d16fe63dbf88c4a3971b0fd061658..7cc6dcab3adf2443b7e11e5757632e8d1930ca40 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -375,5 +375,4 @@ ceph_cache_rule: "cache host firstn"
 #######################################
 # Manila - Shared File Systems Options
 #######################################
-manila_enable_dhss: "yes"
-manila_dhss: "{{ 'True' if manila_enable_dhss | bool else 'False' }}"
+driver_handles_share_servers: "True"
diff --git a/ansible/roles/manila/tasks/config.yml b/ansible/roles/manila/tasks/config.yml
index 6b4cb91f21ef557febf3bfb9fa85e5a9def720f8..4f83ff55b46a5685276708a7803703fe3ad64aaf 100644
--- a/ansible/roles/manila/tasks/config.yml
+++ b/ansible/roles/manila/tasks/config.yml
@@ -46,6 +46,7 @@
       - "{{ node_custom_config }}/database.conf"
       - "{{ node_custom_config }}/messaging.conf"
       - "{{ node_custom_config }}/manila.conf"
+      - "{{ node_custom_config }}/{{ item }}.conf"
       - "{{ node_custom_config }}/manila/{{ item }}.conf"
       - "{{ node_custom_config }}/manila/{{ inventory_hostname }}/manila.conf"
     dest: "{{ node_config_directory }}/{{ item }}/manila.conf"
diff --git a/ansible/roles/manila/templates/manila-share.conf.j2 b/ansible/roles/manila/templates/manila-share.conf.j2
index b604a0de52a65b67f1d5875226881d703079d6dc..b08718ef8f2305c66c25d2c5fa8e4b38cf4ae654 100644
--- a/ansible/roles/manila/templates/manila-share.conf.j2
+++ b/ansible/roles/manila/templates/manila-share.conf.j2
@@ -62,11 +62,7 @@ interface_driver = manila.network.linux.interface.BridgeInterfaceDriver
 # Generic driver supports both driver modes - with and without handling
 # of share servers. So, we need to define explicitly which one we are
 # enabling using this driver.
-{% if manila_dhss == "True" %}
-driver_handles_share_servers = True
-{% elif manila_dhss == "False" %}
-driver_handles_share_servers = False
-{% endif %}
+driver_handles_share_servers = {{ driver_handles_share_servers }}
 
 # Generic driver is the only driver that uses image from Glance for building
 # service VMs in Nova. And following are data for some specific image.
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 2ab095832197e93a0c68dad1d81bfd06bd3f6201..843cf699b36ab7be886b9035d92b214d66d65ecb 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -201,7 +201,8 @@ kolla_internal_vip_address: "10.10.10.254"
 #######################################
 # Manila - Shared File Systems Options
 #######################################
-#manila_enable_dhss: "yes"
+# Valid options are [ True, False ]
+#driver_handles_share_servers: "True"
 
 
 ##################################