diff --git a/tasks/glance_init_systemd.yml b/tasks/glance_init_systemd.yml
index 14a83f83..5b57db65 100644
--- a/tasks/glance_init_systemd.yml
+++ b/tasks/glance_init_systemd.yml
@@ -33,10 +33,20 @@
   with_dict: "{{ glance_services }}"
   when: inventory_hostname in groups[item.value.group]
 
+# TODO(mgariepy):
+# Remove this in Pike as it only needed to handle upgrades
+# from Newton->Newton and Newton->Ocata
+- name: Cleanup old tmpfiles.d entry
+  file:
+    path: "/etc/tmpfiles.d/{{ item.value.service_name }}.conf"
+    state: absent
+  with_dict: "{{ glance_services }}"
+  when: inventory_hostname in groups[item.value.group]
+
 - name: Create tmpfiles.d entry
   template:
     src: "glance-systemd-tmpfiles.j2"
-    dest: "/etc/tmpfiles.d//{{ item.value.service_name }}.conf"
+    dest: "/etc/tmpfiles.d/openstack-{{ item.value.service_name }}.conf"
     mode: "0644"
     owner: "root"
     group: "root"