diff --git a/amavis/tasks/main.yml b/amavis/tasks/main.yml
index 6b8bcc63..1b0932d5 100644
--- a/amavis/tasks/main.yml
+++ b/amavis/tasks/main.yml
@@ -1,11 +1,10 @@
 ---
 - name: install Amavis
   apt:
-    name: "{{ item }}"
+    name:
+      - postgrey
+      - amavisd-new
     state: present
-  with_items:
-  - postgrey
-  - amavisd-new
   tags:
   - amavis
 
diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml
index ed898e41..e8f1b2b8 100644
--- a/apache/tasks/main.yml
+++ b/apache/tasks/main.yml
@@ -2,14 +2,13 @@
 
 - name: packages are installed (Debian 9 or later)
   apt:
-    name: '{{ item }}'
+    name:
+      - apache2
+      - libapache2-mpm-itk
+      - libapache2-mod-evasive
+      - apachetop
+      - libwww-perl
     state: present
-  with_items:
-    - apache2
-    - libapache2-mpm-itk
-    - libapache2-mod-evasive
-    - apachetop
-    - libwww-perl
   tags:
     - apache
     - packages
@@ -17,13 +16,12 @@
 
 - name: packages are installed (jessie)
   apt:
-    name: '{{ item }}'
+    name:
+      - apache2-mpm-itk
+      - libapache2-mod-evasive
+      - apachetop
+      - libwww-perl
     state: present
-  with_items:
-    - apache2-mpm-itk
-    - libapache2-mod-evasive
-    - apachetop
-    - libwww-perl
   tags:
     - apache
     - packages
diff --git a/apache/tasks/munin.yml b/apache/tasks/munin.yml
index 27aa7ad8..144ae0f8 100644
--- a/apache/tasks/munin.yml
+++ b/apache/tasks/munin.yml
@@ -2,11 +2,10 @@
 
 - name: "Install munin-node and core plugins packages"
   apt:
-    name: "{{ item }}"
+    name:
+      - munin-node
+      - munin-plugins-core
     state: present
-  with_items:
-    - munin-node
-    - munin-plugins-core
   tags:
     - apache
     - munin
@@ -27,11 +26,10 @@
 
 - name: "Install fcgi packages for Munin graphs"
   apt:
-    name: "{{ item }}"
+    name:
+      - libapache2-mod-fcgid
+      - libcgi-fast-perl
     state: present
-  with_items:
-    - libapache2-mod-fcgid
-    - libcgi-fast-perl
   notify: reload apache
   tags:
     - apache
diff --git a/bind/tasks/main.yml b/bind/tasks/main.yml
index 8fdf1692..edc8d3fc 100644
--- a/bind/tasks/main.yml
+++ b/bind/tasks/main.yml
@@ -1,10 +1,9 @@
 - name: package are installed
   apt:
-    name: '{{ item }}'
+    name:
+      - bind9
+      - dnstop
     state: present
-  with_items:
-  - bind9
-  - dnstop
 
 - name: Set bind configuration for recursive server
   template:
diff --git a/clamav/tasks/main.yml b/clamav/tasks/main.yml
index b053fce4..9f32560b 100644
--- a/clamav/tasks/main.yml
+++ b/clamav/tasks/main.yml
@@ -74,22 +74,21 @@
 
 - name: install ClamAV
   apt:
-    name: "{{ item }}"
+    name:
+      - clamav-daemon
+      - clamav
+      - clamdscan
+      - clamav-freshclam
+      - arc
+      - arj
+      - zoo
+      - pax
+      - bzip2
+      - cabextract
+      - rpm
+      - lzop
+      - razor
     state: present
-  with_items:
-  - clamav-daemon
-  - clamav
-  - clamdscan
-  - clamav-freshclam
-  - arc
-  - arj
-  - zoo
-  - pax
-  - bzip2
-  - cabextract
-  - rpm
-  - lzop
-  - razor
   tags:
   - clamav
 
diff --git a/docker-host/tasks/main.yml b/docker-host/tasks/main.yml
index c15fc761..9a66bb92 100644
--- a/docker-host/tasks/main.yml
+++ b/docker-host/tasks/main.yml
@@ -2,22 +2,20 @@
 ---
 - name: Remove older docker packages
   apt:
-    name: '{{ item }}'
+    name:
+      - docker
+      - docker-engine
+      - docker.io
     state: absent
-  with_items:
-    - docker
-    - docker-engine
-    - docker.io
 
 - name: Install source requirements
   apt:
-    name: '{{ item }}'
+    name:
+      - apt-transport-https
+      - ca-certificates
+      - gnupg2
     state: present
     update_cache: yes
-  with_items:
-    - apt-transport-https
-    - ca-certificates
-    - gnupg2
 
 - name: Add Docker repository
   apt_repository:
@@ -36,11 +34,10 @@
 
 - name: Install docker and python-docker
   apt:
-    name: "{{ item }}"
+    name:
+      - docker-ce
+      - python-docker
     update_cache: yes
-  with_items:
-    - docker-ce
-    - python-docker
 
 - name: Copy Docker daemon configuration file
   template:
diff --git a/dovecot/tasks/main.yml b/dovecot/tasks/main.yml
index 1a835160..8492e00a 100644
--- a/dovecot/tasks/main.yml
+++ b/dovecot/tasks/main.yml
@@ -1,13 +1,12 @@
 - name: ensure packages are installed
   apt:
-    name: '{{ item }}'
+    name:
+      - dovecot-ldap
+      - dovecot-imapd
+      - dovecot-pop3d
+      - dovecot-sieve
+      - dovecot-managesieved
     state: present
-  with_items:
-  - dovecot-ldap
-  - dovecot-imapd
-  - dovecot-pop3d
-  - dovecot-sieve
-  - dovecot-managesieved
   tags:
   - dovecot
 
