diff --git a/ansible.cfg b/ansible.cfg
index 457c3d2..dc984aa 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -2,14 +2,14 @@
 
 [defaults]
 
-# Use Aurore inventory
+# Do not create .retry files
+retry_files_enabled = False
+
+# Use inventory
 inventory = ./hosts
 
 # Custom header in templates
-ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host}
-
-# Do not create retry files
-retry_files_enabled = False
+ansible_managed = Ansible managed, modified on %Y-%m-%d %H:%M:%S by {uid}
 
 # Do not use cows (with cowsay)
 nocows = 1
@@ -17,6 +17,9 @@ nocows = 1
 # Do more parallelism
 forks = 15
 
+# Some SSH connection will take time
+timeout = 60
+
 [privilege_escalation]
 
 # Use sudo to get priviledge access
diff --git a/codimd.yml b/codimd.yml
deleted file mode 100644
index fe9d788..0000000
--- a/codimd.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# Install CodiMD on CodiMD containers
-- hosts: codimd.adm.auro.re
-  roles:
-    - debian-backports
-    - nodejs
-    - codimd
diff --git a/dhcp.yml b/dhcp.yml
deleted file mode 100644
index 8434f06..0000000
--- a/dhcp.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-# Deploy DHCP
-- hosts: dhcp-pacaterie.adm.auro.re
-  vars:
-    service_repo: https://gitlab.federez.net/re2o/dhcp.git
-    service_name: dhcp
-    service_version: master
-    service_config:
-      hostname: re2o-server.adm.auro.re
-      username: service-user
-      password: "{{ vault_serviceuser_passwd }}"
-    dhcp:
-      authoritative: true
-  roles:
-    - re2o-service
-    - isc-dhcp-server
diff --git a/dns.yml b/dns.yml
deleted file mode 100644
index 601993a..0000000
--- a/dns.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-# Deploy DNS
-- hosts: serge.adm.auro.re
-  vars:
-    service_repo: https://gitlab.crans.org/nounous/re2o-dns.git
-    service_name: dns
-    service_version: crans
-    service_config:
-      hostname: re2o-server.adm.auro.re
-      username: service-user
-      password: "{{ vault_serviceuser_passwd }}"
-  roles:
-    - re2o-service
diff --git a/dokuwiki.yml b/dokuwiki.yml
deleted file mode 100644
index a27d148..0000000
--- a/dokuwiki.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# Install DokuWiki on the wiki TEST container
-# When it will be operational, horus-wikitest will replace horus-wiki
-- hosts: horus-wikitest
-  roles:
-   - dokuwiki
diff --git a/etherpad.yml b/etherpad.yml
deleted file mode 100644
index c60fd49..0000000
--- a/etherpad.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# Install EtherPad on EtherPad containers
-- hosts: pad.adm.auro.re
-  roles:
-   - debian-backports
-   - nodejs
-   - etherpad
diff --git a/services_web.yml b/services_web.yml
index ee9e4d1..a8d508d 100644
--- a/services_web.yml
+++ b/services_web.yml
@@ -9,6 +9,19 @@
   roles:
     - passbolt
 
+# Install EtherPad on EtherPad containers
+- hosts: pad.adm.auro.re
+  roles:
+   - 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
+
 # Install NGINX with reverse proxy conf
 - hosts: proxy.adm.auro.re
   vars:
diff --git a/unifi.yml b/unifi.yml
deleted file mode 100644
index 3eb9c7d..0000000
--- a/unifi.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-# Deploy Unifi Controller
-- hosts: unifi-pacaterie.adm.auro.re
-  roles:
-    - unifi-controller