diff --git a/home/git/default.nix b/home/git/default.nix
index 66c3a29..687a795 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -61,6 +61,7 @@
         editPreset = "nvim";
         autoStageResolvedConflicts = false;
       };
+      git.overrideGpg = true;
       git.pagers = [
         {
           colorArg = "always";
diff --git a/hosts/Aloria/default.nix b/hosts/Aloria/default.nix
index 206b460..c70b4e6 100644
--- a/hosts/Aloria/default.nix
+++ b/hosts/Aloria/default.nix
@@ -150,21 +150,6 @@ in {
         }
       ];
     };
-    GCP = {
-      address = ["10.5.0.5/24"];
-      privateKeyFile = "/home/user/.secrets/Wireguard/GCP.key";
-      listenPort = 51820;
-      autostart = false;
-      postUp = "resolvectl dns GCP 1.1.1.1;resolvectl dns wlan0 1.1.1.1;";
-      peers = [
-        {
-          publicKey = "NEBNE4Czf2MkZF2X5aVhmofENH1uXjDpvXjIMJvfMFA=";
-          allowedIPs = ["0.0.0.0/0"];
-          endpoint = "35.201.231.151:443";
-          persistentKeepalive = 25;
-        }
-      ];
-    };
   };
   systemd.services."wg-quick-OPNsense" = {
     serviceConfig = {
@@ -173,6 +158,13 @@ in {
     };
     unitConfig.StartLimitIntervalSec = 0;
   };
+  services.tailscale = {
+    enable = true;
+    extraUpFlags = [
+      "--login-server=https://headscale.thomasave.be"
+    ];
+    authKeyFile = "/home/user/.secrets/Tailscale/Aloria/authkey";
+  };
   services.usbmuxd.enable = true;
   environment.systemPackages = with pkgs; [
     libcamera