diff --git a/tasks/install.deb.yml b/tasks/install.deb.yml
index 699a350..d504c15 100644
--- a/tasks/install.deb.yml
+++ b/tasks/install.deb.yml
@@ -1,20 +1,23 @@
 ---
 
 - name: Install requirements (Debian)
-  apt: name={{item}} update_cache=yes
-  with_items:
-  - postfix
-  - ca-certificates
-  - mailutils
-  - libsasl2-modules
+  apt:
+    update_cache: yes
+    name:
+      - postfix
+      - ca-certificates
+      - mailutils
+      - libsasl2-modules
+
 
 - name: Install DKIM requirements (Debian)
-  apt: name={{item}}
+  apt:
+    name:
+      - opendkim
+      - opendkim-tools
   when: postfix_dkim
-  with_items:
-  - opendkim
-  - opendkim-tools
 
 - name: Install postfix-pcre
-  apt: pkg=postfix-pcre
+  apt:
+    name: postfix-pcre
   when: postfix_rewrite_sender_address != "" or postfix_local_user_relay_address != ""
diff --git a/tasks/install.yum.yml b/tasks/install.yum.yml
index a14a989..6863924 100644
--- a/tasks/install.yum.yml
+++ b/tasks/install.yum.yml
@@ -1,13 +1,14 @@
 ---
 
 - name: Install requirements (RedHat)
-  package: name={{item}}
-  with_items:
-  - postfix
-  - ca-certificates
-  - mailx
-  - libselinux-python
+  package:
+    name:
+      - postfix
+      - ca-certificates
+      - mailx
+      - libselinux-python
 
 - name: Install DKIM requirements (RedHat)
-  package: name=opendkim
+  package:
+    name: opendkim
   when: postfix_dkim