diff --git a/handlers/main.yml b/handlers/main.yml
index f48ae6a..9ef17ce 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,20 +1,25 @@
 ---
 # handlers/main.yml: Handlers for RocketChat.Ansible
   - name: Reload the Nginx service
-    service: name=nginx state=reloaded
+    service:
+      name: nginx
+      state: reloaded
 
   - name: Restart the MongoDB service
-    service: name=mongod state=restarted
+    service:
+      name: mongod
+      state: restarted
 
   - name: Upgrade Rocket.Chat
     include: upgrade.yml
     when: rocket_chat_deploy_state.stat.exists
-    tags:
-      - upgrade
+    tags: upgrade
 
   - name: Update the Rocket.Chat service configuration
     shell: "{{ rocket_chat_service_update_command }}"
     when: rocket_chat_service_update_command is defined
 
   - name: Restart the Rocket.Chat service
-    service: name=rocketchat state=restarted
+    service:
+      name: rocketchat
+      state: restarted
diff --git a/tasks/main.yml b/tasks/main.yml
index f33da85..9798c82 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -42,6 +42,8 @@
     package:
       name: "{{ rocket_chat_dep_packages }}"
       state: present
+    register: result
+    until: result | succeeded
     retries: 2
 
   - name: Ensure link /bin/node -> /bin/nodejs exists
@@ -104,7 +106,8 @@
     become: true
     become_user: "{{ rocket_chat_service_user }}"
     register: result
-    retries: 3
+    retries: 2
+    until: result | succeeded
     changed_when: (result|changed)
                   or (not rocket_chat_tarball_check_checksum)
 
diff --git a/tasks/nginx.yml b/tasks/nginx.yml
index 3fdf8af..5860a10 100644
--- a/tasks/nginx.yml
+++ b/tasks/nginx.yml
@@ -4,8 +4,7 @@
   - name: Grant Nginx permissions to proxy requests to an upstream [SELinux]
     shell: setsebool httpd_can_network_connect on -P
     changed_when: false
-    when: (ansible_selinux is defined) and
-          (ansible_selinux.status != "disabled")
+    when: ansible_selinux.status | default(None) == "enabled"
 
   - name: Ensure Nginx is present
     package:
@@ -25,8 +24,9 @@
     copy:
       src: "{{ item.src }}"
       dest: "{{ item.dest }}"
-    when: not rocket_chat_ssl_generate_certs|bool and
-          rocket_chat_ssl_deploy_data|bool
+    when:
+      - not rocket_chat_ssl_generate_certs|bool
+      - rocket_chat_ssl_deploy_data|bool
     with_items:
       - src: "{{ rocket_chat_ssl_key_file }}"
         dest: "{{ rocket_chat_ssl_key_path }}"