diff --git a/roles/sshd/tasks/main.yml b/roles/sshd/tasks/main.yml
index 560774ff3..89e8f444e 100644
--- a/roles/sshd/tasks/main.yml
+++ b/roles/sshd/tasks/main.yml
@@ -1,18 +1,21 @@
 - name: Disable root login with password
-  lineinfile: dest=/etc/ssh/sshd_config
-              regexp='^PermitRootLogin'
-              line='PermitRootLogin without-password'
-              state=present
+  lineinfile:
+    dest: /etc/ssh/sshd_config
+    regexp: '^PermitRootLogin'
+    line: 'PermitRootLogin without-password'
+    state: present
 #TODO: use handler to reload ssh
 
 - name: Enable sshd
-  service: name={{ sshd_service }}
-           enabled=yes
-           state=started
+  service:
+    name: "{{ sshd_service }}"
+    enabled: yes
+    state: started
   when: sshd_enabled
 
 - name: Disable sshd
-  service: name={{ sshd_service }}
-           enabled=no
-           state=stopped
+  service:
+    name: "{{ sshd_service }}"
+    enabled: no
+    state: stopped
   when: not sshd_enabled