@@ -26,13 +25,13 @@
     regexp: "^#*{{ item.key }}"
     state: present
   with_items:
-  - { key: 'hosts', value: '127.0.0.1' }
-  - { key: 'auth_bind', value: 'yes' }
-  - { key: 'ldap_version', value: 3 }
-  - { key: 'base', value: "{{ ldap_suffix }}" }
-  - { key: 'user_attrs', value: 'homeDirectory=home' }
-  - { key: 'user_filter', value: '(&(isActive=TRUE)(uid=%u))' }
-  - { key: 'pass_attrs', value: 'uid=user,userPassword=password' }
+    - { key: 'hosts', value: '127.0.0.1' }
+    - { key: 'auth_bind', value: 'yes' }
+    - { key: 'ldap_version', value: 3 }
+    - { key: 'base', value: "{{ ldap_suffix }}" }
+    - { key: 'user_attrs', value: 'homeDirectory=home' }
+    - { key: 'user_filter', value: '(&(isActive=TRUE)(uid=%u))' }
+    - { key: 'pass_attrs', value: 'uid=user,userPassword=password' }
   when: ldap_suffix is defined
   notify: reload dovecot
   tags:
diff --git a/drbd/tasks/packages.yml b/drbd/tasks/packages.yml
index 2876d386..59b4bb2e 100644
--- a/drbd/tasks/packages.yml
+++ b/drbd/tasks/packages.yml
@@ -1,9 +1,8 @@
 - name: Install dependency
   apt:
-    name: "{{ item }}"
-  with_items:
-  - drbd-utils
-  - lvm2
+    name:
+      - drbd-utils
+      - lvm2
   tags:
   - drbd
 
diff --git a/evolinux-base/tasks/hardware.yml b/evolinux-base/tasks/hardware.yml
index eca81a1b..c86b1b8f 100644
--- a/evolinux-base/tasks/hardware.yml
+++ b/evolinux-base/tasks/hardware.yml
@@ -46,11 +46,10 @@
 
   - name: Install packages for HP hardware
     apt:
-      name: "{{ item }}"
+      name:
+        - cciss-vol-status
+        - ssacli
       state: present
-    with_items:
-    - cciss-vol-status
-    - ssacli
 
   - name: Configure packages for HP hardware
     template:
@@ -79,11 +78,10 @@
 
   - name: Install packages for DELL/LSI hardware
     apt:
-      name: "{{ item }}"
+      name:
+        - megacli
+        - megaclisas-status
       allow_unauthenticated: yes
-    with_items:
-    - megacli
-    - megaclisas-status
 
   - name: Configure packages for DELL/LSI hardware
     template:
diff --git a/evolinux-base/tasks/packages.yml b/evolinux-base/tasks/packages.yml
index 5e76ef3c..54fb90ed 100644
--- a/evolinux-base/tasks/packages.yml
+++ b/evolinux-base/tasks/packages.yml
@@ -2,65 +2,61 @@
 
 - name: Install/Update system tools
   apt:
-    name: "{{ item }}"
-  with_items:
-  - locales
-  - sudo
-  - ntpdate
-  - lsb-release
-  - dnsutils
-  - pv
-  - apg
-  - conntrack
-  - logrotate
-  - bash-completion
-  - ssl-cert
-  - ca-certificates
-  - rename
+    name:
+      - locales
+      - sudo
+      - ntpdate
+      - lsb-release
+      - dnsutils
+      - pv
+      - apg
+      - conntrack
+      - logrotate
+      - bash-completion
+      - ssl-cert
+      - ca-certificates
+      - rename
   when: evolinux_packages_system
 
 - name: Install/Update diagnostic tools
   apt:
-    name: "{{ item }}"
-  with_items:
-  - strace
-  - htop
-  - iftop
-  - iptraf
-  - ncdu
-  - iotop
-  - tcpdump
-  - mtr-tiny
-  - curl
-  - telnet
-  - traceroute
-  - man
+    name:
+      - strace
+      - htop
+      - iftop
+      - iptraf
+      - ncdu
+      - iotop
+      - tcpdump
+      - mtr-tiny
+      - curl
+      - telnet
+      - traceroute
+      - man
   when: evolinux_packages_diagnostic
 
 - name: Install/Update hardware tools
   apt:
-    name: "{{ item }}"
-  with_items:
-  - hdparm
-  - smartmontools
-  - lm-sensors
+    name:
+      - hdparm
+      - smartmontools
+      - lm-sensors
   when: evolinux_packages_hardware
 
 - name: Install/Update common tools
   apt:
-    name: "{{ item }}"
-  with_items:
-  - vim
-  - screen
-  - tmux
-  - mutt
-  - tree
-  - git
-  - subversion
-  - rsync
-  - bc
-  - pinentry-curses
-  - ncurses-term
+    name:
+      - vim
+      - screen
+      - tmux
+      - mutt
+      - tree
+      - git
+      - subversion
+      - rsync
+      - bc
+      - pinentry-curses
+      - ncurses-term
   when: evolinux_packages_common
 
 - name: Be sure that openntpd package is absent/purged
@@ -72,12 +68,11 @@
 
 - name: Be sure locate/mlocate is absent/purged
   apt:
-    name: "{{ item }}"
+    name:
+      - locate
+      - mlocate
     state: absent
     purge: yes
-  with_items:
-  - locate
-  - mlocate
   when: evolinux_packages_purge_locate
 
 - name: Install/Update serveur-base meta-package
@@ -88,22 +83,19 @@
 
 - name: Install/Update packages for Stretch and later
   apt:
-    name: "{{ item }}"
-  with_items:
-  - net-tools
+    name: net-tools
   when:
-  - evolinux_packages_stretch
-  - ansible_distribution_major_version is version_compare('9', '>=')
+    - evolinux_packages_stretch
+    - ansible_distribution_major_version is version_compare('9', '>=')
 
 - name: Install/Update packages for Buster and later
   apt:
