diff --git a/roles/network/tasks/dhcpd.yml b/roles/network/tasks/dhcpd.yml
index f5612df22..3896c6381 100644
--- a/roles/network/tasks/dhcpd.yml
+++ b/roles/network/tasks/dhcpd.yml
@@ -17,7 +17,13 @@
         createhome=no
   when: is_debuntu
 
-- name: Configure dhcpd
+- name: Disable stock dhcp_service
+  service: name={{ dhcp_service }}
+           enabled=no
+           state=stopped
+  when: is_debuntu
+
+- name: Install systemd unit file to /etc/systemd/system/dhcpd.service
   template: src={{ item.src }}
             dest={{ item.dest }}
             owner=root
diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml
index 6e53c08cb..e8e272a78 100644
--- a/roles/network/tasks/enable_services.yml
+++ b/roles/network/tasks/enable_services.yml
@@ -1,9 +1,3 @@
-- name: Disable stock dhcp_service
-  service: name={{ dhcp_service }}
-           enabled=no
-           state=stopped
-  when: dhcpd_install and first_run and is_debuntu
-
 - name: Disable dhcpd service
   service: name=dhcpd
            enabled=no