diff --git a/configuration.nix b/configuration.nix
index 8d156c0..a74aef9 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -12,7 +12,11 @@
 
   services = {
     gnome.gnome-keyring.enable = lib.mkForce false;
-    tailscale.enable = true;
+
+    tailscale = {
+      enable = true;
+      useRoutingFeatures = "client";
+    };
 
     xserver = {
       enable = true;
@@ -143,7 +147,7 @@
         privateKeyFile = config.sops.secrets."wireguard/home/privateKey".path;
         address = [ "10.225.191.4/24" ];
         dns = [ "192.168.30.131" ];
-        autostart = true;
+        autostart = false;
         mtu = 1412;
         peers = [{
           presharedKeyFile = config.sops.secrets."wireguard/home/presharedKey".path;
diff --git a/home.nix b/home.nix
index 6693cf3..dfc0350 100644
--- a/home.nix
+++ b/home.nix
@@ -213,17 +213,10 @@
       enable = true;
       extraConfig = "User root";
 
-      matchBlocks = {
-        lewis = lib.hm.dag.entryBefore [ "*" ] { hostname = "lewis.dmz"; };
-        atlas = lib.hm.dag.entryBefore [ "*" ] { hostname = "atlas.dmz"; };
-        jefke = lib.hm.dag.entryBefore [ "*" ] { hostname = "jefke.dmz"; };
-        warwick = lib.hm.dag.entryBefore [ "*" ] { hostname = "warwick.dmz"; };
-
-        github = lib.hm.dag.entryBefore [ "*" ] {
-          hostname = "github.com";
-          user = "pizzapim";
-          identitiesOnly = true;
-        };
+      matchBlocks.github = lib.hm.dag.entryBefore [ "*" ] {
+        hostname = "github.com";
+        user = "pizzapim";
+        identitiesOnly = true;
       };
     };