diff --git a/host_vars/routeur-daniel.adm.crans.org.yml b/host_vars/routeur-daniel.adm.crans.org.yml
deleted file mode 100644
index 6dcac2b5..00000000
--- a/host_vars/routeur-daniel.adm.crans.org.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-interfaces:
-  adm: ens18
-  srv: ens19
-  srv_nat: ens20
-  infra: ens21
-  adh: ens22
-  adh_nat: ens23
-  zayo: enp1s3
-  federez: enp1s4
-  accueil: ens1
-
-firewall:
-  version: HEAD
-
-loc_keepalived:
-  instances:
-    - name: all
-      tag: VI_ALL
-      state: BACKUP
-      priority: 100
diff --git a/host_vars/routeur-daniel.adm.crans.org/dhcp.yml b/host_vars/routeur-daniel.adm.crans.org/dhcp.yml
new file mode 100644
index 00000000..6c59aa7f
--- /dev/null
+++ b/host_vars/routeur-daniel.adm.crans.org/dhcp.yml
@@ -0,0 +1,27 @@
+---
+loc_dhcp:
+  authoritative: True
+  subnets:
+    - network: "185.230.78.0/24"
+      deny_unknown: True
+      vlan: "adh"
+      default_lease_time: "600"
+      max_lease_time: "7200"
+      routers: "185.230.78.99"
+      dns: ["185.230.78.99"]
+      domain_name: "adh.crans.org"
+      domain_search: "adh.crans.org"
+      options: []
+      lease_file: "/var/local/services/dhcp/generated/dhcp.adh.crans.org.list"
+
+loc_service_dhcp:
+  re2o:
+    hostname: "{{ query('ldap', 'ip', 'c3po', 'adm') | ipv4 | first }}"
+    user: services
+    password: "{{ vault.re2o_service_password }}"
+  git:
+    remote: https://gitlab.adm.crans.org/nounous/dhcp.git
+    version: master
+  config:
+    extensions:
+      - adh.crans.org
diff --git a/host_vars/routeur-daniel.adm.crans.org/firewall.yml b/host_vars/routeur-daniel.adm.crans.org/firewall.yml
new file mode 100644
index 00000000..700d0185
--- /dev/null
+++ b/host_vars/routeur-daniel.adm.crans.org/firewall.yml
@@ -0,0 +1,9 @@
+---
+loc_service_firewall:
+  re2o:
+    hostname: "{{ query('ldap', 'ip', 'c3po', 'adm') | ipv4 | first }}"
+    user: services
+    password: "{{ vault.re2o_service_password }}"
+  git:
+    remote: https://gitlab.adm.crans.org/nounous/firewall.git
+    version: cachan
diff --git a/host_vars/routeur-daniel.adm.crans.org/radvd.yml b/host_vars/routeur-daniel.adm.crans.org/radvd.yml
new file mode 100644
index 00000000..32fb8db2
--- /dev/null
+++ b/host_vars/routeur-daniel.adm.crans.org/radvd.yml
@@ -0,0 +1,7 @@
+loc_radvd:
+  subnets:
+    - name: adh
+      prefix: 2a0c:700:12::/64
+      dnssl: adh.crans.org
+      dns:
+        - 2a0c:700:12::ff:fe00:9912
diff --git a/host_vars/routeur-daniel.adm.crans.org/vars.yml b/host_vars/routeur-daniel.adm.crans.org/vars.yml
new file mode 100644
index 00000000..8374bc8b
--- /dev/null
+++ b/host_vars/routeur-daniel.adm.crans.org/vars.yml
@@ -0,0 +1,10 @@
+---
+interfaces:
+  adm: ens18
+  via: ens19
+  aurore: ens20
+  renater: ens21
+  interco: ens22
+  srv: ens23
+  srv_nat: ens1
+  adh: enp1s2
diff --git a/host_vars/routeur-jack.adm.crans.org.yml b/host_vars/routeur-jack.adm.crans.org.yml
deleted file mode 100644
index ce28f34d..00000000
--- a/host_vars/routeur-jack.adm.crans.org.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-interfaces:
-  adm: ens18
-  srv: ens19
-  srv_nat: ens20
-  infra: ens21
-  adh: ens22
-  adh_nat: ens23
-  zayo: enp1s3
-  federez: enp1s4
-  accueil: ens1
-
-firewall:
-  version: HEAD
-
-loc_keepalived:
-  instances:
-    - name: all
-      tag: VI_ALL
-      state: BACKUP
-      priority: 50
diff --git a/host_vars/routeur-jack.adm.crans.org/dhcp.yml b/host_vars/routeur-jack.adm.crans.org/dhcp.yml
new file mode 100644
index 00000000..6c59aa7f
--- /dev/null
+++ b/host_vars/routeur-jack.adm.crans.org/dhcp.yml
@@ -0,0 +1,27 @@
+---
+loc_dhcp:
+  authoritative: True
+  subnets:
+    - network: "185.230.78.0/24"
+      deny_unknown: True
+      vlan: "adh"
+      default_lease_time: "600"
+      max_lease_time: "7200"
+      routers: "185.230.78.99"
+      dns: ["185.230.78.99"]
+      domain_name: "adh.crans.org"
+      domain_search: "adh.crans.org"
+      options: []
+      lease_file: "/var/local/services/dhcp/generated/dhcp.adh.crans.org.list"
+
+loc_service_dhcp:
+  re2o:
+    hostname: "{{ query('ldap', 'ip', 'c3po', 'adm') | ipv4 | first }}"
+    user: services
+    password: "{{ vault.re2o_service_password }}"
+  git:
+    remote: https://gitlab.adm.crans.org/nounous/dhcp.git
+    version: master
+  config:
+    extensions:
+      - adh.crans.org
diff --git a/host_vars/routeur-jack.adm.crans.org/firewall.yml b/host_vars/routeur-jack.adm.crans.org/firewall.yml
new file mode 100644
index 00000000..700d0185
--- /dev/null
+++ b/host_vars/routeur-jack.adm.crans.org/firewall.yml
@@ -0,0 +1,9 @@
+---
+loc_service_firewall:
+  re2o:
+    hostname: "{{ query('ldap', 'ip', 'c3po', 'adm') | ipv4 | first }}"
+    user: services
+    password: "{{ vault.re2o_service_password }}"
+  git:
+    remote: https://gitlab.adm.crans.org/nounous/firewall.git
+    version: cachan
diff --git a/host_vars/routeur-jack.adm.crans.org/radvd.yml b/host_vars/routeur-jack.adm.crans.org/radvd.yml
new file mode 100644
index 00000000..32fb8db2
--- /dev/null
+++ b/host_vars/routeur-jack.adm.crans.org/radvd.yml
@@ -0,0 +1,7 @@
+loc_radvd:
+  subnets:
+    - name: adh
+      prefix: 2a0c:700:12::/64
+      dnssl: adh.crans.org
+      dns:
+        - 2a0c:700:12::ff:fe00:9912
diff --git a/host_vars/routeur-jack.adm.crans.org/vars.yml b/host_vars/routeur-jack.adm.crans.org/vars.yml
new file mode 100644
index 00000000..14ee1f30
--- /dev/null
+++ b/host_vars/routeur-jack.adm.crans.org/vars.yml
@@ -0,0 +1,10 @@
+---
+interfaces:
+  adm: ens18
+  via: ens19
+  aurore: ens20
+  renater: ens21
+  interco: ens22
+  srv: ens23
+  srv_nat: ens1
+  adh: ens2
diff --git a/hosts b/hosts
index 6e88bb36..7cb8a942 100644
--- a/hosts
+++ b/hosts
@@ -192,8 +192,8 @@ gitlab
 roundcube.adm.crans.org
 
 [routeurs_vm]
-#routeur-daniel.adm.crans.org
-#routeur-jack.adm.crans.org
+routeur-daniel.adm.crans.org
+routeur-jack.adm.crans.org
 routeur-sam.adm.crans.org
 routeur-gulp.cachan-adm.crans.org