diff --git a/system/hosts/argon.nix b/system/hosts/argon.nix
index 4ff691b..0e63b8b 100644
--- a/system/hosts/argon.nix
+++ b/system/hosts/argon.nix
@@ -11,6 +11,7 @@ in
     ../shared/show-update-changelog.nix
     ../nixos/raspberry.nix
     ../nixos/ssh.nix
+    ../nixos/eternal-terminal.nix
 
     ../nixos/git.nix
 
@@ -200,7 +201,7 @@ in
       description = "Daniel";
       extraGroups = [ "wheel" ];
       shell = pkgs.fish;
-      openssh.authorizedKeys.keys = [ ssh-keys.LAN ];
+      openssh.authorizedKeys.keys = [ ssh-keys.LAN ssh-keys.DanielsPhone ];
     };
 
     nix-remote-builder = {
diff --git a/system/hosts/tanker.nix b/system/hosts/tanker.nix
index d69ce30..5ea8341 100644
--- a/system/hosts/tanker.nix
+++ b/system/hosts/tanker.nix
@@ -11,6 +11,7 @@ in
     ../../agenix/hosts/tanker/config.nix
     ../shared/show-update-changelog.nix
     ../nixos/ssh.nix
+    ../nixos/eternal-terminal.nix
     ../nixos/msmtp.nix
     ../nixos/smartd.nix
 
@@ -194,7 +195,7 @@ in
       description = "Daniel";
       extraGroups = [ "wheel" ];
       shell = pkgs.fish;
-      openssh.authorizedKeys.keys = [ ssh-keys.Hetzner ];
+      openssh.authorizedKeys.keys = [ ssh-keys.Hetzner ssh-keys.DanielsPhone ];
     };
   };
 }
diff --git a/system/nixos/nitter.nix b/system/nixos/nitter.nix
index d1e0bd7..0570ca7 100644
--- a/system/nixos/nitter.nix
+++ b/system/nixos/nitter.nix
@@ -10,7 +10,8 @@ in
     description = "Nitter (An alternative Twitter front-end)";
     wantedBy = [ "multi-user.target" ];
     requires = [ "redis-nitter.service" ];
-    after = [ "network.target" "network-online.target" "redis-nitter.service" ];
+    wants = [ "network-online.target" ];
+    after = [ "network-online.target" "redis-nitter.service" ];
     serviceConfig = {
       DynamicUser = true;
       StateDirectory = "nitter";
diff --git a/system/nixos/weewx-proxy.nix b/system/nixos/weewx-proxy.nix
index f9ac5a6..6aaa6c9 100644
--- a/system/nixos/weewx-proxy.nix
+++ b/system/nixos/weewx-proxy.nix
@@ -4,6 +4,7 @@
   systemd.services.weewx-proxy = {
     description = "A proxy service for WeeWX sources";
     wantedBy = [ "multi-user.target" ];
+    wants = [ "network-online.target" ];
     after = [ "network-online.target" ];
     serviceConfig = {
       DynamicUser = true;