diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index c1dbf59..51cdb96 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -29,8 +29,7 @@ jobs:
       run: |
         ./mvnw deploy \
         --batch-mode -DskipTests -ntp -fae -Dmaven.resolver.transport=wagon \
-        -DdeployAtEnd=true \
-        -DretryFailedDeploymentCount=3 \
+        -DretryFailedDeploymentCount=10 \
         -DaltDeploymentRepository=github::https://maven.pkg.github.com/camptocamp/geoserver-cloud-geoserver 
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/geoserver b/geoserver
index 263ca65..52285ae 160000
--- a/geoserver
+++ b/geoserver
@@ -1 +1 @@
-Subproject commit 263ca654bfd825f274d63be3d2965baa6c394eb3
+Subproject commit 52285ae01ea7e1a92b43ac0bdae577007ce3e897
diff --git a/pom.xml b/pom.xml
index fe80e43..37f9b1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.geoserver.cloud</groupId>
   <artifactId>gs-upstream</artifactId>
-  <version>2.25.3.0-CLOUD</version>
+  <version>2.25.3.0</version>
   <packaging>pom</packaging>
   <name>GeoServer upstream dependencies</name>
   <distributionManagement>