diff --git a/tasks/swift_init_systemd.yml b/tasks/swift_init_systemd.yml
index fa3f1030..6d64bcf0 100644
--- a/tasks/swift_init_systemd.yml
+++ b/tasks/swift_init_systemd.yml
@@ -33,10 +33,10 @@
   with_dict: "{{ swift_services }}"
   when: inventory_hostname in groups[item.value.group]
 
-- name: Create tempfile.d entry
+- name: Create tmpfiles.d entry
   template:
-    src: "swift-systemd-tempfiles.j2"
-    dest: "/etc/tmpfiles.d/swift.conf"
+    src: "swift-systemd-tmpfiles.j2"
+    dest: "/etc/tmpfiles.d/{{ item.value.program_name }}.conf"
     mode: "0644"
     owner: "root"
     group: "root"
diff --git a/templates/swift-systemd-tempfiles.j2 b/templates/swift-systemd-tmpfiles.j2
similarity index 100%
rename from templates/swift-systemd-tempfiles.j2
rename to templates/swift-systemd-tmpfiles.j2