diff --git a/hosts/blahaj/chaos.nix b/hosts/blahaj/chaos.nix
index 0228056..a2d9510 100644
--- a/hosts/blahaj/chaos.nix
+++ b/hosts/blahaj/chaos.nix
@@ -5,5 +5,5 @@
 
   home.username = "chaos";
   home.homeDirectory = "/home/chaos";
-  home.stateVersion = "24.05";
+  home.stateVersion = "25.05";
 }
diff --git a/hosts/hetzner-arm/containers/mail/mail.nix b/hosts/hetzner-arm/containers/mail/mail.nix
index c880fd1..9ca808f 100644
--- a/hosts/hetzner-arm/containers/mail/mail.nix
+++ b/hosts/hetzner-arm/containers/mail/mail.nix
@@ -71,8 +71,8 @@ in {
         enable = mkForce false;
       };
 
-      home-manager.users.root.home.stateVersion = "24.05";
-      system.stateVersion = "24.05";
+      home-manager.users.root.home.stateVersion = "25.05";
+      system.stateVersion = "25.05";
     };
   };
 
diff --git a/hosts/hetzner-arm/containers/storage/storage.nix b/hosts/hetzner-arm/containers/storage/storage.nix
index 8a6bd4e..6c7d71c 100644
--- a/hosts/hetzner-arm/containers/storage/storage.nix
+++ b/hosts/hetzner-arm/containers/storage/storage.nix
@@ -76,8 +76,8 @@ in {
         allowedTCPPorts = attrValues ports;
       };
 
-      home-manager.users.root.home.stateVersion = "24.05";
-      system.stateVersion = "24.05";
+      home-manager.users.root.home.stateVersion = "25.05";
+      system.stateVersion = "25.05";
     };
   };
 
diff --git a/hosts/hetzner-arm/hetzner-arm.nix b/hosts/hetzner-arm/hetzner-arm.nix
index beccf51..4593a43 100644
--- a/hosts/hetzner-arm/hetzner-arm.nix
+++ b/hosts/hetzner-arm/hetzner-arm.nix
@@ -67,6 +67,6 @@ in {
 
   networking.hostName = "hetzner-arm";
 
-  home-manager.users.root.home.stateVersion = "24.05";
-  system.stateVersion = "24.05";
+  home-manager.users.root.home.stateVersion = "25.05";
+  system.stateVersion = "25.05";
 }
diff --git a/hosts/lappy-t495/lappy-t495.nix b/hosts/lappy-t495/lappy-t495.nix
index 4457025..ce4963b 100644
--- a/hosts/lappy-t495/lappy-t495.nix
+++ b/hosts/lappy-t495/lappy-t495.nix
@@ -45,7 +45,7 @@ in {
         guiDesktop
       ])
     ]);
-    home.stateVersion = "24.05";
+    home.stateVersion = "25.05";
   };
 
   networking.firewall = {
@@ -56,7 +56,7 @@ in {
   networking.hostName = "lappy-t495";
   time.timeZone = "Europe/London";
 
-  system.stateVersion = "24.05";
-  home-manager.users.root.home.stateVersion = "24.05";
-  home-manager.users.chaos.home.stateVersion = "24.05";
+  system.stateVersion = "25.05";
+  home-manager.users.root.home.stateVersion = "25.05";
+  home-manager.users.chaos.home.stateVersion = "25.05";
 }
diff --git a/hosts/raspberry-pi5/containers/minecraft/minecraft.nix b/hosts/raspberry-pi5/containers/minecraft/minecraft.nix
index b377471..5a11898 100644
--- a/hosts/raspberry-pi5/containers/minecraft/minecraft.nix
+++ b/hosts/raspberry-pi5/containers/minecraft/minecraft.nix
@@ -99,8 +99,8 @@ in {
         };
       };
 
-      home-manager.users.root.home.stateVersion = "24.05";
-      system.stateVersion = "24.05";
+      home-manager.users.root.home.stateVersion = "25.05";
+      system.stateVersion = "25.05";
     };
   };
 
diff --git a/hosts/raspberry-pi5/raspberry-pi5.nix b/hosts/raspberry-pi5/raspberry-pi5.nix
index 9154609..dfede02 100644
--- a/hosts/raspberry-pi5/raspberry-pi5.nix
+++ b/hosts/raspberry-pi5/raspberry-pi5.nix
@@ -78,7 +78,7 @@ in {
   networking.hostName = "raspberry-pi5";
   time.timeZone = "Europe/London";
 
-  system.stateVersion = "24.05";
-  home-manager.users.root.home.stateVersion = "24.05";
-  home-manager.users.chaos.home.stateVersion = "24.05";
+  system.stateVersion = "25.05";
+  home-manager.users.root.home.stateVersion = "25.05";
+  home-manager.users.chaos.home.stateVersion = "25.05";
 }
diff --git a/overlay/raspberrypi-utils.nix b/overlay/raspberrypi-utils.nix
index 7021d76..ecdbee0 100644
--- a/overlay/raspberrypi-utils.nix
+++ b/overlay/raspberrypi-utils.nix
@@ -6,7 +6,7 @@
 }:
 stdenv.mkDerivation {
   pname = "raspberrypi-utils";
-  version = "2024-05-23";
+  version = "2025.05-23";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";