diff --git a/roles/zigbee2mqtt/templates/zigbee2mqtt.service.j2 b/roles/zigbee2mqtt/templates/zigbee2mqtt.service.j2
index 4b2109c..d0bf699 100644
--- a/roles/zigbee2mqtt/templates/zigbee2mqtt.service.j2
+++ b/roles/zigbee2mqtt/templates/zigbee2mqtt.service.j2
@@ -1,5 +1,7 @@
 [Unit]
 Description=Zigbee2MQTT
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=notify
diff --git a/roles/zwavejs2mqtt/templates/zwavejs2mqtt.service.j2 b/roles/zwavejs2mqtt/templates/zwavejs2mqtt.service.j2
index 633e98f..3ccf4f7 100644
--- a/roles/zwavejs2mqtt/templates/zwavejs2mqtt.service.j2
+++ b/roles/zwavejs2mqtt/templates/zwavejs2mqtt.service.j2
@@ -1,5 +1,7 @@
 [Unit]
 Description=Zwavejs2Mqtt
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=notify