diff --git a/Dockerfile b/Dockerfile
index cf9a6f1..3600de2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM tomcat:9-jre11-temurin-focal AS base
+FROM tomcat:9-jre17-temurin-focal AS base
 
-ARG GEOSERVER_VERSION="2.25.3"
+ARG GEOSERVER_VERSION="2.28.0"
 ENV GEOSERVER_VERSION=$GEOSERVER_VERSION
 ENV GEOSERVER_URL="https://sourceforge.net/projects/geoserver/files/GeoServer/${GEOSERVER_VERSION}/geoserver-${GEOSERVER_VERSION}-war.zip"
 ENV GEOSERVER_LIB_DIR="/usr/local/tomcat/webapps/geoserver/WEB-INF/lib"
diff --git a/docker-compose.yml b/docker-compose.yml
index d419cb5..04b1ea3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ services:
   app:
     build:
       args:
-        - GEOSERVER_VERSION=${GEOSERVER_VERSION}
+        - GEOSERVER_VERSION=${GEOSERVER_VERSION:-2.28.0}
       context: .
     image: ucblib/geoserver:${DOCKER_TAG:-development}
     ports: