diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 813fca8..e38c7c1 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-amd64 # 2.25.2-arm64
+            gs-version: 2.25.2
+            label: 2.25.2
     permissions:
       contents: read
       packages: write
@@ -57,5 +58,5 @@ jobs:
             GS_VERSION=${{ matrix.gs-version }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          platforms: linux/arm64/v8
+          platforms: linux/arm64/v8 # linux/amd64 
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/build/Dockerfile b/build/Dockerfile
index a96f1c5..f267d57 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:f4cc53f42b3f25689119a153ff4af60d7b71e5e1668e2e70c4c550d23a7f3344
 # Valid for arm64:
-# FROM tomcat:9-jre11-temurin@sha256:96f05b79814a1fb0523e3063668b4e3be7a1bbb01e6e6b2757915764381825ac
+# FROM tomcat:9-jre11-temurin@sha256:7477976d90cf983f6efe920cad41c1773481ddf61f403f59cfc1db1979c4150b
 #9.0-jre11-slim
 #9.0.65-jdk11-openjdk-slim
 MAINTAINER thinkWhere<info@thinkwhere.com>
diff --git a/build/build.bat b/build/build.bat
index 69f16fb..506c42c 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/
@@ -27,13 +27,12 @@ for %%f in (%community_plugins%) do (
 	@ECHO geoserver-%%f-plugin downloaded.
 )
 
-
 rem Build options include:
 rem    TOMCAT_EXTRAS  [true | false]
 rem    GDAL_NATIVE    [true | false]  - default false; build with GDAL support
 rem    GS_VERSION                     - specifies which version of geoserver is to be built
 
 rem Valid for AMD64 (i.e., t3a.medium)
-rem 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=false --platform linux/amd64 -t thinkwhere/geoserver:${GS_VERSION} .
 rem 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 .
+rem 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 .
diff --git a/build/build.sh b/build/build.sh
index 41db27d..ca4e64b 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=false --platform linux/amd64 -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
diff --git a/build/download.sh b/build/download.sh
index bb11611..fc85ba5 100644
--- a/build/download.sh
+++ b/build/download.sh
@@ -31,7 +31,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 ]