diff --git a/all.yml b/all.yml
index 692f4f0df8690698f95fda4870c47c9cec17236e..c7bb4fc4ab19ac83382215387c1d6f22e85d8e9e 100755
--- a/all.yml
+++ b/all.yml
@@ -4,46 +4,65 @@
 # It's a good tool for lazy administrators that just want to check that
 # current running configuration matches Ansible.
 
-# Core playboot to have minimal configuration
-- import_playbook: plays/root.yml
-
-# Common configuration
-- import_playbook: plays/mail.yml
-- import_playbook: plays/nfs.yml
-# - import_playbook: plays/logs.yml  TODO: rsyncd
-- import_playbook: plays/backup.yml  # import borgbackup_client/server.yml
-# - import_playbook: plays/network-interfaces.yml  TODO: check this paybook
-- import_playbook: plays/monitoring.yml
-
-# Services that only apply to a subset of server
+- import_playbook: plays/autoconfig.yml
+- import_playbook: plays/backup.yml
+- import_playbook: plays/baie.yml
+- import_playbook: plays/belenios.yml
+- import_playbook: plays/bird.yml
+- import_playbook: plays/borgbackup_client.yml
 - import_playbook: plays/cas.yml
 - import_playbook: plays/certbot.yml
+- import_playbook: plays/constellation.yml
 - import_playbook: plays/dhcp.yml
-- import_playbook: plays/dns.yml
+- import_playbook: plays/dns-authoritative.yml
+- import_playbook: plays/dns-recursive.yml
 - import_playbook: plays/dovecot.yml
 - import_playbook: plays/ethercalc.yml
 - import_playbook: plays/etherpad.yml
 - import_playbook: plays/firewall.yml
 - import_playbook: plays/framadate.yml
 - import_playbook: plays/freeradius.yml
+- import_playbook: plays/galene.yml
 - import_playbook: plays/generate_documentation.yml
 - import_playbook: plays/gitlab.yml
 - import_playbook: plays/home.yml
 - import_playbook: plays/horde.yml
+- import_playbook: plays/irc.yml
+- import_playbook: plays/jitsi.yml
 - import_playbook: plays/keepalived.yml
+- import_playbook: plays/linx.yml
+- import_playbook: plays/logos.yml
 - import_playbook: plays/mailman.yml
+- import_playbook: plays/matrix.yml
 - import_playbook: plays/mirror.yml
 - import_playbook: plays/moinmoin.yml
-- import_playbook: plays/nginx_rtmp.yml
+- import_playbook: plays/monitoring.yml
+- import_playbook: plays/network_interfaces.yml
+- import_playbook: plays/nfs_mount.yml
+- import_playbook: plays/nginx.yml
 - import_playbook: plays/ntp.yml
+- import_playbook: plays/nullmailer.yml
 - import_playbook: plays/owncloud.yml
 - import_playbook: plays/postfix.yml
 - import_playbook: plays/postgresql.yml
+- import_playbook: plays/prefix-delegation.yml
+- import_playbook: plays/printer.yml
+- import_playbook: plays/proxmox.yml
+- import_playbook: plays/radvd.yml
+- import_playbook: plays/re2o-ldap.yml
 - import_playbook: plays/re2o.yml
 - import_playbook: plays/reverse-proxy.yml
+- import_playbook: plays/root.yml
 - import_playbook: plays/roundcube.yml
+- import_playbook: plays/routeurs.yml
+- import_playbook: plays/rsyslog-server.yml
+- import_playbook: plays/scripts.yml
+- import_playbook: plays/slapd.yml
 - import_playbook: plays/ssh_known_hosts.yml
-- import_playbook: plays/tv.yml
-- import_playbook: plays/unifi.yml
+- import_playbook: plays/sssd.yml
+- import_playbook: plays/unbound.yml
+- import_playbook: plays/utilities.yml
+- import_playbook: plays/vm_setup.yml
+- import_playbook: plays/vsftpd.yml
 - import_playbook: plays/wireguard.yml
 - import_playbook: plays/zamok.yml
diff --git a/hosts b/hosts
index 36241bd668349ee25a77b99e30e3dd4f4d798ba1..e5d3aa92199085a17e5ef021496fd9b449c49464 100644
--- a/hosts
+++ b/hosts
@@ -37,7 +37,6 @@ gitlab
 jitsi
 mailman
 postfix
-radius  # We use certbot to manage LE certificates
 reverseproxy
 vsftpd_mirror
 
@@ -188,9 +187,6 @@ routeurs_vm
 [re2o]
 re2o.adm.crans.org
 
-[re2o:children]
-radius
-
 [re2o_front]
 re2o.adm.crans.org
 
diff --git a/plays/slapd.yml b/plays/slapd.yml
index db5fb3b5d781f2803df61bd3e23c825d1876e1c2..955336066577be224ade2ed9683882d3ba5e322e 100755
--- a/plays/slapd.yml
+++ b/plays/slapd.yml
@@ -6,8 +6,4 @@
   roles:
     - slapd
 
-- hosts: re2o_ldap_replica
-  vars:
-    re2o_ldap_replica: '{{ glob_re2o_ldap_replica | default({}) | combine(loc_re2o_ldap_replica | default({})) }}'
-  roles:
-    - re2o-ldap-replica
+- import_playbook: re2o-ldap.yml
diff --git a/plays/unifi.yml b/plays/unifi.yml
deleted file mode 100755
index f2ecdd834c2373f574dde956ba05ad2a37a82245..0000000000000000000000000000000000000000
--- a/plays/unifi.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env ansible-playbook
----
-# Deploy Unifi Controller
-- hosts: unifi
-  roles:
-    - unifi-controller
diff --git a/roles/bind-authoritative/tasks/main.yml b/roles/bind-authoritative/tasks/main.yml
index 1191b44cdda5b0ffd3d7ee3dd773a2a4d4ef1d0f..1c6daf7fe5b04b4e6aa95178841aea81888ae9ce 100644
--- a/roles/bind-authoritative/tasks/main.yml
+++ b/roles/bind-authoritative/tasks/main.yml
@@ -25,7 +25,7 @@
     - named.conf.options
   notify: Reload Bind9
 
-- include: dnssec.yml
+- include_tasks: dnssec.yml
   when: is_master
 
 - name: Indicate role in motd