diff --git a/modules/clan/yggdrasil/default.nix b/modules/clan/yggdrasil/default.nix
new file mode 100644
index 0000000..4a96e50
--- /dev/null
+++ b/modules/clan/yggdrasil/default.nix
@@ -0,0 +1,23 @@
+{ ... }:
+{
+  _class = "clan.service";
+  manifest.name = "yggdrasil";
+  manifest.description = "An in scalable routing as an encrypted IPv6 overlay network";
+  manifest.categories = [ "System" ];
+
+  roles.default = {
+    perInstance.nixosModule =
+      {
+        lib,
+        config,
+        ...
+      }:
+      {
+        clan.core.state.vikunja.folders = [
+        ];
+        services.yggdrasil = {
+          enable = lib.mkDefault true;
+        };
+      };
+  };
+}
diff --git a/modules/clan/yggdrasil/flake-module.nix b/modules/clan/yggdrasil/flake-module.nix
new file mode 100644
index 0000000..ff0349a
--- /dev/null
+++ b/modules/clan/yggdrasil/flake-module.nix
@@ -0,0 +1,18 @@
+{ lib, ... }:
+let
+  module = lib.modules.importApply ./default.nix { };
+in
+{
+  clan.modules = {
+    yggdrasil = module;
+  };
+  perSystem =
+    { ... }:
+    {
+      clan.nixosTests.yggdrasil = {
+        imports = [ ./tests/vm/default.nix ];
+
+        clan.modules."@clan/yggdrasil" = module;
+      };
+    };
+}
diff --git a/modules/clan/yggdrasil/tests/vm/default.nix b/modules/clan/yggdrasil/tests/vm/default.nix
new file mode 100644
index 0000000..e69de29