-    name: "{{ item }}"
-  with_items:
-  - spectre-meltdown-checker
-  - binutils
+    name:
+      - spectre-meltdown-checker
+      - binutils
   when:
-  - evolinux_packages_buster
-  - ansible_distribution_major_version is version_compare('10', '>=')
+    - evolinux_packages_buster
+    - ansible_distribution_major_version is version_compare('10', '>=')
 
 - name: Customize logcheck recipient
   lineinfile:
@@ -114,11 +106,10 @@
 
 - name: Deleting rpcbind and nfs-common
   apt:
-    name: "{{ item }}"
+    name:
+      - rpcbind
+      - nfs-common
     state: absent
-  with_items:
-    - rpcbind
-    - nfs-common
   when: evolinux_packages_delete_nfs
 
 
diff --git a/evolinux-base/tasks/postfix.yml b/evolinux-base/tasks/postfix.yml
index d0c66a65..aa60e737 100644
--- a/evolinux-base/tasks/postfix.yml
+++ b/evolinux-base/tasks/postfix.yml
@@ -2,11 +2,10 @@
 
 - name: Postfix packages are installed
   apt:
-    name: "{{ item }}"
+    name:
+      - postfix
+      - mailgraph
     state: present
-  with_items:
-    - postfix
-    - mailgraph
   when: evolinux_postfix_packages
   tags:
     - packages
@@ -83,14 +82,13 @@
 
 - name: exim4 is absent
   apt:
-    name: "{{ item }}"
+    name:
+      - exim4
+      - exim4-base
+      - exim4-config
+      - exim4-daemon-light
     purge: yes
     state: absent
-  with_items:
-    - exim4
-    - exim4-base
-    - exim4-config
-    - exim4-daemon-light
   when: evolinux_postfix_purge_exim
   tags:
     - packages
diff --git a/evomaintenance/tasks/install_vendor_debian.yml b/evomaintenance/tasks/install_vendor_debian.yml
index 757dee16..ece57aae 100644
--- a/evomaintenance/tasks/install_vendor_debian.yml
+++ b/evomaintenance/tasks/install_vendor_debian.yml
@@ -2,12 +2,11 @@
 
 - name: Dependencies are installed
   apt:
-    name: "{{ item }}"
+    name: 
+      - postgresql-client
+      - sudo
+      - curl
     state: present
-  with_items:
-    - postgresql-client
-    - sudo
-    - curl
   tags:
     - evomaintenance
 
@@ -38,7 +37,7 @@
   with_items:
     - { src: 'evomaintenance.sh', dest: '/usr/share/scripts/', mode: '0700' }
     - { src: 'evomaintenance.tpl', dest: '/usr/share/scripts/', mode: '0600' }
-  tags: 
+  tags:
     - evomaintenance
 
 - name: Configuration is installed
diff --git a/evomaintenance/tasks/install_vendor_openbsd.yml b/evomaintenance/tasks/install_vendor_openbsd.yml
index 5aa019ff..37307cfb 100644
--- a/evomaintenance/tasks/install_vendor_openbsd.yml
+++ b/evomaintenance/tasks/install_vendor_openbsd.yml
@@ -2,11 +2,10 @@
 
 - name: Dependencies are installed
   openbsd_pkg:
-    name: "{{ item }}"
+    name:
+      - postgresql-client
+      - curl
     state: present
-  with_items:
-    - postgresql-client
-    - curl
   tags:
     - evomaintenance
 
@@ -32,7 +31,7 @@
   with_items:
     - { src: 'evomaintenance.sh', dest: '/usr/share/scripts/', mode: '0700' }
     - { src: 'evomaintenance.tpl', dest: '/usr/share/scripts/', mode: '0600' }
-  tags: 
+  tags:
     - evomaintenance
 
 - name: Configuration is installed
@@ -51,7 +50,7 @@
     src: mailevomaintenance.sh.j2
     dest: /usr/share/scripts/mailevomaintenance.sh
     owner: root
-    group: wheel               
+    group: wheel
     mode: "0700"
   tags:
     - evomaintenance
diff --git a/haproxy/tasks/munin.yml b/haproxy/tasks/munin.yml
index 7d21db54..1f65dbe3 100644
--- a/haproxy/tasks/munin.yml
+++ b/haproxy/tasks/munin.yml
@@ -1,11 +1,10 @@
 ---
 - name: Install Munin plugin and dependencies
   apt:
-    name: "{{ item }}"
+    name:
+      - munin-plugins-extra
+      - liblwp-useragent-determined-perl
     state: present
-  with_items:
-  - munin-plugins-extra
-  - liblwp-useragent-determined-perl
   tags:
   - haproxy
 
diff --git a/java/tasks/oracle.yml b/java/tasks/oracle.yml
index 41e2a012..a2268b7b 100644
--- a/java/tasks/oracle.yml
+++ b/java/tasks/oracle.yml
@@ -1,11 +1,10 @@
 ---
 - name: Install dependencies for build java package
   apt:
-    name: "{{ item }}"
+    name:
+      - java-package
+      - build-essential
     state: present
-  with_items:
-    - java-package
-    - build-essential
   tags:
   - java
 
diff --git a/kvm-host/tasks/packages.yml b/kvm-host/tasks/packages.yml
index 37225a80..99790e84 100644
--- a/kvm-host/tasks/packages.yml
+++ b/kvm-host/tasks/packages.yml
@@ -1,14 +1,13 @@
 ---
 - name: Install packages for kvm/libvirt
   apt:
