diff --git a/roles/baseconfig/tasks/main.yml b/roles/baseconfig/tasks/main.yml
index 807c20d..447b046 100644
--- a/roles/baseconfig/tasks/main.yml
+++ b/roles/baseconfig/tasks/main.yml
@@ -3,11 +3,7 @@
 - name: Install basic tools
   when: ansible_os_family == "Debian"
   apt:
-    name: "{{ packages }}"
-    state: present
-    update_cache: true
-  vars:
-    packages:
+    name:
       - bash-completion   # for bash users
       - zsh               # alternative shell
       - sudo              # to gain root access
@@ -19,6 +15,7 @@
       - tree              # create a graphical tree of files
       - ipython           # better Python shell
       - acl               # for Ansible become support
+    update_cache: true
   register: apt_result
   retries: 3
   until: apt_result is succeeded
diff --git a/roles/codimd/tasks/0_apt_dependencies.yml b/roles/codimd/tasks/0_apt_dependencies.yml
index 2b73378..3e30b80 100644
--- a/roles/codimd/tasks/0_apt_dependencies.yml
+++ b/roles/codimd/tasks/0_apt_dependencies.yml
@@ -17,15 +17,13 @@
 # Install CodiMD dependencies
 - name: Install required packages
   apt:
-    name: "{{ item }}"
-    state: present
+    name:
+      - git
+      - nodejs
+      - npm
+      - build-essential
+      - yarn
     update_cache: true
-  with_items:
-    - git
-    - nodejs
-    - npm
-    - build-essential
-    - yarn
   register: apt_result
   retries: 3
   until: apt_result is succeeded
diff --git a/roles/etherpad/tasks/0_apt_dependencies.yml b/roles/etherpad/tasks/0_apt_dependencies.yml
index c5995f1..e36321b 100644
--- a/roles/etherpad/tasks/0_apt_dependencies.yml
+++ b/roles/etherpad/tasks/0_apt_dependencies.yml
@@ -12,15 +12,13 @@
 # Install EtherPad dependencies
 - name: Install required packages
   apt:
-    name: "{{ item }}"
-    state: present
+    name:
+      - build-essential
+      - curl
+      - git
+      - nodejs
+      - npm
     update_cache: true
-  with_items:
-    - build-essential
-    - curl
-    - git
-    - nodejs
-    - npm
   register: apt_result
   retries: 3
   until: apt_result is succeeded
diff --git a/roles/ldap-client/tasks/0_install_ldap.yml b/roles/ldap-client/tasks/0_install_ldap.yml
index 16552a0..5905d4a 100644
--- a/roles/ldap-client/tasks/0_install_ldap.yml
+++ b/roles/ldap-client/tasks/0_install_ldap.yml
@@ -2,13 +2,11 @@
 # Install LDAP client packages
 - name: Install LDAP client packages
   apt:
-    name: "{{ item }}"
-    state: present
+    name:
+      - nslcd
+      - libnss-ldapd
+      - libpam-ldapd
     update_cache: true
-  with_items:
-    - nslcd
-    - libnss-ldapd
-    - libpam-ldapd
   register: apt_result
   retries: 3
   until: apt_result is succeeded
diff --git a/roles/matrix-appservice-discord/tasks/0_apt_dependencies.yml b/roles/matrix-appservice-discord/tasks/0_apt_dependencies.yml
index 04288e5..d61dd10 100644
--- a/roles/matrix-appservice-discord/tasks/0_apt_dependencies.yml
+++ b/roles/matrix-appservice-discord/tasks/0_apt_dependencies.yml
@@ -10,14 +10,12 @@
 
 - name: Install required packages
   apt:
-    name: "{{ item }}"
-    state: present
+    name:
+      - git
+      - nodejs
+      - npm
+      - build-essential
     update_cache: true
-  with_items:
-    - git
-    - nodejs
-    - npm
-    - build-essential
   register: apt_result
   retries: 3
   until: apt_result is succeeded
diff --git a/roles/matrix-appservice-irc/tasks/0_apt_dependencies.yml b/roles/matrix-appservice-irc/tasks/0_apt_dependencies.yml
index 04288e5..d61dd10 100644
--- a/roles/matrix-appservice-irc/tasks/0_apt_dependencies.yml
+++ b/roles/matrix-appservice-irc/tasks/0_apt_dependencies.yml
@@ -10,14 +10,12 @@
 
 - name: Install required packages
   apt:
-    name: "{{ item }}"
-    state: present
+    name:
+      - git
+      - nodejs
+      - npm
+      - build-essential
     update_cache: true
-  with_items:
-    - git
-    - nodejs
-    - npm
-    - build-essential
   register: apt_result
   retries: 3
   until: apt_result is succeeded