diff --git a/hosts.nix b/hosts.nix
index d9bc4cb..1c3dc6c 100644
--- a/hosts.nix
+++ b/hosts.nix
@@ -2,6 +2,16 @@
   public.ipv4 = {
     "baldur.bertof.net" = "51.195.90.205";
   };
+  tailscale = {
+    ipv4 = {
+      "loki.tsn" = "100.122.147.23";
+      "odin.tsn" = "100.76.178.8";
+    };
+    ipv6 = {
+      "loki.tsn" = "fd7a:115c:a1e0::383a:9317";
+      "odin.tsn" = "fd7a:115c:a1e0::4b4c:b208";
+    };
+  };
   zerotier = {
     ipv4 = {
       "thor.zto" = "172.23.24.223";
diff --git a/modules/nixos/basics/tailscale.nix b/modules/nixos/basics/tailscale.nix
index 1701c9e..ecbd91d 100644
--- a/modules/nixos/basics/tailscale.nix
+++ b/modules/nixos/basics/tailscale.nix
@@ -1,3 +1,8 @@
+{ lib, ... }:
+let
+  hosts = import ../../../hosts.nix;
+  tailscale_hosts = lib.attrsets.mapAttrs' (k: v: lib.attrsets.nameValuePair v [ k ]) hosts.tailscale.ipv4;
+in
 {
   services.tailscale = {
     enable = true;
@@ -5,4 +10,6 @@
   };
 
   networking.firewall.checkReversePath = "loose";
+
+  networking.hosts = tailscale_hosts;
 }