diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 813fca8..816384b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - "master"
+      - "OPT-671-apply-patches-to-geoserver"
 jobs:
   build-and-push-image:
     runs-on: ubuntu-latest
@@ -10,9 +11,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - tag: 2.26.0-jms # 2.22.1
-            gs-version: 2.26.0
-            label: 2.26.0-jms
+          - tag: 2.25.2-arm64
+            gs-version: 2.25.2
+            label: 2.25.2
     permissions:
       contents: read
       packages: write
diff --git a/build/Dockerfile b/build/Dockerfile
index a96f1c5..5d52d3f 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,8 +1,8 @@
 #--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
 # Defaults to amd64:
-FROM tomcat:9-jre11-temurin@sha256:bf23f2dffde0c1b6ef6eaba95e05f531a3a6f274c5234d10126d73b092db18b6
+# FROM tomcat:9-jre11-temurin@sha256:bf23f2dffde0c1b6ef6eaba95e05f531a3a6f274c5234d10126d73b092db18b6
 # Valid for arm64:
-# FROM tomcat:9-jre11-temurin@sha256:96f05b79814a1fb0523e3063668b4e3be7a1bbb01e6e6b2757915764381825ac
+FROM tomcat:9-jre11-temurin@sha256:87d94e757ccd243c9f277ae6fd362bd1c718446599fb36acd8f93c1af3efaf61
 #9.0-jre11-slim
 #9.0.65-jdk11-openjdk-slim
 MAINTAINER thinkWhere<info@thinkwhere.com>
@@ -28,9 +28,9 @@ ENV DEBIAN_FRONTEND=noninteractive \
 	GDAL_SKIP="ECW JP2ECW" \
 	GDAL_DATA=/usr/local/gdal-data \
 	# AMD64 architecture:
-	LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu"
+	# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu"
 	# ARM64 architecture:
-	# LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/aarch64-linux-gnu"
+	LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/apr/lib:/usr/lib:/usr/lib/aarch64-linux-gnu"
 
 
 RUN mkdir -p ${GEOSERVER_DATA_DIR}
diff --git a/build/build.bat b/build/build.bat
index 69f16fb..c88ba50 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -1,6 +1,6 @@
 @Echo off
 
-SET GS_VERSION=2.18.3
+SET GS_VERSION=2.25.2
 SET BUILD_GS_VERSION=%GS_VERSION:~0,4%
 
 rem Create plugins folder if does not exist
@@ -17,7 +17,7 @@ for %%f in (%plugins%) do (
 	@ECHO geoserver-%%f-plugin downloaded.
 )
 
-SET community_plugins=cog
+SET community_plugins=cog-s3
 
 rem Community plugins are not available from sourgeforge
 rem therefore source from https://build.geoserver.org/
diff --git a/build/build.sh b/build/build.sh
index 41db27d..951cefd 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -11,7 +11,7 @@ then
     mkdir ./resources/plugins
 fi
 
-GS_VERSION=2.26.0
+GS_VERSION=2.25.2
 BUILD_GS_VERSION=${GS_VERSION:0:-2}
 
 # Add in selected plugins.  Comment out or modify as required
@@ -27,7 +27,7 @@ done
 
 # Community plugins are not available from sourgeforge
 # therefore source from https://build.geoserver.org/
-community_plugins=(cog-s3 jms-cluster) # activeMQ-broker )
+community_plugins=(cog-s3)
 for c in "${community_plugins[@]}"
 do
 	if [ ! -f resources/plugins/geoserver-${c}-plugin.zip ]
@@ -42,6 +42,6 @@ done
 #    GS_VERSION              - specifies which version of geoserver is to be built
 
 # Valid for AMD64 (i.e., t3a.medium)
-docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=true -t thinkwhere/geoserver:${GS_VERSION} .
+# docker build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=true -t thinkwhere/geoserver:${GS_VERSION} .
 # Valid also for ARM64 (i.e., t4g.medium)
-# docker buildx build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:${GS_VERSION} --push .
\ No newline at end of file
+docker buildx build --build-arg GS_VERSION=${GS_VERSION} --build-arg TOMCAT_EXTRAS=false --build-arg GDAL_NATIVE=false --platform linux/arm64/v8 -t thinkwhere/geoserver:${GS_VERSION} --push .
\ No newline at end of file