diff --git a/defaults/main.yml b/defaults/main.yml
index 658d3c15..1c434c2e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -63,6 +63,7 @@ neutron_lib_dir: "{{ neutron_bin | dirname }}/lib/python2.7/site-packages/"
 
 # Set the Neutron configuration path
 neutron_conf_dir: /etc/neutron
+neutron_lock_path: "/var/lock/neutron"
 
 # Enable/Disable designate
 neutron_designate_enabled: False
diff --git a/tasks/neutron_init_systemd.yml b/tasks/neutron_init_systemd.yml
index 2101dede..4d67fe22 100644
--- a/tasks/neutron_init_systemd.yml
+++ b/tasks/neutron_init_systemd.yml
@@ -29,10 +29,10 @@
     group: "{{ system_group }}"
     mode: "02755"
 
-- name: Create tempfile.d entry
+- name: Create tmpfiles.d entry
   template:
-    src: "neutron-systemd-tempfiles.j2"
-    dest: "/etc/tmpfiles.d/neutron.conf"
+    src: "neutron-systemd-tmpfiles.j2"
+    dest: "/etc/tmpfiles.d/{{ program_name }}.conf"
     mode: "0644"
     owner: "root"
     group: "root"
diff --git a/tasks/neutron_pre_install.yml b/tasks/neutron_pre_install.yml
index 0fe9e989..b70e2af3 100644
--- a/tasks/neutron_pre_install.yml
+++ b/tasks/neutron_pre_install.yml
@@ -44,7 +44,7 @@
     - { path: "{{ neutron_conf_dir }}/rootwrap.d", owner: "root", group: "root" }
     - { path: "/etc/sudoers.d", mode: "0750", owner: "root", group: "root" }
     - { path: "/var/cache/neutron" }
-    - { path: "/var/lock/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-systemd-tempfiles.j2 b/templates/neutron-systemd-tmpfiles.j2
similarity index 68%
rename from templates/neutron-systemd-tempfiles.j2
rename to templates/neutron-systemd-tmpfiles.j2
index 3e73b168..ef8f6bca 100644
--- a/templates/neutron-systemd-tempfiles.j2
+++ b/templates/neutron-systemd-tmpfiles.j2
@@ -1,4 +1,5 @@
 # {{ ansible_managed }}
 
 D /var/lock/{{ program_name }} 2755 {{ system_user }} {{ system_group }}
-D /var/run/{{ program_name }} 2755 {{ system_user }} {{ system_group }}
\ No newline at end of file
+D /var/run/{{ program_name }} 2755 {{ system_user }} {{ system_group }}
+D {{ neutron_lock_path }} 2755 {{ system_user }} {{ system_group }}
diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2
index 86d2f8ad..6b7a778a 100644
--- a/templates/neutron.conf.j2
+++ b/templates/neutron.conf.j2
@@ -197,4 +197,4 @@ transport_url = rabbit://{% for host in neutron_rabbitmq_telemetry_servers.split
 
 # Concurrency (locking mechanisms)
 [oslo_concurrency]
-lock_path = /var/lock/neutron
+lock_path = {{ neutron_lock_path }}