diff --git a/.gitmodules b/.gitmodules
index 8b51769..7852f4c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "geoserver"]
 	path = geoserver
 	url = https://github.com/camptocamp/geoserver.git
-	branch = gscloud/2.24.2/integration
+	branch = gscloud/2.25.x/integration
 	shallow = true
diff --git a/geoserver b/geoserver
index 633cf30..cdd60bd 160000
--- a/geoserver
+++ b/geoserver
@@ -1 +1 @@
-Subproject commit 633cf30fca6bee48ab1e4c79a1a7848b5e40ae4c
+Subproject commit cdd60bd730e5f21bedf9569e854b1455f0ff7274