diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml
index 97d0b9b7..0e5eca20 100644
--- a/.github/workflows/build-latest.yaml
+++ b/.github/workflows/build-latest.yaml
@@ -68,8 +68,8 @@ jobs:
           - image: 9.0.91-jdk11-temurin-focal
             javaHome: /opt/java/openjdk
         geoserverMinorVersion:
-          - minor: 23
-            patch: 6
+          - minor: 25
+            patch: 2
         stablePluginBaseURL:
           - https://sourceforge.net/projects/geoserver/files/GeoServer
     steps:
diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml
index 5918e0a3..c3ff53e0 100644
--- a/.github/workflows/deploy-image.yaml
+++ b/.github/workflows/deploy-image.yaml
@@ -28,8 +28,8 @@ jobs:
           - image: 9.0.91-jdk11-temurin-focal
             javaHome: /opt/java/openjdk
         geoserverMinorVersion:
-          - minor: 23
-            patch: 6
+          - minor: 25
+            patch: 2
         stablePluginBaseURL:
           # empty because it often changes, so it's better
           # to use the default one described in the Dockerfile
@@ -63,6 +63,7 @@ jobs:
           file: Dockerfile
           push: true
           tags: |
+            ${{ secrets.DOCKERHUB_REPO }}/geoserver
             ${{ secrets.DOCKERHUB_REPO }}/geoserver:${{ matrix.geoserverMajorVersion }}.${{ matrix.geoserverMinorVersion.minor }}.${{ matrix.geoserverMinorVersion.patch }}
             ${{ secrets.DOCKERHUB_REPO }}/geoserver:${{ matrix.geoserverMajorVersion }}.${{ matrix.geoserverMinorVersion.minor }}.${{ matrix.geoserverMinorVersion.patch }}--v${{ steps.current_date.outputs.formatted }}
           build-args: |