diff --git a/roles/common/tasks/Debian.yml b/roles/common/tasks/Debian.yml
index 4038343..ccecd2c 100644
--- a/roles/common/tasks/Debian.yml
+++ b/roles/common/tasks/Debian.yml
@@ -1,25 +1,25 @@
 ---
 
 - name: Install misc software
-  apt: name={{ item }}
-  with_items:
-  - dnsutils
-  - htop
-  - less
-  - net-tools
-  - openssl
-  - psmisc
-  - pydf
-  - rsync
-  - sudo
-  - vim-nox
-  - zsh
+  apt:
+    name:
+    - dnsutils
+    - htop
+    - less
+    - net-tools
+    - openssl
+    - psmisc
+    - pydf
+    - rsync
+    - sudo
+    - vim-nox
+    - zsh
 
 - name: Install software on KVM VMs
-  apt: name={{ item }}
-  with_items:
-  - acpid
-  - qemu-guest-agent
+  apt:
+    name:
+    - acpid
+    - qemu-guest-agent
   when: ansible_virtualization_role == "guest" and ansible_virtualization_type == "kvm"
 
 - name: Configure misc software
diff --git a/roles/common/tasks/FreeBSD.yml b/roles/common/tasks/FreeBSD.yml
index 6220f80..f76aa9f 100644
--- a/roles/common/tasks/FreeBSD.yml
+++ b/roles/common/tasks/FreeBSD.yml
@@ -1,11 +1,11 @@
 ---
 
 - name: Install misc software
-  pkgng: name={{ item }}
-  with_items:
-  - vim-lite
-  - htop
-  - zsh
+  pkgng:
+    name:
+    - vim-lite
+    - htop
+    - zsh
 
 - name: Configure misc software
   copy: src={{ item.src }} dest={{ item.dest }}
diff --git a/roles/common/tasks/Proxmox.yml b/roles/common/tasks/Proxmox.yml
index e1a312c..5d08e96 100644
--- a/roles/common/tasks/Proxmox.yml
+++ b/roles/common/tasks/Proxmox.yml
@@ -1,15 +1,15 @@
 ---
 
 - name: Install misc software
-  apt: name={{ item }}
-  with_items:
-  - dnsutils
-  - htop
-  - ipmitool
-  - less
-  - rsync
-  - vim-nox
-  - zsh
+  apt:
+    name:
+    - dnsutils
+    - htop
+    - ipmitool
+    - less
+    - rsync
+    - vim-nox
+    - zsh
 
 - name: Configure misc software
   copy: src={{ item.src }} dest={{ item.dest }}