diff --git a/flake.nix b/flake.nix
index 42f1c69..50cd597 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,12 +56,13 @@
 
       odinBaseModules = [
         { nixpkgs = nixpkgsSettings; }
-        ./nixos_modules/automatic-garbage-collection.nix
         ./odin/hardware-configuration.nix
         nixos-hardware.nixosModules.common-cpu-intel
         nixos-hardware.nixosModules.common-pc-laptop
         nixos-hardware.nixosModules.common-pc-laptop-ssd
         ./odin/common_configuration.nix
+        ./nixos_modules/automatic-garbage-collection.nix
+        ./nixos_modules/tailscale.nix
       ];
 
       thorBaseModules = [
@@ -71,15 +72,18 @@
         nixos-hardware.nixosModules.common-cpu-amd
         nixos-hardware.nixosModules.common-pc-ssd
         ./thor/configuration.nix
+        ./nixos_modules/automatic-garbage-collection.nix
+        ./nixos_modules/tailscale.nix
       ];
 
       lokiBaseModules = [
         { nixpkgs = nixpkgsSettings; }
-        ./nixos_modules/automatic-garbage-collection.nix
         ./loki/hardware-configuration.nix
         nixos-hardware.nixosModules.common-cpu-intel
         nixos-hardware.nixosModules.common-pc-ssd
         ./loki/configuration.nix
+        ./nixos_modules/automatic-garbage-collection.nix
+        ./nixos_modules/tailscale.nix
       ];
 
       odinStable = extraModules: nixpkgs.lib.nixosSystem {
diff --git a/nixos_modules/tailscale.nix b/nixos_modules/tailscale.nix
new file mode 100644
index 0000000..1701c9e
--- /dev/null
+++ b/nixos_modules/tailscale.nix
@@ -0,0 +1,8 @@
+{
+  services.tailscale = {
+    enable = true;
+    permitCertUid = "filippoberto95@gmail.com";
+  };
+
+  networking.firewall.checkReversePath = "loose";
+}