diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml
index 4ff2df9dc2c728850aa372a4962fb9ea52f85519..cc55d53fcccb4486b978e510a23ee32d92b4bea8 100644
--- a/roles/common/handlers/main.yml
+++ b/roles/common/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Update PAM configuration
-  command: /usr/sbin/pam-auth-update --package
+  command: "/usr/sbin/pam-auth-update --package"
   tags:
     # [ANSIBLE0012] Commands should not change things if nothing needs doing
     #   This task is invoked only if user is very specific about requiring to
@@ -10,10 +10,12 @@
     - skip_ansible_lint
 
 - name: Restart SSH
-  service: name=ssh state=restarted
+  service:
+    name: ssh
+    state: restarted
 
 - name: Update CA certificate cache
-  command: /usr/sbin/update-ca-certificates --fresh
+  command: "/usr/sbin/update-ca-certificates --fresh"
   tags:
     # [ANSIBLE0012] Commands should not change things if nothing needs doing
     #   This task is invoked only if user is very specific about requiring to
@@ -22,12 +24,14 @@
     - skip_ansible_lint
 
 - name: Restart ferm
-  service: name=ferm state=restarted
+  service:
+    name: ferm
+    state: restarted
 
 # @TODO: Replace this with use of systemd module once Ansible is upgraded to
 # version 2.2+.
 - name: Reload systemd
-  command: systemctl daemon-reload
+  command: "systemctl daemon-reload"
   tags:
     # [ANSIBLE0012] Commands should not change things if nothing needs doing
     #   This task is invoked only if user is very specific about requiring to