diff --git a/nixarr/jellyfin/default.nix b/nixarr/jellyfin/default.nix
index 7787b5c..31d6479 100644
--- a/nixarr/jellyfin/default.nix
+++ b/nixarr/jellyfin/default.nix
@@ -115,6 +115,10 @@ in {
         )
       ];
 
+      systemd.services."container@jellyfin" = mkIf cfg.vpn.enable {
+        requires = ["wg.service"];
+      };
+
       containers.jellyfin = mkIf cfg.vpn.enable {
         autoStart = true;
         ephemeral = true;
diff --git a/nixarr/lidarr/default.nix b/nixarr/lidarr/default.nix
index f87be3d..87b0694 100644
--- a/nixarr/lidarr/default.nix
+++ b/nixarr/lidarr/default.nix
@@ -40,6 +40,10 @@ in {
       )
     ];
 
+    systemd.services."container@lidarr" = mkIf cfg.vpn.enable {
+      requires = ["wg.service"];
+    };
+
     containers.lidarr = mkIf cfg.vpn.enable {
       autoStart = true;
       ephemeral = true;
diff --git a/nixarr/prowlarr/default.nix b/nixarr/prowlarr/default.nix
index fc6bd1d..6a431d2 100644
--- a/nixarr/prowlarr/default.nix
+++ b/nixarr/prowlarr/default.nix
@@ -45,6 +45,10 @@ in {
       )
     ];
 
+    systemd.services."container@prowlarr" = mkIf cfg.vpn.enable {
+      requires = ["wg.service"];
+    };
+
     containers.prowlarr = mkIf cfg.vpn.enable {
       autoStart = true;
       ephemeral = true;
diff --git a/nixarr/radarr/default.nix b/nixarr/radarr/default.nix
index a9f6d7e..70a18ba 100644
--- a/nixarr/radarr/default.nix
+++ b/nixarr/radarr/default.nix
@@ -43,6 +43,10 @@ in {
       )
     ];
 
+    systemd.services."container@radarr" = mkIf cfg.vpn.enable {
+      requires = ["wg.service"];
+    };
+
     containers.radarr = mkIf cfg.vpn.enable {
       autoStart = true;
       ephemeral = true;
diff --git a/nixarr/readarr/default.nix b/nixarr/readarr/default.nix
index dfaa265..ef5f8f3 100644
--- a/nixarr/readarr/default.nix
+++ b/nixarr/readarr/default.nix
@@ -40,6 +40,10 @@ in {
       )
     ];
 
+    systemd.services."container@readarr" = mkIf cfg.vpn.enable {
+      requires = ["wg.service"];
+    };
+
     containers.readarr = mkIf cfg.vpn.enable {
       autoStart = true;
       ephemeral = true;
diff --git a/nixarr/sonarr/default.nix b/nixarr/sonarr/default.nix
index 1e2a727..952bc60 100644
--- a/nixarr/sonarr/default.nix
+++ b/nixarr/sonarr/default.nix
@@ -44,6 +44,10 @@ in {
       })
     ];
 
+    systemd.services."container@sonarr" = mkIf cfg.vpn.enable {
+      requires = ["wg.service"];
+    };
+
     containers.sonarr = mkIf cfg.vpn.enable {
       autoStart = true;
       ephemeral = true;
diff --git a/nixarr/transmission/default.nix b/nixarr/transmission/default.nix
index b82be55..2b20432 100644
--- a/nixarr/transmission/default.nix
+++ b/nixarr/transmission/default.nix
@@ -119,6 +119,10 @@ in {
       openTcpPorts = [cfg.peerPort];
     };
 
+    systemd.services."container@transmission" = mkIf cfg.vpn.enable {
+      requires = ["wg.service"];
+    };
+
     containers.transmission = mkIf cfg.vpn.enable {
       autoStart = true;
       ephemeral = true;
diff --git a/util/vpnNamespace/default.nix b/util/vpnNamespace/default.nix
index 4bb14ac..82ae795 100644
--- a/util/vpnNamespace/default.nix
+++ b/util/vpnNamespace/default.nix
@@ -208,7 +208,7 @@ in {
           bindsTo = ["netns@wg.service"];
           requires = ["network-online.target"];
           after = ["netns@wg.service"];
-          wantedBy = ["netns@wg.service"];
+          wantedBy = ["multi-user.target"];
 
           serviceConfig = let
             lines = split "\n" (readFile cfg.wireguardConfigFile);