diff --git a/modules/services/misc/gpsd.nix b/modules/services/misc/gpsd.nix
index 83cc6bae1d5..ea9347aba7d 100644
--- a/modules/services/misc/gpsd.nix
+++ b/modules/services/misc/gpsd.nix
@@ -88,8 +88,8 @@ in
     jobs.gpsd =
       { description = "GPSD daemon";
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+        startOn = "ip-up";
+        stopOn = "ip-down";
 
         exec =
           ''
diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index 82693c7399e..689abc593aa 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -118,8 +118,8 @@ in
     jobs.avahi_daemon =
       { name = "avahi-daemon";
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+        startOn = "ip-up";
+        stopOn = "ip-down";
 
         script =
           ''
diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index f61227e0984..d9b7475f61e 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -67,8 +67,8 @@ in
     jobs.bitlbee =
       { description = "BitlBee IRC to other chat networks gateway";
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+        startOn = "ip-up";
+        stopOn = "ip-down";
 
         preStart =
           ''
diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 5a51836efad..2004c2c825a 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -66,8 +66,8 @@ in
     jobs.portmap =
       { description = "ONC RPC portmap";
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+        startOn = "ip-up";
+        stopOn = "ip-down";
 
         exec =
           ''