diff --git a/group_vars/dhcp.yml b/group_vars/dhcp.yml
index 0caa4aec08a892ceed6582441380bfb48307151f..409226f1d957a337317ce42b8488df8312c0b005 100644
--- a/group_vars/dhcp.yml
+++ b/group_vars/dhcp.yml
@@ -15,7 +15,7 @@ glob_dhcp:
       domain_name: "adh.crans.org"
       domain_search: "adh.crans.org"
       options: []
-      lease_file: "/var/local/re2o-services/dhcp/generated/dhcp.adh.crans.org.list"
+      lease_file: "/var/local/services/dhcp/generated/dhcp.adh.crans.org.list"
     - network: "100.64.0.0/16"
       deny_unknown: True
       vlan: "adh_nat"
@@ -26,7 +26,7 @@ glob_dhcp:
       domain_name: "adh-nat.crans.org"
       domain_search: "adh-nat.crans.org"
       options: []
-      lease_file: "/var/local/re2o-services/dhcp/generated/dhcp.adh-nat.crans.org.list"
+      lease_file: "/var/local/services/dhcp/generated/dhcp.adh-nat.crans.org.list"
     - network: "172.16.32.0/22"
       deny_unknown: True
       vlan: "infra"
@@ -36,7 +36,7 @@ glob_dhcp:
       domain_name: "infra.crans.org"
       domain_search: "infra.crans.org"
       options: []
-      lease_file: "/var/local/re2o-services/dhcp/generated/dhcp.infra.crans.org.list"
+      lease_file: "/var/local/services/dhcp/generated/dhcp.infra.crans.org.list"
     - network: "172.16.14.0/24"
       vlan: "accueil"
       default_lease_time: "600"
@@ -71,4 +71,4 @@ glob_re2o_services:
   mail_server: "{{ glob_smtp }}"
 
 glob_re2o_dhcp:
-  uri: "https://gitlab.adm.crans.org/nounous/re2o-dhcp.git"
+  uri: "https://gitlab.adm.crans.org/nounous/dhcp.git"
diff --git a/host_vars/routeur-jack.adm.crans.org.yml b/host_vars/routeur-jack.adm.crans.org.yml
index 87723febc99763cc6455f14829aa5566acad14ed..ce28f34d133abc0ed6af02b35f4b0516b239f614 100644
--- a/host_vars/routeur-jack.adm.crans.org.yml
+++ b/host_vars/routeur-jack.adm.crans.org.yml
@@ -7,7 +7,7 @@ interfaces:
   adh: ens22
   adh_nat: ens23
   zayo: enp1s3
-#  federez: enp1s4
+  federez: enp1s4
   accueil: ens1
 
 firewall:
diff --git a/roles/isc-dhcp-server/handlers/main.yml b/roles/isc-dhcp-server/handlers/main.yml
index e2f3f11d4bc79c1a6d61a85e53c1ca2033b6ea5a..51268e9886357a1fb0171911836070501a93e73b 100644
--- a/roles/isc-dhcp-server/handlers/main.yml
+++ b/roles/isc-dhcp-server/handlers/main.yml
@@ -1,7 +1,12 @@
 ---
+- name: check isc-dhcp-server
+  service_facts:
+  listen: 'restart isc-dhcp-server'
+
 - name: restart dhcp server
   systemd:
     name: isc-dhcp-server
     state: restarted
     enabled: true
-  when: not ansible_check_mode
+  listen: 'restart isc-dhcp-server'
+  when: not ansible_check_mode and ansible_facts.services['isc-dhcp-server']['state'] == 'running'
diff --git a/roles/isc-dhcp-server/tasks/main.yml b/roles/isc-dhcp-server/tasks/main.yml
index e406553c4bcdbb73ad7b82f2bbec65605f8599d0..95dc16d89f3d9a0e1abb01de4d0d27a1c55f502d 100644
--- a/roles/isc-dhcp-server/tasks/main.yml
+++ b/roles/isc-dhcp-server/tasks/main.yml
@@ -13,13 +13,13 @@
     src: default/isc-dhcp-server.j2
     dest: /etc/default/isc-dhcp-server
     mode: 0600
-#  notify:
-#    - restart dhcp server
+  notify:
+    - restart isc-dhcp-server
 
 - name: Configure isc-dhcp-server
   template:
     src: dhcp/dhcpd.conf.j2
     dest: /etc/dhcp/dhcpd.conf
     mode: 0600
-#  notify:
-#    - restart dhcp server
+  notify:
+    - restart isc-dhcp-server