diff --git a/hosts.nix b/hosts.nix
index d7fa913..6a76ce4 100644
--- a/hosts.nix
+++ b/hosts.nix
@@ -3,6 +3,10 @@
     type = "server";
     arch = "x86_64-linux";
   };
+  baldur = {
+    type = "server";
+    arch = "aarch64-linux";
+  };
   bragi = {
     type = "server";
     arch = "aarch64-linux";
diff --git a/modules/servers/per-server/baldur/default.nix b/modules/servers/per-server/baldur/default.nix
index 2d49c50..ba6f547 100644
--- a/modules/servers/per-server/baldur/default.nix
+++ b/modules/servers/per-server/baldur/default.nix
@@ -9,6 +9,7 @@ in {
   imports =
     [
       ../../common
+      ./secrets.nix
     ]
     ++ hostModules;
 }
diff --git a/modules/servers/per-server/freyja/secrets.nix b/modules/servers/per-server/baldur/secrets.nix
similarity index 100%
rename from modules/servers/per-server/freyja/secrets.nix
rename to modules/servers/per-server/baldur/secrets.nix
diff --git a/modules/servers/per-server/baldur/services/crafty-controller.nix b/modules/servers/per-server/baldur/services/crafty-controller.nix
deleted file mode 100644
index 4914e0c..0000000
--- a/modules/servers/per-server/baldur/services/crafty-controller.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{...}: {
-  virtualisation.oci-containers.containers.crafty-controller = {
-    image = "registry.gitlab.com/crafty-controller/crafty-4:latest";
-    autoStart = true;
-    ports = [
-      "8443:8443"
-      "8123:8123"
-      "19132:19132"
-      "25500-25600:25500-25600"
-    ];
-    labels = {
-      "io.containers.autoupdate" = "registry";
-    };
-    volumes = [
-      "/var/lib/crafty-controller/backups:/crafty/backups"
-      "/var/lib/crafty-controller/logs:/crafty/logs"
-      "/var/lib/crafty-controller/servers:/crafty/servers"
-      "/var/lib/crafty-controller/config:/crafty/app/config"
-      "/var/lib/crafty-controller/import:/crafty/import"
-    ];
-  };
-
-  networking.firewall = {
-    allowedTCPPorts = [25500];
-    allowedUDPPorts = [25500];
-  };
-
-  services.traefik.dynamicConfigOptions.http = {
-    services.crafty.loadBalancer.servers = [
-      {
-        url = "https://localhost:8443";
-      }
-    ];
-
-    routers.crafty = {
-      rule = "Host(`crafty.cronyakatsuki.xyz`)";
-      tls = {
-        certResolver = "porkbun";
-      };
-      service = "crafty";
-      entrypoints = "websecure";
-    };
-  };
-
-  services.restic.backups = {
-    local.paths = ["/var/lib/crafty-controller"];
-    server.paths = ["/var/lib/crafty-controller"];
-  };
-}
diff --git a/modules/servers/per-server/freyja/services/forgejo-runner.nix b/modules/servers/per-server/baldur/services/forgejo-runner.nix
similarity index 100%
rename from modules/servers/per-server/freyja/services/forgejo-runner.nix
rename to modules/servers/per-server/baldur/services/forgejo-runner.nix
diff --git a/modules/servers/per-server/freyja/default.nix b/modules/servers/per-server/freyja/default.nix
index ba6f547..2d49c50 100644
--- a/modules/servers/per-server/freyja/default.nix
+++ b/modules/servers/per-server/freyja/default.nix
@@ -9,7 +9,6 @@ in {
   imports =
     [
       ../../common
-      ./secrets.nix
     ]
     ++ hostModules;
 }