diff --git a/tasks/main.yml b/tasks/main.yml
index 8cb7c729..828ee668 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -131,8 +131,8 @@
     systemd_user_name: "{{ neutron_system_user_name }}"
     systemd_group_name: "{{ neutron_system_group_name }}"
     systemd_tempd_prefix: openstack
-    systemd_slice_name: neutron
-    systemd_lock_path: /var/lock/neutron
+    systemd_slice_name: "{{ neutron_system_slice_name }}"
+    systemd_lock_dir: "{{ neutron_lock_dir }}"
     systemd_CPUAccounting: true
     systemd_BlockIOAccounting: true
     systemd_MemoryAccounting: true
diff --git a/tasks/neutron_pre_install.yml b/tasks/neutron_pre_install.yml
index ff10c2e0..6065b326 100644
--- a/tasks/neutron_pre_install.yml
+++ b/tasks/neutron_pre_install.yml
@@ -69,9 +69,6 @@
       mode: "0750"
       owner: "root"
       group: "root"
-    - path: "/var/cache/neutron"
-    - path: "{{ neutron_lock_path }}"
-    - path: "/var/run/neutron"
     - path: "{{ neutron_system_home_folder }}"
       mode: "0755"
     - path: "{{ neutron_system_home_folder }}/ha_confs"
diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2
index ff474bd1..0ea61377 100644
--- a/templates/neutron.conf.j2
+++ b/templates/neutron.conf.j2
@@ -237,7 +237,7 @@ transport_url = {{ neutron_oslomsg_notify_transport }}://{% for host in neutron_
 
 # Concurrency (locking mechanisms)
 [oslo_concurrency]
-lock_path = {{ neutron_lock_path }}
+lock_path = {{ neutron_lock_dir }}/{{ neutron_system_slice_name }}
 
 {% if neutron_services['neutron-server']['group'] in group_names and 'sfc' in neutron_plugin_base %}
 # ODL-SFC
diff --git a/vars/main.yml b/vars/main.yml
index 195e75ce..9e01a3da 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -131,12 +131,13 @@ neutron_venv_packages: >-
 
 neutron_conf_dir: /etc/neutron
 neutron_conf_version_dir: "{{ (neutron_install_method == 'distro') | ternary(neutron_conf_dir, (neutron_bin | dirname) + '/etc/neutron') }}"
-neutron_lock_path: "/var/lock/neutron"
+neutron_lock_dir: "{{ openstack_lock_dir | default('/run/lock') }}"
 neutron_system_user_name: neutron
 neutron_system_group_name: neutron
 neutron_system_comment: neutron system user
 neutron_system_shell: /bin/false
 neutron_system_home_folder: "/var/lib/{{ neutron_system_user_name }}"
+neutron_system_slice_name: neutron
 
 ###
 ### DB (Galera) integration