diff --git a/flake.lock b/flake.lock
index c92fa82..169d559 100644
--- a/flake.lock
+++ b/flake.lock
@@ -133,16 +133,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1751048012,
-        "narHash": "sha256-MYbotu4UjWpTsq01wglhN5xDRfZYLFtNk7SBY0BcjkU=",
+        "lastModified": 1750969886,
+        "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a684c58d46ebbede49f280b653b9e56100aa3877",
+        "rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 9a3f1eb..b645da8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
     extra-trusted-public-keys = "qois-infrastructure:lh35ymN7Aoxm5Hz0S6JusxE+cYzMU+x9OMKjDVIpfuE=";
   };
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
 
     treefmt-nix = {
       url = "github:numtide/treefmt-nix";
diff --git a/nixos-configurations/calanda/default.nix b/nixos-configurations/calanda/default.nix
index a397319..b0109d1 100644
--- a/nixos-configurations/calanda/default.nix
+++ b/nixos-configurations/calanda/default.nix
@@ -16,5 +16,5 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.11"; # Did you read the comment?
+  system.stateVersion = "25.05"; # Did you read the comment?
 }
diff --git a/nixos-configurations/cyprianspitz/default.nix b/nixos-configurations/cyprianspitz/default.nix
index fd20520..a6094df 100644
--- a/nixos-configurations/cyprianspitz/default.nix
+++ b/nixos-configurations/cyprianspitz/default.nix
@@ -23,5 +23,5 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.11"; # Did you read the comment?
+  system.stateVersion = "25.05"; # Did you read the comment?
 }
diff --git a/nixos-configurations/lindberg-build/default.nix b/nixos-configurations/lindberg-build/default.nix
index dc3a626..cd093a4 100644
--- a/nixos-configurations/lindberg-build/default.nix
+++ b/nixos-configurations/lindberg-build/default.nix
@@ -19,5 +19,5 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.11"; # Did you read the comment?
+  system.stateVersion = "25.05"; # Did you read the comment?
 }
diff --git a/nixos-configurations/lindberg-nextcloud/default.nix b/nixos-configurations/lindberg-nextcloud/default.nix
index 3bfc14a..eab10d4 100644
--- a/nixos-configurations/lindberg-nextcloud/default.nix
+++ b/nixos-configurations/lindberg-nextcloud/default.nix
@@ -46,5 +46,5 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.11"; # Did you read the comment?
+  system.stateVersion = "25.05"; # Did you read the comment?
 }
diff --git a/nixos-configurations/lindberg-webapps/default.nix b/nixos-configurations/lindberg-webapps/default.nix
index 00b64a7..d3ba75b 100644
--- a/nixos-configurations/lindberg-webapps/default.nix
+++ b/nixos-configurations/lindberg-webapps/default.nix
@@ -19,5 +19,5 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.11"; # Did you read the comment?
+  system.stateVersion = "25.05"; # Did you read the comment?
 }
diff --git a/nixos-configurations/lindberg/default.nix b/nixos-configurations/lindberg/default.nix
index 2bf286c..cb2e35c 100644
--- a/nixos-configurations/lindberg/default.nix
+++ b/nixos-configurations/lindberg/default.nix
@@ -24,5 +24,5 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.11"; # Did you read the comment?
+  system.stateVersion = "25.05"; # Did you read the comment?
 }
diff --git a/nixos-modules/cloud/default.nix b/nixos-modules/cloud/default.nix
index ee503bb..e54f2d7 100644
--- a/nixos-modules/cloud/default.nix
+++ b/nixos-modules/cloud/default.nix
@@ -83,16 +83,22 @@ with lib;
       };
 
       phpOptions = {
-        "opcache.interned_strings_buffer" = "23";
+        "opcache.interned_strings_buffer" = "64";
+        "opcache.memory_consumption" = "512";
+        "opcache.save_comments" = "1";
+        "opcache.max_accelerated_files" = "50000";
+        "opcache.fast_shutdown" = "1";
+        "opcache.jit" = "1255";
+        "opcache.jit_buffer_size" = "8M";
       };
 
       poolSettings = {
         "pm" = "dynamic";
-        "pm.max_children" = "256";
-        "pm.max_requests" = "500";
-        "pm.max_spare_servers" = "16";
-        "pm.min_spare_servers" = "2";
-        "pm.start_servers" = "8";
+        "pm.max_children" = "480";
+        "pm.max_requests" = "2000";
+        "pm.max_spare_servers" = "72";
+        "pm.min_spare_servers" = "24";
+        "pm.start_servers" = "48";
       };
 
       configureRedis = true;
@@ -116,12 +122,6 @@ with lib;
       };
     };
 
-    services.phpfpm.pools.nextcloud.settings = {
-      "pm.max_children" = lib.mkForce "256";
-      "pm.max_spare_servers" = lib.mkForce "16";
-      "pm.start_servers" = lib.mkForce "8";
-    };
-
     users.users.nextcloud.extraGroups = [ "postdrop" ];
 
     systemd.services.nextcloud-cron = {
diff --git a/nixos-modules/static-page/test.py b/nixos-modules/static-page/test.py
index a922edd..295635f 100644
--- a/nixos-modules/static-page/test.py
+++ b/nixos-modules/static-page/test.py
@@ -14,9 +14,9 @@ def test(subtest, webserver):
         value = node.succeed(
             f"curl -s --no-location -o /dev/null -w '%{{{variable}}}' '{url}'"
         )
-        assert (
-            value == expected
-        ), f"expected {variable} to be '{expected}' but got '{value}'"
+        assert value == expected, (
+            f"expected {variable} to be '{expected}' but got '{value}'"
+        )
 
     def expect_http_code(node, code, url):
         curl_variable_test(node, "http_code", code, url)