diff --git a/tasks/main.yml b/tasks/main.yml
index 643a4b4..6a07492 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,25 +7,23 @@
 
 - name: make sure no other display managers are installed
   apt:
-    name: "{{ item }}"
+    pkg:
+      - slim
+      - gdm3
+      - kdm
+      - sddm
     state: absent
-  with_items:
-    - slim
-    - gdm3
-    - kdm
-    - sddm
 
 - name: install packages
   apt:
-    pkg: "{{ item }}"
-  with_items:
-    - xserver-xorg
-    - xserver-xorg-video-all
-    - xserver-xorg-input-all
-    - x11-xserver-utils
-    - lightdm
-    - lightdm-gtk-greeter
-    - onboard
+    pkg:
+      - xserver-xorg
+      - xserver-xorg-video-all
+      - xserver-xorg-input-all
+      - x11-xserver-utils
+      - lightdm
+      - lightdm-gtk-greeter
+      - onboard
   notify: restart lightdm
 
 - import_tasks: maintenance.yml
diff --git a/tasks/maintenance.yml b/tasks/maintenance.yml
index eddb498..3fb52b8 100644
--- a/tasks/maintenance.yml
+++ b/tasks/maintenance.yml
@@ -2,11 +2,10 @@
 
 - name: install maintenance mode packages
   apt:
-    name: "{{ item }}"
-  with_items:
-    - yad
-    - xbindkeys
-    - feh
+    name:
+      - yad
+      - xbindkeys
+      - feh
   notify: restart lightdm
 
 - name: maintenance user