diff --git a/flake.lock b/flake.lock
index 83522e2..7b4a52f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "actor-typeahead-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1762835797,
+        "narHash": "sha256-heizoWUKDdar6ymfZTnj3ytcEv/L4d4fzSmtr0HlXsQ=",
+        "ref": "refs/heads/main",
+        "rev": "677fe7f743050a4e7f09d4a6f87bbf1325a06f6b",
+        "revCount": 6,
+        "type": "git",
+        "url": "https://tangled.org/@jakelazaroff.com/actor-typeahead"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://tangled.org/@jakelazaroff.com/actor-typeahead"
+      }
+    },
     "agenix": {
       "inputs": {
         "darwin": "darwin",
@@ -10,11 +26,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1750173260,
-        "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=",
+        "lastModified": 1762618334,
+        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
+        "rev": "fcdea223397448d35d9b31f798479227e80183f6",
         "type": "github"
       },
       "original": {
@@ -83,11 +99,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1749105467,
-        "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=",
+        "lastModified": 1762286984,
+        "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "6bc76b872374845ba9d645a2f012b764fecd765f",
+        "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f",
         "type": "github"
       },
       "original": {
@@ -120,7 +136,7 @@
     },
     "devenv_2": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_4",
         "nix": "nix_2",
         "nixpkgs": "nixpkgs_7",
         "pre-commit-hooks": "pre-commit-hooks"
@@ -172,6 +188,20 @@
       }
     },
     "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1751685974,
+        "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
+        "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/flake-compat/archive/549f2762aebeff29a2e5ece7a7dc0f955281a1d1.tar.gz?rev=549f2762aebeff29a2e5ece7a7dc0f955281a1d1"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz"
+      }
+    },
+    "flake-compat_4": {
       "flake": false,
       "locked": {
         "lastModified": 1673956053,
@@ -192,11 +222,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1751413152,
-        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
+        "lastModified": 1765495779,
+        "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
+        "rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
         "type": "github"
       },
       "original": {
@@ -285,6 +315,24 @@
       "inputs": {
         "systems": "systems_4"
       },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_5"
+      },
       "locked": {
         "lastModified": 1685518550,
         "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
@@ -389,16 +437,18 @@
     "gitignore_2": {
       "inputs": {
         "nixpkgs": [
-          "tangled",
+          "ubin",
+          "devenv",
+          "pre-commit-hooks",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "lastModified": 1660459072,
+        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
         "owner": "hercules-ci",
         "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
         "type": "github"
       },
       "original": {
@@ -407,26 +457,25 @@
         "type": "github"
       }
     },
-    "gitignore_3": {
+    "gomod2nix": {
       "inputs": {
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
-          "ubin",
-          "devenv",
-          "pre-commit-hooks",
+          "tangled",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1660459072,
-        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "lastModified": 1754078208,
+        "narHash": "sha256-YVoIFDCDpYuU3riaDEJ3xiGdPOtsx4sR5eTzHTytPV8=",
+        "owner": "nix-community",
+        "repo": "gomod2nix",
+        "rev": "7f963246a71626c7fc70b431a315c4388a0c95cf",
         "type": "github"
       },
       "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
+        "owner": "nix-community",
+        "repo": "gomod2nix",
         "type": "github"
       }
     },
@@ -463,6 +512,18 @@
         "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js"
       }
     },
+    "htmx-ws-src": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-2fg6KyEJoO24q0fQqbz9RMaYNPQrMwpZh29tkSqdqGY=",
+        "type": "file",
+        "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2"
+      },
+      "original": {
+        "type": "file",
+        "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2"
+      }
+    },
     "ibm-plex-mono-src": {
       "flake": false,
       "locked": {
@@ -479,11 +540,11 @@
     "indigo": {
       "flake": false,
       "locked": {
-        "lastModified": 1745333930,
-        "narHash": "sha256-83fIHqDE+dfnZ88HaNuwfKFO+R0RKAM1WxMfNh/Matk=",
+        "lastModified": 1753693716,
+        "narHash": "sha256-DMIKnCJRODQXEHUxA+7mLzRALmnZhkkbHlFT2rCQYrE=",
         "owner": "oppiliappan",
         "repo": "indigo",
-        "rev": "e4e59280737b8676611fc077a228d47b3e8e9491",
+        "rev": "5f170569da9360f57add450a278d73538092d8ca",
         "type": "github"
       },
       "original": {
@@ -524,15 +585,15 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1746827285,
-        "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=",
-        "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a",
+        "lastModified": 1753306924,
+        "narHash": "sha256-jLCEW0FvjFhC+c4RHzH+xbkSOxrnpFHnhjOw6sudhx0=",
+        "rev": "1a4393d0aac31aba21f5737ede1b171e11336d77",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1a4393d0aac31aba21f5737ede1b171e11336d77.tar.gz?rev=1a4393d0aac31aba21f5737ede1b171e11336d77"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz"
       }
     },
     "lix-module": {
@@ -545,15 +606,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1746838955,
-        "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
-        "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
+        "lastModified": 1756125859,
+        "narHash": "sha256-6a+PWILmqHCs9B5eIBLg6HSZ8jYweZpgOWO8FlyVwYI=",
+        "rev": "d3292125035b04df00d01549a26e948631fabe1e",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/d3292125035b04df00d01549a26e948631fabe1e.tar.gz?rev=d3292125035b04df00d01549a26e948631fabe1e"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/release-2.93.tar.gz"
       }
     },
     "lowdown-src": {
@@ -575,14 +636,14 @@
     "lucide-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1742302029,
-        "narHash": "sha256-OyPVtpnC4/AAmPq84Wt1r1Gcs48d9KG+UBCtZK87e9k=",
+        "lastModified": 1754044466,
+        "narHash": "sha256-+exBR2OToB1iv7ZQI2S4B0lXA/QRvC9n6U99UxGpJGs=",
         "type": "tarball",
-        "url": "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip"
+        "url": "https://github.com/lucide-icons/lucide/releases/download/0.536.0/lucide-icons-0.536.0.zip"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip"
+        "url": "https://github.com/lucide-icons/lucide/releases/download/0.536.0/lucide-icons-0.536.0.zip"
       }
     },
     "nix": {
@@ -665,11 +726,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1751159883,
-        "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
+        "lastModified": 1761765539,
+        "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
+        "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
         "type": "github"
       },
       "original": {
@@ -743,6 +804,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1765472234,
+        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1733212471,
@@ -793,27 +870,27 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1752308619,
-        "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=",
+        "lastModified": 1765311797,
+        "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058",
+        "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1746904237,
-        "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
+        "lastModified": 1751984180,
+        "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
+        "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
         "type": "github"
       },
       "original": {
@@ -859,8 +936,8 @@
           "devenv",
           "flake-compat"
         ],
-        "flake-utils": "flake-utils_2",
-        "gitignore": "gitignore_3",
+        "flake-utils": "flake-utils_3",
+        "gitignore": "gitignore_2",
         "nixpkgs": [
           "ubin",
           "devenv",
@@ -890,11 +967,25 @@
         "fuk": "fuk",
         "lix-module": "lix-module",
         "nixpkgs": "nixpkgs_5",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "tangled": "tangled",
         "terraform-providers-bin": "terraform-providers-bin",
         "ubin": "ubin"
       }
     },
+    "sqlite-lib-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1706631843,
+        "narHash": "sha256-bJoMjirsBjm2Qk9KPiy3yV3+8b/POlYe76/FQbciHro=",
+        "type": "tarball",
+        "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -955,28 +1046,47 @@
         "type": "github"
       }
     },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tangled": {
       "inputs": {
-        "gitignore": "gitignore_2",
+        "actor-typeahead-src": "actor-typeahead-src",
+        "flake-compat": "flake-compat_3",
+        "gomod2nix": "gomod2nix",
         "htmx-src": "htmx-src",
+        "htmx-ws-src": "htmx-ws-src",
         "ibm-plex-mono-src": "ibm-plex-mono-src",
         "indigo": "indigo",
         "inter-fonts-src": "inter-fonts-src",
         "lucide-src": "lucide-src",
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_6",
+        "sqlite-lib-src": "sqlite-lib-src"
       },
       "locked": {
-        "lastModified": 1748599327,
-        "narHash": "sha256-v2LyuRUOfxGlKU8glzyMLSM4D/aCQEO9lD6Y9SbDXME=",
-        "rev": "17a86e6a5c1a722d2e951debf9fddb6911145110",
-        "revCount": 720,
+        "lastModified": 1765553661,
+        "narHash": "sha256-sj9NLGdgfXanu3wnqFg6BfWyFG1UsQ46O5UwQ2120is=",
+        "ref": "refs/heads/master",
+        "rev": "92ded47ecdfd0606aa15f78dde0014af18bcc06a",
+        "revCount": 1732,
         "type": "git",
-        "url": "https://tangled.sh/@tangled.sh/core"
+        "url": "https://tangled.org/@tangled.sh/core"
       },
       "original": {
-        "rev": "17a86e6a5c1a722d2e951debf9fddb6911145110",
         "type": "git",
-        "url": "https://tangled.sh/@tangled.sh/core"
+        "url": "https://tangled.org/@tangled.sh/core"
       }
     },
     "terraform-providers-bin": {
@@ -986,11 +1096,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752455211,
-        "narHash": "sha256-YhUi6RcDtt4mwrRjnBWbPDxkDU9G2g1a5OxLO9EYtJQ=",
+        "lastModified": 1765587558,
+        "narHash": "sha256-sRH81pHqGp2C86Q0GZ8xeyR/RSbKiEHiAEc4HeJ9J04=",
         "owner": "nix-community",
         "repo": "nixpkgs-terraform-providers-bin",
-        "rev": "02c38b7b419c52953e3548a43cde034e53b17cf8",
+        "rev": "c2eebd9ec71ce79fbcd17455e26f15c1d45faf56",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 3bf6c35..57fbe9d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,13 +1,16 @@
 {
   description = "Flake utils demo";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+  # inputs.nixpkgs.url = "github:NixOS/nixpkgs/72e9257ef53ff0ec905aa41f91158872f5d1c392";
+  inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+
   # Tools
   inputs.flake-parts.url = "github:hercules-ci/flake-parts";
 
   # Lix
   inputs.lix-module = {
-    url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
+    url = "https://git.lix.systems/lix-project/nixos-module/archive/release-2.93.tar.gz";
     inputs.nixpkgs.follows = "nixpkgs";
   };
 
@@ -27,7 +30,7 @@
   };
 
   inputs.tangled = {
-    url = "git+https://tangled.sh/@tangled.sh/core?rev=17a86e6a5c1a722d2e951debf9fddb6911145110";
+    url = "git+https://tangled.org/@tangled.sh/core";
   };
 
   # Terraform
@@ -142,7 +145,7 @@
 
                 profiles.system = {
                   user = "root";
-                  path = deploy.lib.${nixosConfig.pkgs.system}.activate.nixos nixosConfig;
+                  path = deploy.lib.${nixosConfig.pkgs.stdenv.hostPlatform.system}.activate.nixos nixosConfig;
                 };
               }
               // (tryAttr nodeConfig name {}))
@@ -173,10 +176,11 @@
         apps.tf = let
           providers = inputs'.terraform-providers-bin.legacyPackages.providers;
           terraform = pkgs.opentofu.withPlugins (plugins: [
-            providers.ovh.ovh
             providers.Backblaze.b2
-            providers.tailscale.tailscale
+            providers.hashicorp.dns
             providers.hetznercloud.hcloud
+            providers.ovh.ovh
+            providers.tailscale.tailscale
           ]);
         in {
           type = "app";
diff --git a/modules/common/default.nix b/modules/common/default.nix
index c7f8575..aba0eba 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -29,11 +29,6 @@
 
   system.stateVersion = "24.05";
 
-  system.switch = {
-    enable = false;
-    enableNg = true;
-  };
-
   services.openssh = {
     enable = true;
     ports = [22 2222];
diff --git a/modules/git.nix b/modules/git.nix
index b051651..27269bf 100644
--- a/modules/git.nix
+++ b/modules/git.nix
@@ -17,7 +17,7 @@ in {
     };
   };
 
-  services.tangled-knot = {
+  services.tangled.knot = {
     enable = true;
 
     openFirewall = false;
@@ -26,7 +26,7 @@ in {
 
     server = {
       hostname = "knot.hauleth.dev";
-      secretFile = config.age.secrets."knot.conf".path;
+      owner = "did:plc:6psaz6n5fuurrfet67zs4ljf";
     };
   };
 
diff --git a/modules/irc-bouncer.nix b/modules/irc-bouncer.nix
index 924cc4f..a73b32d 100644
--- a/modules/irc-bouncer.nix
+++ b/modules/irc-bouncer.nix
@@ -21,7 +21,7 @@ in {
   };
 
   systemd.services.soju = {
-    requires = ["acme-finished-${hostName}.target"];
+    requires = ["acme-${hostName}.service"];
 
     serviceConfig.LoadCredential = let
       certDir = config.security.acme.certs.${hostName}.directory;
diff --git a/modules/mail-old.nix b/modules/mail-old.nix
index edea4b2..abd0639 100644
--- a/modules/mail-old.nix
+++ b/modules/mail-old.nix
@@ -35,7 +35,7 @@ in {
   systemd.services.stalwart-mail = {
     enable = config.services.stalwart-mail.enable;
 
-    requires = ["acme-finished-${mail-domain}.target"];
+    requires = ["acme-order-renew-${mail-domain}.service"];
 
     serviceConfig.LoadCredential = let
       certDir = config.security.acme.certs.${mail-domain}.directory;
diff --git a/modules/mail/default.nix b/modules/mail/default.nix
index ed59d17..fb49dc1 100644
--- a/modules/mail/default.nix
+++ b/modules/mail/default.nix
@@ -8,6 +8,7 @@
   mail-domain = "mail.${domain}";
   data-dir = "/var/lib/stalwart-mail";
   secrets = "/run/credentials/stalwart.service";
+  unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
 in {
   imports = [
     ./module.nix
@@ -24,8 +25,9 @@ in {
     "stalwart"
   ];
 
+  # TODO: Use `stalwart-cli` to refresh renewed certificates
   systemd.services.stalwart = {
-    requires = ["acme-finished-${mail-domain}.target"];
+    requires = ["acme-${mail-domain}.service"];
 
     serviceConfig.LoadCredential = let
       certDir = config.security.acme.certs.${mail-domain}.directory;
@@ -41,7 +43,7 @@ in {
   services.stalwart = {
     enable = true;
 
-    # package = inputs.nixpkgs-old.legacyPackages.x86_64-linux.stalwart-mail;
+    package = unstable.stalwart-mail;
 
     hostname = mail-domain;
 
@@ -61,11 +63,18 @@ in {
       #   type = "sqlite";
       #   path = "${config.services.stalwart.dataDir}/data.sqlite";
       # };
-      #
+
       # storage.data = "sqlite";
       # storage.fts = "sqlite";
       # storage.lookup = "sqlite";
 
+      spam-filter = {
+        bayes.account.enable = true;
+        list.scores = {
+          RCPT_IN_SUBJECT = "1.0";
+        };
+      };
+
       server.max-connections = 8 * 1024;
       server.socket = {
         nodelay = true;
@@ -95,6 +104,8 @@ in {
         ];
       };
 
+      # webadmin.auto-update = true;
+
       session.data.script = "'data'";
 
       sieve.trusted.scripts = {
diff --git a/modules/mail/module.nix b/modules/mail/module.nix
index f65feb3..4f76fcf 100644
--- a/modules/mail/module.nix
+++ b/modules/mail/module.nix
@@ -92,7 +92,10 @@ in {
         enable = lib.mkDefault true;
       };
 
-      webadmin.path = "/var/cache/stalwart/webadmin";
+      webadmin = {
+        path = "/var/cache/stalwart";
+        resource = lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip";
+      };
 
       lookup.default.hostname = cfg.hostname;
 
@@ -168,7 +171,7 @@ in {
       after = ["local-fs.target" "network.target"];
 
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/stalwart-mail --config=${configFile}";
+        ExecStart = "${cfg.package}/bin/stalwart --config=${configFile}";
 
         # Base from template resources/systemd/stalwart-mail.service
         Type = "simple";
diff --git a/secrets.nix b/secrets.nix
index 9864028..733c267 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -8,6 +8,5 @@ in
     "secrets/httpasswd.age".publicKeys = [hauleth heimdall];
     "secrets/netdata-alarm.age".publicKeys = [hauleth heimdall];
     "secrets/dkim-hauleth.dev-priv.key.age".publicKeys = [hauleth heimdall];
-    "secrets/knot.conf.age".publicKeys = [hauleth heimdall];
     "secrets/vector.conf.age".publicKeys = [hauleth heimdall];
   }
diff --git a/secrets/knot.conf.age b/secrets/knot.conf.age
deleted file mode 100644
index 6078afc..0000000
--- a/secrets/knot.conf.age
+++ /dev/null
@@ -1,15 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 1hEP8Q YeLrvxANUcvg4wD0wWG7DIcqFafYSAwIwwi5tximyQ0
-2l0erbr5fGDB6TlPSjv8AtzKMgLxIIy6llKETe5ci6E
--> ssh-ed25519 FHIFrA 1OY9S+LdVdBThzZrJueFcrIl+UmgQCyICzcZZtjUmEg
-TAeodHujac8V4mxCyZO3UbVvu1z3yALMLu2HDS+4qeQ
--> ssh-rsa oDeyQg
-TrCZusOomhJHo+V+CWDjY2S/vn7xyGJUhI7ge8A5/FO7CTaoc+XpfgiEd8o47YPT
-3ISz1hMjWcbLhUz81FaUPntzuUPk0psqLTiFgs+8bnOpkKXUmVF3L8YfkksmjMcF
-Ojg27TU5ccc5DFxDB4nms0BvBkyjYYeS9+TJ2em0OrX1Z22eYaZbc5byPucAicGU
-oh1SZ3z00LxLfuArUpJn5uHWjUXdi0ToaYdG6K0ZyFp/Taohovnqn04lPAMBCNRf
-+5JkgAltrxC9wFtrjnz99RIcS5iR1LvPtSZUzTeHWyXOuExZiAkxTpFt5CU3GOZ5
-vebUBdS9tu4sTI4bDIxwnQ
---- SLhiTy4vGuURW0qIdBlMvYNc1eUPbuMdP2eE6obrNGg
-�}�c�c
�ܵ�!k��=�g�*@�f�=(J�=w���=s�_������`D�X�`�jPF
����{I��	l���"	?W��]^�Y	Q�z�k�U�c�jm���
-x�=��
\ No newline at end of file