-    name: "{{ item }}"
-  with_items:
-    - qemu-kvm
-    - netcat-openbsd
-    - bridge-utils
-    - qemu-utils
-    - virtinst
-    - libvirt-daemon-system
-    - libvirt-clients
-    - kvm-tools
-    - vlan
+    name:
+      - qemu-kvm
+      - netcat-openbsd
+      - bridge-utils
+      - qemu-utils
+      - virtinst
+      - libvirt-daemon-system
+      - libvirt-clients
+      - kvm-tools
+      - vlan
diff --git a/ldap/tasks/main.yml b/ldap/tasks/main.yml
index 790b7367..8f6fbd67 100644
--- a/ldap/tasks/main.yml
+++ b/ldap/tasks/main.yml
@@ -1,12 +1,11 @@
 - name: LDAP packages are installed
   apt:
-    name: '{{ item }}'
+    name:
+      - slapd
+      - ldap-utils
+      - ldapvi
+      - shelldap
     state: present
-  with_items:
-    - slapd
-    - ldap-utils
-    - ldapvi
-    - shelldap
 
 - name: change sldap listen ip:port
   lineinfile:
@@ -68,10 +67,10 @@
     value: "{{ item.value }}"
     mode: 0640
   with_items:
-  - { option: 'hostname', value: '127.0.0.1' }
-  - { option: 'base', value: "{{ ldap_suffix }}" }
-  - { option: 'bind', value: "cn=nagios,ou=ldapusers,{{ ldap_suffix }}" }
-  - { option: 'pass', value: "{{ ldap_nagios_password.stdout }}" }
+    - { option: 'hostname', value: '127.0.0.1' }
+    - { option: 'base', value: "{{ ldap_suffix }}" }
+    - { option: 'bind', value: "cn=nagios,ou=ldapusers,{{ ldap_suffix }}" }
+    - { option: 'pass', value: "{{ ldap_nagios_password.stdout }}" }
 
 - name: upload ldap initial config
   template:
diff --git a/memcached/tasks/munin.yml b/memcached/tasks/munin.yml
index 4d98ca5d..a5e75f72 100644
--- a/memcached/tasks/munin.yml
+++ b/memcached/tasks/munin.yml
@@ -2,7 +2,7 @@
 - name: Choose packages (Oracle)
   set_fact:
     multi: "multi_"
-  when: memcached_instance_name != False
+  when: memcached_instance_name
 
 - name: is Munin present ?
   stat:
@@ -16,11 +16,10 @@
 - block:
   - name: Install munin-plugins-extra and libcache-memcached-perl for Munin
     apt:
-      name: "{{ item }}"
+      name:
+        - 'munin-plugins-extra'
+        - 'libcache-memcached-perl'
       state: present
-    with_items:
-    - 'munin-plugins-extra'
-    - 'libcache-memcached-perl'
 
   - name: Enable core Munin plugins
     file:
diff --git a/minifirewall/tasks/install.yml b/minifirewall/tasks/install.yml
index 77f60c11..a4bcf734 100644
--- a/minifirewall/tasks/install.yml
+++ b/minifirewall/tasks/install.yml
@@ -2,10 +2,8 @@
 
 - name: dependencies are satisfied
   apt:
-    name: '{{ item }}'
+    name: iptables
     state: present
-  with_items:
-  - iptables
 
 - name: init script is copied
   template:
diff --git a/mongodb/tasks/main_stretch.yml b/mongodb/tasks/main_stretch.yml
index bed975e3..fe44e259 100644
--- a/mongodb/tasks/main_stretch.yml
+++ b/mongodb/tasks/main_stretch.yml
@@ -2,11 +2,10 @@
 
 - name: Install packages
   apt:
-    name: "{{ item }}"
+    name:
+      - mongodb
+      - mongo-tools
     state: present
-  with_items:
-    - mongodb
-    - mongo-tools
 
 - name: install dependency for monitoring
   apt:
diff --git a/munin/tasks/main.yml b/munin/tasks/main.yml
index 6dcf1a26..19ad7c40 100644
--- a/munin/tasks/main.yml
+++ b/munin/tasks/main.yml
@@ -2,13 +2,12 @@
 
 - name: Ensure that Munin is installed
   apt:
-    name: '{{ item }}'
+    name:
+      - munin
+      - munin-node
+      - munin-plugins-core
+      - munin-plugins-extra
     state: present
-  with_items:
-    - munin
-    - munin-node
-    - munin-plugins-core
-    - munin-plugins-extra
   tags:
     - munin
     - packages
diff --git a/mysql-oracle/tasks/munin.yml b/mysql-oracle/tasks/munin.yml
index 52b6eed4..70e871e1 100644
--- a/mysql-oracle/tasks/munin.yml
+++ b/mysql-oracle/tasks/munin.yml
@@ -12,11 +12,10 @@
 - block:
   - name: Install perl libraries for Munin
     apt:
-      name: "{{ item }}"
+      name:
+        - libdbd-mysql-perl
+        - libcache-cache-perl
       state: present
-    with_items:
-    - libdbd-mysql-perl
-    - libcache-cache-perl
 
   - name: Enable core Munin plugins
     file:
diff --git a/mysql-oracle/tasks/packages.yml b/mysql-oracle/tasks/packages.yml
index bc19f305..283c3498 100644
--- a/mysql-oracle/tasks/packages.yml
+++ b/mysql-oracle/tasks/packages.yml
@@ -70,23 +70,20 @@
 
 - name: Install MySQL packages
   apt:
-    name: '{{ item }}'
+    name:
+      - mysql-server
+      - mysql-client
     update_cache: yes
     state: present
-  with_items:
-    - mysql-server
-    - mysql-client
   tags:
     - mysql
     - packages
 
 - name: Install MySQL dev packages
   apt:
-    name: '{{ item }}'
+    name: libmysqlclient20
     update_cache: yes
     state: present
-  with_items:
-    - libmysqlclient20
   tags:
     - mysql
     - packages
