diff --git a/roles/baseconfig/tasks/apt-listchanges.yml b/roles/baseconfig/tasks/apt-listchanges.yml
index ab37640..56925b2 100644
--- a/roles/baseconfig/tasks/apt-listchanges.yml
+++ b/roles/baseconfig/tasks/apt-listchanges.yml
@@ -5,7 +5,7 @@
   apt:
     name: apt-listchanges
     state: present
-    update_cache: yes
+    update_cache: true
 
 # Send email when there is something new
 - name: Configure apt-listchanges
diff --git a/roles/baseconfig/tasks/main.yml b/roles/baseconfig/tasks/main.yml
index 7d6399a..8501e36 100644
--- a/roles/baseconfig/tasks/main.yml
+++ b/roles/baseconfig/tasks/main.yml
@@ -5,7 +5,7 @@
   apt:
     name: "{{ packages }}"
     state: present
-    update_cache: yes
+    update_cache: true
   vars:
     packages:
       - bash-completion   # for bash users
diff --git a/roles/baseconfig/tasks/molly-guard.yml b/roles/baseconfig/tasks/molly-guard.yml
index e8d19c0..bee8e12 100644
--- a/roles/baseconfig/tasks/molly-guard.yml
+++ b/roles/baseconfig/tasks/molly-guard.yml
@@ -5,7 +5,7 @@
   apt:
     name: molly-guard
     state: present
-    update_cache: yes
+    update_cache: true
 
 # Always ask for hostname
 - name: Configure molly-guard
diff --git a/roles/codimd/tasks/0_apt_dependencies.yml b/roles/codimd/tasks/0_apt_dependencies.yml
index f6e30d4..158c59e 100644
--- a/roles/codimd/tasks/0_apt_dependencies.yml
+++ b/roles/codimd/tasks/0_apt_dependencies.yml
@@ -14,7 +14,7 @@
   apt:
     name: "{{ item }}"
     state: present
-    update_cache: yes
+    update_cache: true
   with_items:
     - git
     - nodejs
diff --git a/roles/dokuwiki/tasks/main.yml b/roles/dokuwiki/tasks/main.yml
index f6f7e0c..0da632d 100644
--- a/roles/dokuwiki/tasks/main.yml
+++ b/roles/dokuwiki/tasks/main.yml
@@ -23,4 +23,4 @@
 - name: Install DokuWiki
   apt:
     name: dokuwiki
-    update_cache: yes
+    update_cache: true
diff --git a/roles/etherpad/tasks/0_apt_dependencies.yml b/roles/etherpad/tasks/0_apt_dependencies.yml
index ca6a348..4c8d341 100644
--- a/roles/etherpad/tasks/0_apt_dependencies.yml
+++ b/roles/etherpad/tasks/0_apt_dependencies.yml
@@ -14,7 +14,7 @@
   apt:
     name: "{{ item }}"
     state: present
-    update_cache: yes
+    update_cache: true
   with_items:
     - build-essential
     - curl
diff --git a/roles/ldap-client/tasks/0_install_ldap.yml b/roles/ldap-client/tasks/0_install_ldap.yml
index 45b72ea..79ceb18 100644
--- a/roles/ldap-client/tasks/0_install_ldap.yml
+++ b/roles/ldap-client/tasks/0_install_ldap.yml
@@ -4,7 +4,7 @@
   apt:
     name: "{{ item }}"
     state: present
-    update_cache: yes
+    update_cache: true
   with_items:
     - nslcd
     - libnss-ldapd
@@ -16,7 +16,7 @@
 #   apt:
 #     name: nscd
 #     state: present
-#     update_cache: yes
+#     update_cache: true
 
 # Configure /etc/nslcd.conf
 - name: Configure nslcd LDAP credentials
diff --git a/roles/ldap-replica/tasks/main.yml b/roles/ldap-replica/tasks/main.yml
index 49ce59a..5face6d 100644
--- a/roles/ldap-replica/tasks/main.yml
+++ b/roles/ldap-replica/tasks/main.yml
@@ -4,7 +4,7 @@
   apt:
     name: slapd
     state: present
-    update_cache: yes
+    update_cache: true
 
 # What is written after is really not a nice way to install a schema
 # because the LDAP is being flushed away always...
diff --git a/roles/matrix-riot/tasks/main.yml b/roles/matrix-riot/tasks/main.yml
index 52620ba..007a449 100644
--- a/roles/matrix-riot/tasks/main.yml
+++ b/roles/matrix-riot/tasks/main.yml
@@ -3,7 +3,7 @@
 - name: Install apt-transport-https
   apt:
     name: apt-transport-https
-    update_cache: yes
+    update_cache: true
 
 # Add the repository into source list
 - name: Configure riot repository
@@ -20,7 +20,7 @@
 - name: Install riot-web
   apt:
     name: riot-web
-    update_cache: yes
+    update_cache: true
 
 # Install nginx
 - name: Install nginx
diff --git a/roles/matrix-synapse/tasks/main.yml b/roles/matrix-synapse/tasks/main.yml
index 1ac579f..06e44bc 100644
--- a/roles/matrix-synapse/tasks/main.yml
+++ b/roles/matrix-synapse/tasks/main.yml
@@ -2,7 +2,7 @@
 - name: Install matrix-synapse
   apt:
     name: matrix-synapse
-    update_cache: yes
+    update_cache: true
     default_release: stretch-backports
 
 - name: Configure matrix-synapse
diff --git a/roles/nginx-reverse-proxy/tasks/main.yml b/roles/nginx-reverse-proxy/tasks/main.yml
index 5c7571d..d7a93ee 100644
--- a/roles/nginx-reverse-proxy/tasks/main.yml
+++ b/roles/nginx-reverse-proxy/tasks/main.yml
@@ -3,7 +3,7 @@
 - name: Install NGINX server
   apt:
     name: nginx
-    update_cache: yes
+    update_cache: true
 
 # Install sites
 - name: Configure NGINX sites
diff --git a/upgrade.yml b/upgrade.yml
index cd4d3c5..f5fbbef 100644
--- a/upgrade.yml
+++ b/upgrade.yml
@@ -7,5 +7,5 @@
     - name: Upgrade
       apt:
         upgrade: dist
-        update_cache: yes
+        update_cache: true
         cache_valid_time: 86400  # one day