diff --git a/localization/tasks/locale.yml b/localization/tasks/locale.yml
index 288ef225020e3c218278bd02132104d400003306..a6ae95b42bee65c860962fab3cd3c6525dd49531 100644
--- a/localization/tasks/locale.yml
+++ b/localization/tasks/locale.yml
@@ -9,7 +9,7 @@
 
 - name: ensure the default languages are enabled
   locale_gen:
-    name: "{{item}}.UTF-8"
+    name: "{{ item }}.UTF-8"
     state: present
   with_items: "{{ localization_enabled_locales }}"
   tags:
diff --git a/shell/tasks/shell.yml b/shell/tasks/shell.yml
index 603d49bc2bad18bc661a56287cef6babf72fac98..b1ac15f25f670478fa41924bc75713a47525cac4 100644
--- a/shell/tasks/shell.yml
+++ b/shell/tasks/shell.yml
@@ -50,7 +50,7 @@
 
 - name: ensure installation of variable additional software
   apt:
-    name: "{{shell_software}}"
+    name: "{{ shell_software }}"
     state: present
   tags:
     - packages
@@ -139,15 +139,16 @@
 
 - name: ensure directories for terminfo config files exist
   file:
-    path: "/etc/terminfo/{{item.path}}"
+    path: "/etc/terminfo/{{ item.path }}"
     owner: root
     group: root
     state: directory
     mode: '0755'
-  with_filetree: terminfo/
+  with_filetree:
+    - "terminfo/"
   when: item.state == "directory"
   loop_control:
-    label: "{{item.path}}"
+    label: "{{ item.path }}"
   tags:
     - config
     - shell
@@ -155,15 +156,16 @@
 
 - name: ensure strange terminals work well over ssh
   copy:
-    src: "{{item.src}}"
-    dest: "/etc/terminfo/{{item.path}}"
+    src: "{{ item.src }}"
+    dest: "/etc/terminfo/{{ item.path }}"
     owner: root
     group: root
     mode: '0644'
-  with_filetree: terminfo/
+  with_filetree:
+    - "terminfo/"
   when: item.state == "file"
   loop_control:
-    label: "{{item.path}}"
+    label: "{{ item.path }}"
   tags:
     - config
     - shell
diff --git a/ssh-server/handlers/main.yml b/ssh-server/handlers/main.yml
index 53644c03ba78bf2564248b84201aa86958548cf0..9fc709ca625d7c5dc58c79f0fafed5cffd3be77f 100644
--- a/ssh-server/handlers/main.yml
+++ b/ssh-server/handlers/main.yml
@@ -1,8 +1,11 @@
 ---
-# file: roles/common/handlers/main.yml
 
 - name: restart sshd
-  service: name=ssh state=restarted
+  service:
+    name: ssh
+    state: restarted
 
 - name: regenerate pam config
-  shell: DEBIAN_FRONTEND=noninteractive pam-auth-update --force
+  command: pam-auth-update --force
+  environment:
+    DEBIAN_FRONTEND: noninteractive