diff --git a/group_vars/all/vault.yml b/group_vars/all/vault.yml
index 52a14ab..8fa4cbb 100644
--- a/group_vars/all/vault.yml
+++ b/group_vars/all/vault.yml
@@ -1,3 +1,4 @@
+---
 $ANSIBLE_VAULT;1.1;AES256
 61333538366635353537346231363235653162356330396434383631656465616330363136306563
 3861333166386536633437386335613461646466346239360a643139303037613937373631313661
diff --git a/group_vars/edc/ldap_local_replica.yml b/group_vars/edc/ldap_local_replica.yml
index bad6801..63cfeb4 100644
--- a/group_vars/edc/ldap_local_replica.yml
+++ b/group_vars/edc/ldap_local_replica.yml
@@ -1,4 +1,3 @@
 ---
 ldap_local_replica_uri:
   - 'ldap://ldap-replica-edc.adm.auro.re'
-
diff --git a/roles/ipv6_edge_router/tasks/main.yml b/roles/ipv6_edge_router/tasks/main.yml
index 5978303..8ec1353 100644
--- a/roles/ipv6_edge_router/tasks/main.yml
+++ b/roles/ipv6_edge_router/tasks/main.yml
@@ -1,5 +1,4 @@
 ---
-
 - name: install GPG
   apt:
     name: gnupg
@@ -37,4 +36,4 @@
   service:
     name: frr
     state: started
-    enabled: yes
+    enabled: true
diff --git a/roles/isc_dhcp_server/handlers/main.yml b/roles/isc_dhcp_server/handlers/main.yml
index 7df6d92..fd4dd48 100644
--- a/roles/isc_dhcp_server/handlers/main.yml
+++ b/roles/isc_dhcp_server/handlers/main.yml
@@ -1,3 +1,4 @@
+---
 - name: force run dhcp re2o-service
   command: /var/local/re2o-services/dhcp/main.py --force
   become_user: re2o-services
@@ -11,4 +12,3 @@
   systemd:
     name: rsyslog
     state: restarted
-
diff --git a/roles/isc_dhcp_server/tasks/main.yml b/roles/isc_dhcp_server/tasks/main.yml
index 3a0fe8a..f3ffe54 100644
--- a/roles/isc_dhcp_server/tasks/main.yml
+++ b/roles/isc_dhcp_server/tasks/main.yml
@@ -17,7 +17,7 @@
     state: directory
     owner: re2o-services
     group: nogroup
-    recurse: yes
+    recurse: true
     mode: u=rwX,g=rX,o=rX
 
 - name: Install isc-dhcp-server
diff --git a/roles/radius/tasks/main.yml b/roles/radius/tasks/main.yml
index a5875b3..71389d0 100644
--- a/roles/radius/tasks/main.yml
+++ b/roles/radius/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - name: Add backports repositories
   apt_repository:
     repo: "{{ item }} http://deb.debian.org/debian buster-backports main contrib non-free"
@@ -34,8 +35,8 @@
   apt:
     name: freeradius-python3
     default_release: buster-backports
-    update_cache: yes
-  ignore_errors: yes
+    update_cache: true
+  ignore_errors: true
 
 - name: fix freeradius-python3 postinstall script
   template:
@@ -47,15 +48,15 @@
   apt:
     name: freeradius-python3
     default_release: buster-backports
-    force: yes
-  ignore_errors: yes
+    force: true
+  ignore_errors: true
 
 - name: Setup radius symlinks
   file:
     src: "/var/www/re2o/freeradius_utils/{{ item.local_prefix }}{{ item.filename }}"
     dest: "/etc/freeradius/3.0/{{ item.filename }}"
     state: link
-    force: yes
+    force: true
   loop:
     - local_prefix: ""
       filename: auth.py
@@ -158,7 +159,7 @@
     state: absent
   become_user: postgres
   when: nuke_radius|default(false)
-  ignore_errors: yes
+  ignore_errors: true
 
 - name: Nuking - Destroy old local DB if it exists
   community.general.postgresql_db:
@@ -255,6 +256,6 @@
 - name: Restart freeradius, ensure enabled
   systemd:
     name: freeradius
-    enabled: yes
+    enabled: true
     state: restarted
-    daemon_reload: yes
+    daemon_reload: true
diff --git a/roles/radvd/handlers/main.yml b/roles/radvd/handlers/main.yml
index f2ce52c..6ed4ca7 100644
--- a/roles/radvd/handlers/main.yml
+++ b/roles/radvd/handlers/main.yml
@@ -1,5 +1,6 @@
+---
 - name: restart radvd
   systemd:
     state: restarted
     name: radvd
-    enabled: yes
+    enabled: true
diff --git a/roles/radvd/tasks/main.yml b/roles/radvd/tasks/main.yml
index 75c72c1..47b1f9d 100644
--- a/roles/radvd/tasks/main.yml
+++ b/roles/radvd/tasks/main.yml
@@ -1,6 +1,4 @@
 ---
-
-
 # Warning: radvd installation seems to fail if the configuration
 # file doesn't already exist when the package is installed,
 # so the order is important.
@@ -19,4 +17,3 @@
     name: radvd
     state: present
   notify: restart radvd
-
diff --git a/roles/router/handlers/main.yml b/roles/router/handlers/main.yml
index b095c21..0583512 100644
--- a/roles/router/handlers/main.yml
+++ b/roles/router/handlers/main.yml
@@ -1,8 +1,9 @@
+---
 - name: restart keepalived
   systemd:
     state: restarted
     name: keepalived
-    enabled: yes
+    enabled: true
 
 - name: run aurore-firewall
   command: python3 main.py --force
diff --git a/roles/router/tasks/main.yml b/roles/router/tasks/main.yml
index a686a6e..317261e 100644
--- a/roles/router/tasks/main.yml
+++ b/roles/router/tasks/main.yml
@@ -15,13 +15,13 @@
   ansible.posix.sysctl:
     name: net.ipv4.ip_forward
     value: '1'
-    sysctl_set: yes
+    sysctl_set: true
 
 - name: Enable IPv6 packet forwarding
   ansible.posix.sysctl:
     name: net.ipv6.conf.all.forwarding
     value: '1'
-    sysctl_set: yes
+    sysctl_set: true
 
 - name: Configure /etc/network/interfaces for routeur-aurore*
   template:
diff --git a/roles/unbound/handlers/main.yml b/roles/unbound/handlers/main.yml
index a619b94..c9d2d42 100644
--- a/roles/unbound/handlers/main.yml
+++ b/roles/unbound/handlers/main.yml
@@ -1,3 +1,4 @@
+---
 - name: restart unbound
   systemd:
     state: restarted