diff --git a/mysql-oracle/tasks/utils.yml b/mysql-oracle/tasks/utils.yml
index dc394bf4..a0e3b754 100644
--- a/mysql-oracle/tasks/utils.yml
+++ b/mysql-oracle/tasks/utils.yml
@@ -26,20 +26,17 @@
 
 # - name: "mysql-utilities are installed (Debian 9 or later)"
 #   apt:
-#     name: "{{ item }}"
-#   with_items:
-#   - mysql-utilities
+#     name: mysql-utilities
 #   when: ansible_distribution_major_version is version_compare('9', '>=')
 
 - name: "mytop dependencies are installed (stretch)"
   apt:
-    name: "{{ item }}"
-  with_items:
-  - libconfig-inifiles-perl
-  - libdbd-mysql-perl
-  - libdbi-perl
-  - libterm-readkey-perl
-  - libtime-hires-perl
+    name:
+      - libconfig-inifiles-perl
+      - libdbd-mysql-perl
+      - libdbi-perl
+      - libterm-readkey-perl
+      - libtime-hires-perl
   tags:
     - packages
     - mytop
@@ -48,11 +45,10 @@
 
 - name: "Install dependencies for mytop (Debian 10 or later)"
   apt:
-    name: "{{ item }}"
-  with_items:
-  - mariadb-client-10.3
-  - libconfig-inifiles-perl
-  - libterm-readkey-perl
+    name:
+      - mariadb-client-10.3
+      - libconfig-inifiles-perl
+      - libterm-readkey-perl
   when: ansible_distribution_major_version is version_compare('10', '>=')
 
 - include_role:
diff --git a/mysql/tasks/munin.yml b/mysql/tasks/munin.yml
index 52b6eed4..70e871e1 100644
--- a/mysql/tasks/munin.yml
+++ b/mysql/tasks/munin.yml
@@ -12,11 +12,10 @@
 - block:
   - name: Install perl libraries for Munin
     apt:
-      name: "{{ item }}"
+      name:
+        - libdbd-mysql-perl
+        - libcache-cache-perl
       state: present
-    with_items:
-    - libdbd-mysql-perl
-    - libcache-cache-perl
 
   - name: Enable core Munin plugins
     file:
diff --git a/mysql/tasks/packages_jessie.yml b/mysql/tasks/packages_jessie.yml
index 06359e35..8d27de52 100644
--- a/mysql/tasks/packages_jessie.yml
+++ b/mysql/tasks/packages_jessie.yml
@@ -18,21 +18,18 @@
 
 - name: Install MySQL packages
   apt:
-    name: '{{ item }}'
+    name: "{{ mysql_packages }}"
     update_cache: yes
     state: present
-  with_items: "{{ mysql_packages }}"
   tags:
   - mysql
   - packages
 
 - name: Install MySQL dev packages
   apt:
-    name: '{{ item }}'
+    name: libmysqlclient-dev
     update_cache: yes
     state: present
-  with_items:
-  - libmysqlclient-dev
   tags:
   - mysql
   - packages
diff --git a/mysql/tasks/packages_stretch.yml b/mysql/tasks/packages_stretch.yml
index 83256472..901543af 100644
--- a/mysql/tasks/packages_stretch.yml
+++ b/mysql/tasks/packages_stretch.yml
@@ -2,23 +2,20 @@
 
 - name: Install MySQL packages
   apt:
-    name: '{{ item }}'
+    name:
+      - mariadb-server
+      - mariadb-client
     update_cache: yes
     state: present
-  with_items:
-  - mariadb-server
-  - mariadb-client
   tags:
   - mysql
   - packages
 
 - name: Install MySQL dev packages
   apt:
-    name: '{{ item }}'
+    name: default-libmysqlclient-dev
     update_cache: yes
     state: present
-  with_items:
-  - default-libmysqlclient-dev
   tags:
   - mysql
   - packages
diff --git a/mysql/tasks/utils.yml b/mysql/tasks/utils.yml
index 9350e634..91c5d442 100644
--- a/mysql/tasks/utils.yml
+++ b/mysql/tasks/utils.yml
@@ -26,20 +26,18 @@
 
 - name: "Install dependencies for mytop (stretch)"
   apt:
-    name: "{{ item }}"
-  with_items:
-  - mariadb-client-10.1
-  - libconfig-inifiles-perl
-  - libterm-readkey-perl
+    name:
+      - mariadb-client-10.1
+      - libconfig-inifiles-perl
+      - libterm-readkey-perl
   when: ansible_distribution_release == "stretch"
 
 - name: "Install dependencies for mytop (Debian 10 or later)"
   apt:
-    name: "{{ item }}"
-  with_items:
-  - mariadb-client-10.3
-  - libconfig-inifiles-perl
-  - libterm-readkey-perl
+    name:
+      - mariadb-client-10.3
+      - libconfig-inifiles-perl
+      - libterm-readkey-perl
   when: ansible_distribution_major_version is version_compare('10', '>=')
 
 - name: Read debian-sys-maint password
diff --git a/nagios-nrpe/tasks/main.yml b/nagios-nrpe/tasks/main.yml
index 291553da..6e876589 100644
--- a/nagios-nrpe/tasks/main.yml
+++ b/nagios-nrpe/tasks/main.yml
@@ -1,15 +1,14 @@
 ---
 - name: packages are installed
   apt:
-    name: "{{ item }}"
+    name:
+      - nagios-nrpe-server
+      - monitoring-plugins
+      - monitoring-plugins-basic
+      - monitoring-plugins-common
+      - monitoring-plugins-standard
+      - nagios-plugins-contrib
     state: present
-  with_items:
-    - nagios-nrpe-server
-    - monitoring-plugins
-    - monitoring-plugins-basic
-    - monitoring-plugins-common
-    - monitoring-plugins-standard
-    - nagios-plugins-contrib
   tags:
     - nagios-nrpe
 
