diff --git a/hosts/h/default.nix b/hosts/h/default.nix
index bc3667e..47918a0 100644
--- a/hosts/h/default.nix
+++ b/hosts/h/default.nix
@@ -269,8 +269,7 @@ in
       };
       nomadnet = {
         description = "nomadnet";
-        after = [ "network-online.target" ];
-        wantedBy = [ "multi-user.target" ];
+        wants = [ "multi-user.target" "multi-user.target" ];
         serviceConfig = {
           User = "qbit";
           Type = "forking";
@@ -280,8 +279,7 @@ in
       };
       matrix-synapse.after = [ "icbirc.service" ];
       icb-tunnel = {
-        wantedBy = [ "network.target" ];
-        after = [ "network.target" "multi-user.target" ];
+        wants = [ "network.target" "multi-user.target" ];
         serviceConfig = {
           User = "qbit";
           WorkingDirectory = "/home/qbit";
diff --git a/modules/golink.nix b/modules/golink.nix
index 79dc9b7..00667ad 100644
--- a/modules/golink.nix
+++ b/modules/golink.nix
@@ -66,8 +66,7 @@ in
     systemd.services.golink = {
       enable = true;
       description = "golink server";
-      wantedBy = [ "network-online.target" ];
-      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
 
       path = [ pkgs.vnstat ];
 
diff --git a/modules/sliding-sync.nix b/modules/sliding-sync.nix
index 94829f6..9e78c7b 100644
--- a/modules/sliding-sync.nix
+++ b/modules/sliding-sync.nix
@@ -81,8 +81,7 @@ in
     systemd.services.sliding-sync = {
       enable = true;
       description = "sliding-sync server";
-      wantedBy = [ "network-online.target" ];
-      after = [ "network-online.target" "matrix-synapse.service" ];
+      wants = [ "network-online.target" "matrix-synapse.service" ];
 
       environment = {
         HOME = "${cfg.dataDir}";
diff --git a/modules/ts-rev-prox.nix b/modules/ts-rev-prox.nix
index 8ad4590..387bbd8 100644
--- a/modules/ts-rev-prox.nix
+++ b/modules/ts-rev-prox.nix
@@ -87,8 +87,7 @@ in
     systemd.services.tsrevprox = {
       enable = true;
       description = "tsrevprox server";
-      wantedBy = [ "network-online.target" ];
-      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
 
       environment = { HOME = "${cfg.dataDir}"; };
 
diff --git a/modules/tsvnstat.nix b/modules/tsvnstat.nix
index 703df50..7f41631 100644
--- a/modules/tsvnstat.nix
+++ b/modules/tsvnstat.nix
@@ -67,8 +67,7 @@ in
     systemd.services.tsvnstat = {
       enable = true;
       description = "tsvnstat server";
-      wantedBy = [ "network-online.target" ];
-      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
 
       path = [ pkgs.vnstat ];
 
diff --git a/modules/veilid-server.nix b/modules/veilid-server.nix
index 1c37625..fe26597 100644
--- a/modules/veilid-server.nix
+++ b/modules/veilid-server.nix
@@ -59,8 +59,7 @@ in
     systemd.services.veilid-server = {
       enable = true;
       description = "veilid-server";
-      wantedBy = [ "network-online.target" ];
-      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
 
       environment = {
         HOME = cfg.dataDir;