diff --git a/handlers/main.yml b/handlers/main.yml
index 7afc7436..3db6c45d 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -18,7 +18,7 @@
     name: "{{ item.program_name }}"
     enabled: yes
     state: "restarted"
-    daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
+    daemon_reload: yes
   with_items: "{{ filtered_swift_services }}"
 
 - name: Restart rsyslog
diff --git a/tasks/main.yml b/tasks/main.yml
index e867cc63..bdbe3589 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -72,7 +72,7 @@
   tags:
     - swift-config
 
-- include_tasks: "swift_init_{{ ansible_service_mgr }}.yml"
+- include_tasks: swift_init_systemd.yml
   tags:
     - swift-config