diff --git a/nginx/tasks/main_minimal.yml b/nginx/tasks/main_minimal.yml
index 281aed7f..58d177af 100644
--- a/nginx/tasks/main_minimal.yml
+++ b/nginx/tasks/main_minimal.yml
@@ -1,11 +1,10 @@
 ---
 - name: Ensure Nginx is installed
   apt:
-    name: "{{ item }}"
+    name:
+      - nginx-light
+      - ssl-cert
     state: present
-  with_items:
-    - nginx-light
-    - ssl-cert
   notify: reload nginx
   tags:
   - nginx
diff --git a/nginx/tasks/munin_vhost.yml b/nginx/tasks/munin_vhost.yml
index 838a0dc2..83754ba4 100644
--- a/nginx/tasks/munin_vhost.yml
+++ b/nginx/tasks/munin_vhost.yml
@@ -8,12 +8,11 @@
 
 - name: Ensure packages for Munin CGI are installed
   apt:
-    name: '{{ item }}'
+    name:
+      - liblwp-useragent-determined-perl
+      - libcgi-fast-perl
+      - spawn-fcgi
     state: present
-  with_items:
-    - liblwp-useragent-determined-perl
-    - libcgi-fast-perl
-    - spawn-fcgi
 
 - name: Adjust owner for munin-cgi
   shell: "chown --verbose www-data:munin /var/log/munin/munin-cgi-*"
diff --git a/opendkim/tasks/main.yml b/opendkim/tasks/main.yml
index 02c16494..9b309825 100644
--- a/opendkim/tasks/main.yml
+++ b/opendkim/tasks/main.yml
@@ -1,13 +1,12 @@
 ---
 - name: install OpenDKIM
   apt:
-    name: "{{ item }}"
+    name:
+      - opendkim
+      - opendkim-tools
+      - ssl-cert
+      - dns-root-data
     state: present
-  with_items:
-  - opendkim
-  - opendkim-tools
-  - ssl-cert
-  - dns-root-data
   tags:
   - opendkim
 
@@ -59,7 +58,7 @@
 
 - name: Set folder permissions to 0750
   file:
-    path: "/etc/opendkim/" 
+    path: "/etc/opendkim/"
     mode: "0750"
     force: yes
   tags:
diff --git a/packweb-apache/tasks/apache.yml b/packweb-apache/tasks/apache.yml
index 750875bb..61d37341 100644
--- a/packweb-apache/tasks/apache.yml
+++ b/packweb-apache/tasks/apache.yml
@@ -18,12 +18,11 @@
 
 - name: Additional packages are installed
   apt:
-    name: '{{ item }}'
+    name:
+      - libapache2-mod-security2
+      - modsecurity-crs
+      - apg
     state: present
-  with_items:
-    - libapache2-mod-security2
-    - modsecurity-crs
-    - apg
 
 - name: Additional modules are enabled
   apache2_module:
diff --git a/php/tasks/main_buster.yml b/php/tasks/main_buster.yml
index 8556a503..8254deab 100644
--- a/php/tasks/main_buster.yml
+++ b/php/tasks/main_buster.yml
@@ -37,26 +37,23 @@
 
 - name: "Install PHP packages (Debian 9 or later)"
   apt:
-    name: '{{ item }}'
+    name: '{{ php_stretch_packages }}'
     state: present
-  with_items: "{{ php_stretch_packages }}"
 
 - name: "Install mod_php packages (Debian 9 or later)"
   apt:
-    name: '{{ item }}'
+    name:
+      - libapache2-mod-php
+      - php
     state: present
-  with_items:
-    - libapache2-mod-php
-    - php
   when: php_apache_enable
 
 - name: "Install PHP FPM packages (Debian 9 or later)"
   apt:
-    name: '{{ item }}'
+    name:
+      - php-fpm
+      - php
     state: present
-  with_items:
-    - php-fpm
-    - php
   when: php_fpm_enable
 
 # Configuration
@@ -77,6 +74,7 @@
 
 - include: config_fpm.yml
   when: php_fpm_enable
+  
 - name: Enforce permissions on PHP fpm directory
   file:
     dest: /etc/php/7.3/fpm
@@ -85,6 +83,7 @@
 
 - include: config_apache.yml
   when: php_apache_enable
+  
 - name: Enforce permissions on PHP apache2 directory
   file:
     dest: /etc/php/7.3/apache2
diff --git a/php/tasks/main_jessie.yml b/php/tasks/main_jessie.yml
index 224f46a3..9d3b1deb 100644
--- a/php/tasks/main_jessie.yml
+++ b/php/tasks/main_jessie.yml
@@ -16,38 +16,35 @@
 
 - name: "Install PHP packages (jessie)"
   apt:
-    name: '{{ item }}'
+    name:
+      - php5-cli
+      - php5-gd
+      - php5-imap
+      - php5-ldap
+      - php5-mcrypt
+      - "{{ php_modules_mysqlnd | bool | ternary('php5-mysqlnd','php5-mysql') }}"
+      - php5-pgsql
+      - php-gettext
+      - php5-intl
+      - php5-curl
+      - php5-ssh2
+      - libphp-phpmailer
     state: present
-  with_items:
-    - php5-cli
-    - php5-gd
-    - php5-imap
-    - php5-ldap
-    - php5-mcrypt
-    - "{{ php_modules_mysqlnd | bool | ternary('php5-mysqlnd','php5-mysql') }}"
-    - php5-pgsql
-    - php-gettext
-    - php5-intl
-    - php5-curl
-    - php5-ssh2
-    - libphp-phpmailer
 
 - name: "Install mod_php packages (jessie)"
   apt:
-    name: '{{ item }}'
+    name:
+      - libapache2-mod-php5
+      - php5
     state: present
-  with_items:
-    - libapache2-mod-php5
-    - php5
   when: php_apache_enable
 
 - name: "Install PHP FPM packages (jessie)"
   apt:
