diff --git a/docker/geoserver/Dockerfile b/docker/geoserver/Dockerfile
index 8414208..cfb75d0 100644
--- a/docker/geoserver/Dockerfile
+++ b/docker/geoserver/Dockerfile
@@ -10,7 +10,7 @@ ARG GEOSERVER_CORS_ALLOWED_HEADERS=*
 #
 # Set GeoServer version and data directory
 #
-ENV GEOSERVER_VERSION=2.24.4
+ENV GEOSERVER_VERSION=2.24.5
 ENV GEOSERVER_DATA_DIR="/geoserver_data/data"
 ENV GEOSERVER_CORS_ENABLED=$GEOSERVER_CORS_ENABLED
 ENV GEOSERVER_CORS_ALLOWED_ORIGINS=$GEOSERVER_CORS_ALLOWED_ORIGINS
diff --git a/docker/geoserver/docker-compose.yml b/docker/geoserver/docker-compose.yml
index a4af4d3..6a3847b 100644
--- a/docker/geoserver/docker-compose.yml
+++ b/docker/geoserver/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     restart: on-failure
 
   geoserver:
-    image: geonode/geoserver:2.24.4
+    image: geonode/geoserver:2.24.5
     build:
       context: .
     links:
@@ -39,7 +39,7 @@ services:
     restart: on-failure
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.24.4
+    image: geonode/geoserver_data:2.24.5
     container_name: geoserver_data_dir # named data container
     entrypoint: sleep infinity
     volumes:
diff --git a/docker/geoserver_data/Dockerfile b/docker/geoserver_data/Dockerfile
index c33183d..bd51591 100644
--- a/docker/geoserver_data/Dockerfile
+++ b/docker/geoserver_data/Dockerfile
@@ -9,7 +9,7 @@ RUN mkdir -p /tmp/geonode/downloaded
 ENV TEMP_DOWNLOADED /tmp/geonode/downloaded
 WORKDIR ${TEMP_DOWNLOADED}
 
-ENV GEOSERVER_VERSION=2.24.4
+ENV GEOSERVER_VERSION=2.24.5
 
 ADD download.sh ${TEMP_DOWNLOADED}
 RUN chmod +x ${TEMP_DOWNLOADED}/download.sh
diff --git a/docker/geoserver_data/docker-compose.yml b/docker/geoserver_data/docker-compose.yml
index b60bbd4..03b9a39 100644
--- a/docker/geoserver_data/docker-compose.yml
+++ b/docker/geoserver_data/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   data_dir_conf:
     build: .
-    image: geonode/geoserver_data:2.24.4
+    image: geonode/geoserver_data:2.24.5
     container_name: geoserver_data_dir
     command: /bin/true
     volumes: