diff --git a/base.yml b/base.yml
index 208401e..dc3c2dc 100644
--- a/base.yml
+++ b/base.yml
@@ -2,8 +2,8 @@
 # Put a common configuration on all servers
 - hosts: all
   roles:
-   - baseconfig
-   - basesecurity
+    - baseconfig
+    - basesecurity
 
 # Plug LDAP on all servers
 - hosts: all
diff --git a/roles/passbolt/tasks/main.yml b/roles/passbolt/tasks/main.yml
index 6b08a12..0c10a53 100644
--- a/roles/passbolt/tasks/main.yml
+++ b/roles/passbolt/tasks/main.yml
@@ -21,7 +21,7 @@
       - nginx
       - mariadb-server
     state: present
-    update_cache: yes
+    update_cache: true
   register: apt_result
   retries: 3
   until: apt_result is succeeded
diff --git a/roles/prometheus-node/tasks/main.yml b/roles/prometheus-node/tasks/main.yml
index 96ec332..5d6f56f 100644
--- a/roles/prometheus-node/tasks/main.yml
+++ b/roles/prometheus-node/tasks/main.yml
@@ -10,7 +10,7 @@
 - name: Activate prometheus-node-exporter service
   systemd:
     name: prometheus-node-exporter
-    enabled: yes
+    enabled: true
     state: started
 
 # Doesn't work on Debian Stretch
diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml
index 68be2f9..6e730af 100644
--- a/roles/prometheus/tasks/main.yml
+++ b/roles/prometheus/tasks/main.yml
@@ -40,7 +40,7 @@
 - name: Activate prometheus service
   systemd:
     name: prometheus
-    enabled: yes
+    enabled: true
     state: started
 
 - name: Indicate role in motd
diff --git a/services_web.yml b/services_web.yml
index a8d508d..ae0f50d 100644
--- a/services_web.yml
+++ b/services_web.yml
@@ -12,15 +12,15 @@
 # Install EtherPad on EtherPad containers
 - hosts: pad.adm.auro.re
   roles:
-   - debian-backports
-   - nodejs
-   - etherpad
+    - debian-backports
+    - nodejs
+    - etherpad
 
 # Install DokuWiki on the wiki TEST container
 # When it will be operational, horus-wikitest will replace horus-wiki
 - hosts: horus-wikitest
   roles:
-   - dokuwiki
+    - dokuwiki
 
 # Install NGINX with reverse proxy conf
 - hosts: proxy.adm.auro.re