-    name: '{{ item }}'
+    name:
+      - php5-fpm
+      - php5
     state: present
-  with_items:
-    - php5-fpm
-    - php5
   when: php_fpm_enable
 
 # Configuration
@@ -58,6 +55,7 @@
     mode: "0755"
 
 - include: config_cli.yml
+
 - name: Enforce permissions on PHP cli directory
   file:
     dest: /etc/php5/cli
@@ -65,6 +63,7 @@
 
 - include: config_fpm.yml
   when: php_fpm_enable
+
 - name: Enforce permissions on PHP fpm directory
   file:
     dest: /etc/php5/fpm
@@ -73,6 +72,7 @@
 
 - include: config_apache.yml
   when: php_apache_enable
+
 - name: Enforce permissions on PHP apache2 directory
   file:
     dest: /etc/php5/apache2
diff --git a/php/tasks/main_stretch.yml b/php/tasks/main_stretch.yml
index cc096af3..d9d2a6ae 100644
--- a/php/tasks/main_stretch.yml
+++ b/php/tasks/main_stretch.yml
@@ -37,26 +37,23 @@
 
 - name: "Install PHP packages (Debian 9 or later)"
   apt:
-    name: '{{ item }}'
+    name: '{{ php_stretch_packages }}'
     state: present
-  with_items: "{{ php_stretch_packages }}"
 
 - name: "Install mod_php packages (Debian 9 or later)"
   apt:
-    name: '{{ item }}'
+    name:
+      - libapache2-mod-php
+      - php
     state: present
-  with_items:
-    - libapache2-mod-php
-    - php
   when: php_apache_enable
 
 - name: "Install PHP FPM packages (Debian 9 or later)"
   apt:
-    name: '{{ item }}'
+    name:
+      - php-fpm
+      - php
     state: present
-  with_items:
-    - php-fpm
-    - php
   when: php_fpm_enable
 
 # Configuration
@@ -70,6 +67,7 @@
     - /etc/php/7.0
 
 - include: config_cli.yml
+
 - name: Enforce permissions on PHP cli directory
   file:
     dest: /etc/php/7.0/cli
@@ -77,6 +75,7 @@
 
 - include: config_fpm.yml
   when: php_fpm_enable
+  
 - name: Enforce permissions on PHP fpm directory
   file:
     dest: /etc/php/7.0/fpm
@@ -85,6 +84,7 @@
 
 - include: config_apache.yml
   when: php_apache_enable
+  
 - name: Enforce permissions on PHP apache2 directory
   file:
     dest: /etc/php/7.0/apache2
diff --git a/postfix/tasks/minimal.yml b/postfix/tasks/minimal.yml
index d1e4b4c5..ad666532 100644
--- a/postfix/tasks/minimal.yml
+++ b/postfix/tasks/minimal.yml
@@ -1,10 +1,8 @@
 ---
 - name: ensure packages are installed
   apt:
-    name: '{{ item }}'
+    name: postfix
     state: present
-  with_items:
-  - postfix
   tags:
   - postfix
 
@@ -17,8 +15,6 @@
     mode: "0644"
     force: yes
   notify: restart postfix
-  when: postfix_force_main_cf == True or
-        postfix_maincf_md5_jessie in default_main_cf.stdout or
-        postfix_maincf_md5_stretch in default_main_cf.stdout
+  when: postfix_force_main_cf or postfix_maincf_md5_jessie in default_main_cf.stdout or postfix_maincf_md5_stretch in default_main_cf.stdout
   tags:
   - postfix
diff --git a/postfix/tasks/packmail.yml b/postfix/tasks/packmail.yml
index fd73070c..f6900639 100644
--- a/postfix/tasks/packmail.yml
+++ b/postfix/tasks/packmail.yml
@@ -1,13 +1,12 @@
 ---
 - name: ensure packages are installed
   apt:
-    name: '{{ item }}'
+    name:
+      - postfix
+      - postfix-ldap
+      - postfix-policyd-spf-python
+      - mailgraph
     state: present
-  with_items:
-  - postfix
-  - postfix-ldap
-  - postfix-policyd-spf-python
-  - mailgraph
   tags:
   - postfix
 
@@ -20,9 +19,7 @@
     mode: "0644"
     force: yes
   notify: restart postfix
-  when: postfix_force_main_cf == True or
-        postfix_maincf_md5_jessie in default_main_cf.stdout or
-        postfix_maincf_md5_stretch in default_main_cf.stdout
+  when: postfix_force_main_cf or postfix_maincf_md5_jessie in default_main_cf.stdout or postfix_maincf_md5_stretch in default_main_cf.stdout
   tags:
   - postfix
 
diff --git a/rabbitmq/tasks/main.yml b/rabbitmq/tasks/main.yml
index b251276d..c8e49407 100644
--- a/rabbitmq/tasks/main.yml
+++ b/rabbitmq/tasks/main.yml
@@ -1,9 +1,7 @@
 - name: Install packages
   apt:
-    name: "{{ item }}"
+    name: rabbitmq-server
     state: present
-  with_items:
-  - rabbitmq-server
 
 - name: Create rabbitmq-env.conf
   copy:
diff --git a/rbenv/tasks/main.yml b/rbenv/tasks/main.yml
index 17f95692..28f25481 100644
--- a/rbenv/tasks/main.yml
+++ b/rbenv/tasks/main.yml
@@ -2,19 +2,18 @@
 
 - name: "Rbenv dependencies are installed"
   apt:
-    name: '{{ item }}'
+    name:
+      - build-essential
+      - git
+      - libcurl4-openssl-dev
+      - libffi-dev
+      - libreadline-dev
+      - libssl-dev
+      - libxml2-dev
+      - libxslt1-dev
+      - zlib1g-dev
+      - pkg-config
     state: present
