diff --git a/defaults/main.yml b/defaults/main.yml
index 38b81be..4d0f533 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -101,6 +101,7 @@ manila_system_group_name: manila
 manila_system_comment: manila system user
 manila_system_shell: /bin/false
 manila_system_home_folder: "/var/lib/{{ manila_system_user_name }}"
+manila_system_slice_name: manila
 
 ## Manually specified manila UID/GID
 # Deployers can specify a UID for the manila user as well as the GID for the
@@ -114,7 +115,7 @@ manila_system_home_folder: "/var/lib/{{ manila_system_user_name }}"
 # manila_system_user_uid = <UID>
 # manila_system_group_gid = <GID>
 
-manila_lock_path: /var/lock/manila
+manila_lock_dir: "{{ openstack_lock_dir | default('/run/lock') }}"
 
 ## Manila Auth
 manila_service_admin_tenant_name: "service"
diff --git a/tasks/manila_install.yml b/tasks/manila_install.yml
index c71399b..342d111 100644
--- a/tasks/manila_install.yml
+++ b/tasks/manila_install.yml
@@ -62,8 +62,8 @@
     systemd_user_name: "{{ manila_system_user_name }}"
     systemd_group_name: "{{ manila_system_group_name }}"
     systemd_tempd_prefix: openstack
-    systemd_slice_name: manila
-    systemd_lock_path: /var/lock/manila
+    systemd_slice_name: "{{ manila_system_slice_name }}"
+    systemd_lock_dir:  "{{ manila_lock_dir }}"
     systemd_CPUAccounting: true
     systemd_BlockIOAccounting: true
     systemd_MemoryAccounting: true
diff --git a/templates/manila.conf.j2 b/templates/manila.conf.j2
index 42bb7ec..2bebceb 100644
--- a/templates/manila.conf.j2
+++ b/templates/manila.conf.j2
@@ -61,7 +61,7 @@ driver = {{ (manila_ceilometer_enabled | bool) | ternary('messagingv2', 'noop')
 transport_url = {{ manila_oslomsg_notify_transport }}://{% for host in manila_oslomsg_notify_servers.split(',') %}{{ manila_oslomsg_notify_userid }}:{{ manila_oslomsg_notify_password }}@{{ host }}:{{ manila_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ manila_oslomsg_notify_vhost }}{% if manila_oslomsg_notify_use_ssl | bool %}?ssl=1&ssl_version={{ manila_oslomsg_notify_ssl_version }}&ssl_ca_file={{ manila_oslomsg_notify_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
 
 [oslo_concurrency]
-lock_path = {{ manila_lock_path }}
+lock_path = {{ manila_lock_dir }}/{{ manila_system_slice_name }}
 
 [profiler]
 enabled = {{ manila_profiler_enabled }}