diff --git a/.gitmodules b/.gitmodules
index 3eb49ffe..e95bc711 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "secrets"]
 	path = secrets
 	url = ssh://git@gitea.c3d2.de:2222/c3d2-admins/secrets.git
+[submodule "overlays/yggdrasil-package-nix"]
+	path = overlays/yggdrasil-package-nix
+	url = https://github.com/ehmry/yggdrasil-package-nix.git
diff --git a/hosts/hydra/configuration.nix b/hosts/hydra/configuration.nix
index 73633444..e90fb91b 100644
--- a/hosts/hydra/configuration.nix
+++ b/hosts/hydra/configuration.nix
@@ -7,6 +7,7 @@
     ./hydra.nix
     ./cache.nix
     ./../../lib/common/c3d2.nix
+    ./../../lib/yggdrasil.nix
   ];
 
   security.pam.enableSSHAgentAuth = true;
diff --git a/hosts/pulsebert/configuration.nix b/hosts/pulsebert/configuration.nix
index e1f7cec2..8e9c394e 100644
--- a/hosts/pulsebert/configuration.nix
+++ b/hosts/pulsebert/configuration.nix
@@ -15,6 +15,7 @@ in {
       ../../lib/common/common.nix
       ../../lib/users.nix
       ../../lib/mpd.nix
+      ../../lib/yggdrasil.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
diff --git a/lib/yggdrasil.nix b/lib/yggdrasil.nix
new file mode 100644
index 00000000..f32e7b21
--- /dev/null
+++ b/lib/yggdrasil.nix
@@ -0,0 +1,22 @@
+{ config, ... }: {
+
+  imports = [ ./../overlays/yggdrasil-package-nix/nixos-module.nix ];
+
+  networking.firewall.extraCommands = ''
+   ip6tables -A INPUT -s fe80::/10 -j ACCEPT
+  '';
+
+  services.yggdrasil = {
+    enable = true;
+    Peers = [
+      "tcp://5.9.112.248:39444"
+      "tcp://159.69.35.16:31337"
+      "tcp://195.201.93.98:17177"
+    ];
+    NodeInfo = {
+      name = config.networking.hostName + ".c3d2";
+      deployment = "nixos";
+      location = "Pieschen (Q8945)";
+    };
+  };
+}
diff --git a/overlays/yggdrasil-package-nix b/overlays/yggdrasil-package-nix
new file mode 160000
index 00000000..a0ee4516
--- /dev/null
+++ b/overlays/yggdrasil-package-nix
@@ -0,0 +1 @@
+Subproject commit a0ee45162f90401acc52f929a7544838ec13a309