diff --git a/flake.nix b/flake.nix
index e5e7128..df777a5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -411,6 +411,7 @@
             name = "orbi";
             #host = "orbi.bear";
             host = "95.216.66.212";
+            #host = "10.100.0.1";
             modules = [
               homeManagerModules
               stylixModules
diff --git a/machines/cherry/facts/tinc.private.ed25519_key.pub b/machines/cherry/facts/tinc.private.ed25519_key.pub
index 0dc9e18..123944e 100644
--- a/machines/cherry/facts/tinc.private.ed25519_key.pub
+++ b/machines/cherry/facts/tinc.private.ed25519_key.pub
@@ -1 +1 @@
-Ed25519PublicKey = l6YmUlli5YM7hY1T+IJf8e59BeX6SW0mqT0JyVpyFtP
\ No newline at end of file
+l6YmUlli5YM7hY1T+IJf8e59BeX6SW0mqT0JyVpyFtP
\ No newline at end of file
diff --git a/machines/cherry/facts/tinc.secret.ed25519_key.pub b/machines/cherry/facts/tinc.secret.ed25519_key.pub
index 18b3ead..43b434b 100644
--- a/machines/cherry/facts/tinc.secret.ed25519_key.pub
+++ b/machines/cherry/facts/tinc.secret.ed25519_key.pub
@@ -1 +1 @@
-Ed25519PublicKey = VEIrTM0ZovSd5f3N+QMWkJZhXBpjy9IBGoNEmEXIu5J
\ No newline at end of file
+VEIrTM0ZovSd5f3N+QMWkJZhXBpjy9IBGoNEmEXIu5J
\ No newline at end of file
diff --git a/machines/chungus/facts/tinc.private.ed25519_key.pub b/machines/chungus/facts/tinc.private.ed25519_key.pub
index fb54f19..078ae2a 100644
--- a/machines/chungus/facts/tinc.private.ed25519_key.pub
+++ b/machines/chungus/facts/tinc.private.ed25519_key.pub
@@ -1 +1 @@
-Ed25519PublicKey = d5911IzQWbEVIwDFhtUsQZ4mjXHcej536stHbJmqesF
\ No newline at end of file
+d5911IzQWbEVIwDFhtUsQZ4mjXHcej536stHbJmqesF
\ No newline at end of file
diff --git a/machines/chungus/facts/tinc.retiolum.ed25519_key.pub b/machines/chungus/facts/tinc.retiolum.ed25519_key.pub
index 6ab4cfb..53bb03f 100644
--- a/machines/chungus/facts/tinc.retiolum.ed25519_key.pub
+++ b/machines/chungus/facts/tinc.retiolum.ed25519_key.pub
@@ -1 +1 @@
-Ed25519PublicKey = vyYRAnWEo70ZtxSj+Ef92yT7CxihDgjsffrW34oKZ8H
\ No newline at end of file
+vyYRAnWEo70ZtxSj+Ef92yT7CxihDgjsffrW34oKZ8H
\ No newline at end of file
diff --git a/machines/cream/facts/tinc.private.ed25519_key.pub b/machines/cream/facts/tinc.private.ed25519_key.pub
index 691ef8b..cf304b7 100644
--- a/machines/cream/facts/tinc.private.ed25519_key.pub
+++ b/machines/cream/facts/tinc.private.ed25519_key.pub
@@ -1 +1 @@
-Ed25519PublicKey = +c/UHJuWi8QiodfiUOFjuurWcQMLfH503gYEeneIbrN
\ No newline at end of file
++c/UHJuWi8QiodfiUOFjuurWcQMLfH503gYEeneIbrN
\ No newline at end of file
diff --git a/machines/cream/facts/tinc.retiolum.ed25519_key.pub b/machines/cream/facts/tinc.retiolum.ed25519_key.pub
index 34cf317..fc2183f 100644
--- a/machines/cream/facts/tinc.retiolum.ed25519_key.pub
+++ b/machines/cream/facts/tinc.retiolum.ed25519_key.pub
@@ -1 +1 @@
-Ed25519PublicKey = Y6xv3l6hjLp3x4fqPR4jF1syP51TQ4M95X/tL1m8K2B
\ No newline at end of file
+Y6xv3l6hjLp3x4fqPR4jF1syP51TQ4M95X/tL1m8K2B
\ No newline at end of file
diff --git a/machines/cream/facts/tinc.secret.ed25519_key.pub b/machines/cream/facts/tinc.secret.ed25519_key.pub
index 1f148ce..527c426 100644
--- a/machines/cream/facts/tinc.secret.ed25519_key.pub
+++ b/machines/cream/facts/tinc.secret.ed25519_key.pub
@@ -1 +1 @@
-Ed25519PublicKey = UYlQQNY4CTw8UM1EGC534oZkPgiSPG7lI+mqXWgq6AH
\ No newline at end of file
+UYlQQNY4CTw8UM1EGC534oZkPgiSPG7lI+mqXWgq6AH
\ No newline at end of file
diff --git a/machines/orbi/facts/tinc.private.ed25519_key.pub b/machines/orbi/facts/tinc.private.ed25519_key.pub
index eb90381..c4c47d9 100644
--- a/machines/orbi/facts/tinc.private.ed25519_key.pub
+++ b/machines/orbi/facts/tinc.private.ed25519_key.pub
@@ -1 +1 @@
-Ed25519PublicKey = 8T8Wy75d86wlNQ+gNfd6VQDUPHbb/T5FyLiZTIYyrhJ
\ No newline at end of file
+8T8Wy75d86wlNQ+gNfd6VQDUPHbb/T5FyLiZTIYyrhJ
\ No newline at end of file
diff --git a/machines/orbi/facts/tinc.secret.ed25519_key.pub b/machines/orbi/facts/tinc.secret.ed25519_key.pub
index bea9ba2..ebc5e73 100644
--- a/machines/orbi/facts/tinc.secret.ed25519_key.pub
+++ b/machines/orbi/facts/tinc.secret.ed25519_key.pub
@@ -1 +1 @@
-Ed25519PublicKey = Rux0npWBaeu49NoJ9d70+EpB6jfuB9NnTx26DreESSP
\ No newline at end of file
+Rux0npWBaeu49NoJ9d70+EpB6jfuB9NnTx26DreESSP
\ No newline at end of file
diff --git a/machines/sternchen/facts/tinc.secret.ed25519_key.pub b/machines/sternchen/facts/tinc.secret.ed25519_key.pub
index 34913e4..455c40c 100644
--- a/machines/sternchen/facts/tinc.secret.ed25519_key.pub
+++ b/machines/sternchen/facts/tinc.secret.ed25519_key.pub
@@ -1 +1 @@
-Ed25519PublicKey = tuZNNw0EDFQLZKxVUbz41T4xnyZ4pjPJb8MmeGMXaoJ
\ No newline at end of file
+tuZNNw0EDFQLZKxVUbz41T4xnyZ4pjPJb8MmeGMXaoJ
\ No newline at end of file
diff --git a/nixos/components/network/tinc/private.nix b/nixos/components/network/tinc/private.nix
index 891f381..9e5e9b0 100644
--- a/nixos/components/network/tinc/private.nix
+++ b/nixos/components/network/tinc/private.nix
@@ -55,6 +55,8 @@ let
     "paperless.chungus" = hosts.chungus;
   };
   network = "private";
