diff --git a/playbooks/roles/os_swift/handlers/main.yml b/playbooks/roles/os_swift/handlers/main.yml
index 5e8934190e..3d736e050b 100644
--- a/playbooks/roles/os_swift/handlers/main.yml
+++ b/playbooks/roles/os_swift/handlers/main.yml
@@ -62,17 +62,9 @@
     name: "rsyslog"
     state: "restarted"
 
-- name: Ensure rsync service stopped
+- name: Restart rsync service
   service:
     name: "rsync"
-    state: "stopped"
-  register: service_restart
-  failed_when: "'msg' in service_restart and 'FAIL' in service_restart.msg|upper"
-  until: add_service|success
-  retries: 3
-  delay: 2
-
-- name: Ensure rsync service running
-  service:
-    name: "rsync"
-    state: "started"
+    state: "restarted"
+    enabled: "yes"
+    sleep: 2
diff --git a/playbooks/roles/os_swift/tasks/swift_storage_hosts_setup.yml b/playbooks/roles/os_swift/tasks/swift_storage_hosts_setup.yml
index 2ad6b5bbb4..7062fc7b9f 100644
--- a/playbooks/roles/os_swift/tasks/swift_storage_hosts_setup.yml
+++ b/playbooks/roles/os_swift/tasks/swift_storage_hosts_setup.yml
@@ -38,14 +38,14 @@
     owner: "root"
     group: "root"
     mode: "0644"
-  notify: ["Ensure rsync service stopped", "Ensure rsync service running"]
+  notify: "Restart rsync service"
 
 - name: "Enable rsync in defaults"
   lineinfile:
     dest: "/etc/default/rsync"
     line: "RSYNC_ENABLE=true"
     regexp: "^RSYNC_ENABLE*"
-  notify: ["Ensure rsync service stopped", "Ensure rsync service running"]
+  notify: "Restart rsync service"
 
 - name: "Setup swift-recon-cron cron job"
   cron: