diff --git a/flake.lock b/flake.lock
index 5e1073e..054a4b4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -51,16 +51,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1725189734,
-        "narHash": "sha256-tkg9tgohtzIvuvb+DeryiWIKanxyYBWGQEvvsMHzT9U=",
+        "lastModified": 1725625109,
+        "narHash": "sha256-pMOPVZHRz7fJhuj1lfRqyJTWjAbM96vyrc0btDa56Qc=",
         "owner": "onny",
         "repo": "nixpkgs",
-        "rev": "10f6fb34be099e8c8a1251a5cc65dbbff36bd9b1",
+        "rev": "28cd3a0d7e4412e337632c1d6666d8de01cf7183",
         "type": "github"
       },
       "original": {
         "owner": "onny",
-        "ref": "hmr-enabler",
+        "ref": "composer-update",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index fd1330e..6af9fc6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,7 @@
 
   outputs = { self, nixpkgs, nixos-shell, ... }@inputs: let
     pkgs = nixpkgs.legacyPackages.x86_64-linux;
+
     start =
       pkgs.writeShellScriptBin "start" ''
         set -e
@@ -29,7 +30,8 @@
 
     devShells.x86_64-linux = {
       default = with pkgs; mkShell {
-        nativeBuildInputs = with php84Packages; [
+        # FIXME "composer lint" only works with PHP 8.2 at the moment
+        nativeBuildInputs = with php82Packages; [
           composer
           php-cs-fixer
           phpunit
diff --git a/server b/server
index 7d1ca95..332b3ef 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit 7d1ca956a7a09cb3777114d3c8849415382066fd
+Subproject commit 332b3efdf0df6bd489d83f58e8ffa677749d0774
diff --git a/vm-nextcloud.nix b/vm-nextcloud.nix
index c966e78..2d81c9b 100644
--- a/vm-nextcloud.nix
+++ b/vm-nextcloud.nix
@@ -122,7 +122,7 @@
 
   # Setup mail server
   services.stalwart-mail = {
-    enable = true;
+    enable = false;
     # FIXME remove package definition in 24.11
     package = pkgs.stalwart-mail;
     settings = {