+  Ed25519PublicKey = machine: (builtins.readFile "${config.clanCore.clanDir}/machines/${machine}/facts/tinc.private.ed25519_key.pub");
+  Ed25519PublicKeyFile = machine: "${config.clanCore.clanDir}/machines/${machine}/facts/tinc.private.ed25519_key.pub";
 in
 {
   networking.firewall.trustedInterfaces = [ "tinc.${network}" ];
@@ -73,39 +75,26 @@ in
           subnets = [{ address = hosts.mobi; }];
           settings.Ed25519PublicKey = "X5sp3YYevVNUrzYvi+HZ2iW5WbO0bIb58jR4jZFH6MB";
         };
-        cream = {
-          subnets = [{ address = hosts.cream; }];
-          settings.Ed25519PublicKey = "Y/YRA90mAlNEmdhUWlUTHjjsco6d6hlvW11sPtarIdL";
-        };
-        cherry = {
-          subnets = [{ address = hosts.cherry; }];
-          settings.Ed25519PublicKey = "BsPIrZjbzn0aryC0HO3OXSb4oFCMmzNDmMDQmxUXUuC";
-        };
-        sterni = {
-          subnets = [{ address = hosts.sterni; }];
-          settings.Ed25519PublicKey = "r6mRDc814z2YtyG9ev/XXV2SgquqWR8n53V13xNXb7O";
-        };
         bobi = {
           subnets = [{ address = hosts.bobi; }];
           settings.Ed25519PublicKey = "jwvNd4oAgz2cWEI74VTVYU1qgPWq823/a0iEDqJ8KMD";
         };
-        pepe = {
-          subnets = [{ address = hosts.pepe; }];
-          settings.Ed25519PublicKey = "LnE+w6ZfNCky4Kad3TBxpFKRJ2PJshkSpW6mC3pcsPI";
+        cream = {
+          subnets = [{ address = hosts.cream; }];
+          settings.Ed25519PublicKey = Ed25519PublicKey "cream";
+        };
+        cherry = {
+          subnets = [{ address = hosts.cherry; }];
+          settings.Ed25519PublicKey = Ed25519PublicKey "cherry";
         };
         chungus = {
           subnets = [{ address = hosts.chungus; }];
-          settings.Ed25519PublicKey = "mJP+zzYGv42KItpSf3lMkr3dwa5xW3n3hi0W2Z75jfJ";
-        };
-        robi = {
-          addresses = [{ address = "144.76.13.147"; }];
-          subnets = [{ address = hosts.robi; }];
-          settings.Ed25519PublicKey = "bZUbSdME4fwudNVbUoNO7PpoOS2xALsyTs81F260KbL";
+          settings.Ed25519PublicKey = Ed25519PublicKey "chungus";
         };
         orbi = {
           addresses = [{ address = "95.216.66.212"; }];
           subnets = [{ address = hosts.orbi; }];
-          settings.Ed25519PublicKey = "/1OE8xsnRT6egxd/+iH9TE+tzlwiUJeNsGFIIWyc70A";
+          settings.Ed25519PublicKey = Ed25519PublicKey "orbi";
         };
       };
     };