-  with_items:
-    - build-essential
-    - git
-    - libcurl4-openssl-dev
-    - libffi-dev
-    - libreadline-dev
-    - libssl-dev
-    - libxml2-dev
-    - libxslt1-dev
-    - zlib1g-dev
-    - pkg-config
   tags:
     - rbenv
     - packages
diff --git a/redis/tasks/main.yml b/redis/tasks/main.yml
index 564c8cc3..90d5677c 100644
--- a/redis/tasks/main.yml
+++ b/redis/tasks/main.yml
@@ -5,11 +5,10 @@
 
 - name: Redis is installed.
   apt:
-    name: "{{ item }}"
+    name:
+      - redis-server
+      - redis-tools
     state: present
-  with_items:
-    - redis-server
-    - redis-tools
   tags:
     - redis
     - packages
@@ -86,8 +85,7 @@
     - nrpe
 
 - include: nrpe.yml
-  when:
-    - nrpe_evolix_config.stat.exists == true
+  when: nrpe_evolix_config.stat.exists
   tags:
     - redis
     - nrpe
diff --git a/redmine/tasks/packages.yml b/redmine/tasks/packages.yml
index 2ac00fe9..b2be8faa 100644
--- a/redmine/tasks/packages.yml
+++ b/redmine/tasks/packages.yml
@@ -1,21 +1,20 @@
 ---
 - name: Install dependancy
   apt:
-    name: "{{ item }}"
+    name:
+      - libpam-systemd
+      - imagemagick
+      - git-core
+      - git-svn
+      - gcc
+      - build-essential
+      - libxml2-dev
+      - libxslt1-dev
+      - libssl-dev
+      - libmagickwand-dev
+      - libmagickcore-dev
+      - libmariadbclient-dev
+      - python-mysqldb
     state: present
-  with_items:
-    - libpam-systemd
-    - imagemagick
-    - git-core
-    - git-svn
-    - gcc
-    - build-essential
-    - libxml2-dev
-    - libxslt1-dev
-    - libssl-dev
-    - libmagickwand-dev
-    - libmagickcore-dev
-    - libmariadbclient-dev
-    - python-mysqldb
   tags:
     - redmine
diff --git a/spamassasin/tasks/main.yml b/spamassasin/tasks/main.yml
index f79a40df..53c6725b 100644
--- a/spamassasin/tasks/main.yml
+++ b/spamassasin/tasks/main.yml
@@ -1,11 +1,10 @@
 ---
 - name: install SpamAssasin
   apt:
-    name: "{{ item }}"
+    name:
+      - spamassassin
+      - evomaintenance
     state: present
-  with_items:
-    - spamassassin
-    - evomaintenance
   tags:
     - spamassassin
 
diff --git a/squid/tasks/main.yml b/squid/tasks/main.yml
index 82dbee00..e2b4768d 100644
--- a/squid/tasks/main.yml
+++ b/squid/tasks/main.yml
@@ -17,11 +17,10 @@
 
 - name: "Install Squid packages"
   apt:
-    name: '{{ item }}'
+    name:
+      - "{{ squid_daemon_name }}"
+      - squidclient
     state: present
-  with_items:
-  - "{{ squid_daemon_name }}"
-  - squidclient
 
 - name: "Set alternative config file (Debian 9 or later)"
   copy:
diff --git a/tomcat/tasks/packages.yml b/tomcat/tasks/packages.yml
index 29307736..4d17a87f 100644
--- a/tomcat/tasks/packages.yml
+++ b/tomcat/tasks/packages.yml
@@ -1,12 +1,11 @@
 ---
 - name: Install packages
   apt:
-    name: "{{ item }}"
+    name:
+      - "tomcat{{ tomcat_version }}"
+      - "tomcat{{ tomcat_version }}-user"
+      - "libpam-systemd"
     state: present
-  with_items:
-    - "tomcat{{ tomcat_version }}"
-    - "tomcat{{ tomcat_version }}-user"
-    - "libpam-systemd"
 
 - name: Create tomcat root dir
   file:
diff --git a/webapps/evoadmin-web/tasks/packages.yml b/webapps/evoadmin-web/tasks/packages.yml
index d2321ccd..70105691 100644
--- a/webapps/evoadmin-web/tasks/packages.yml
+++ b/webapps/evoadmin-web/tasks/packages.yml
@@ -6,10 +6,8 @@
 
 - name: Install PHP packages (Debian 10 and later)
   apt:
-    name: '{{ item }}'
+    name: php-pear
     state: present
-  with_items:
-    - php-pear
   when: ansible_distribution_major_version is version_compare('10', '>=')
 
 # /!\ Warning, this is a temporary hack
@@ -27,18 +25,15 @@
 
 - name: Install PHP packages (stretch)
   apt:
-    name: '{{ item }}'
+    name:
+      - php-pear
+      - php-log
     state: present
-  with_items:
-    - php-pear
-    - php-log
   when: ansible_distribution_release == "stretch"
 
 - name: Install PHP5 packages (jessie)
   apt:
-    name: '{{ item }}'
+    name: php5-pam
     state: present
     allow_unauthenticated: True
-  with_items:
-    - php5-pam
   when: ansible_distribution_release == "jessie"
diff --git a/webapps/roundcube/tasks/main.yml b/webapps/roundcube/tasks/main.yml
index 2269857a..2efd1823 100644
--- a/webapps/roundcube/tasks/main.yml
+++ b/webapps/roundcube/tasks/main.yml
@@ -13,15 +13,14 @@
 
 - name: install Roundcube
   apt:
-    name: "{{ item }}"
+    name:
+      - imapproxy
+      - roundcube
+      - roundcube-sqlite3
+      - roundcube-plugins
+      - php-net-sieve
+      - php-zip
     state: present
-  with_items:
-    - imapproxy
-    - roundcube
-    - roundcube-sqlite3
-    - roundcube-plugins
-    - php-net-sieve
-    - php-zip
   tags:
     - roundcube