diff --git a/Dockerfile b/Dockerfile
index 0b92208..7e4ba0f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 FROM tomcat:jdk11-openjdk-slim
 
-ARG GS_VERSION=2.18.1
+ARG GEOSERVER_VERSION=2.18.1
 
-ARG WAR_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/geoserver-${GS_VERSION}-war.zip
-ARG STABLE_PLUGIN_URL=https://sourceforge.net/projects/geoserver/files/GeoServer/${GS_VERSION}/extensions
+ARG WAR_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GEOSERVER_VERSION}/geoserver-${GEOSERVER_VERSION}-war.zip
+ARG STABLE_PLUGIN_URL=https://sourceforge.net/projects/geoserver/files/GeoServer/${GEOSERVER_VERSION}/extensions
 
 ARG CORS_ENABLED=false
 ARG CORS_ALLOWED_ORIGINS=*
@@ -11,7 +11,7 @@ ARG CORS_ALLOWED_METHODS=GET,POST,PUT,DELETE,HEAD,OPTIONS
 ARG CORS_ALLOWED_HEADERS=*
 
 # environment variables
-ENV GS_VERSION=${GS_VERSION} \
+ENV GEOSERVER_VERSION=${GEOSERVER_VERSION} \
     GEOSERVER_DIR=${CATALINA_HOME}/webapps/geoserver \
     STABLE_PLUGIN_URL=${STABLE_PLUGIN_URL} \
     INITIAL_MEMORY=2G \
diff --git a/docker-compose-demo.yml b/docker-compose-demo.yml
index 4411215..de2385a 100644
--- a/docker-compose-demo.yml
+++ b/docker-compose-demo.yml
@@ -4,6 +4,7 @@ services:
     build:
       context: .
       args:
+        - GEOSERVER_VERSION=2.18.1
         - CORS_ENABLED=true
         - CORS_ALLOWED_METHODS=GET,POST,PUT,HEAD,OPTIONS
     ports:
diff --git a/scripts/install-extensions.sh b/scripts/install-extensions.sh
index ca68a3c..0338af6 100644
--- a/scripts/install-extensions.sh
+++ b/scripts/install-extensions.sh
@@ -4,7 +4,7 @@
 function download_extension() {
   URL=$1
   EXTENSION=$2
-  DOWNLOAD_FILE="${ADDITIONAL_LIBS_DIR}geoserver-${GS_VERSION}-${EXTENSION}-plugin.zip"
+  DOWNLOAD_FILE="${ADDITIONAL_LIBS_DIR}geoserver-${GEOSERVER_VERSION}-${EXTENSION}-plugin.zip"
 
   if [ -e "$DOWNLOAD_FILE" ]; then
       echo "$DOWNLOAD_FILE already exists. Skipping download."
@@ -22,7 +22,7 @@ function download_extension() {
 if [ "$DOWNLOAD_EXTENSIONS" = "true" ]; then
   echo "Starting download of extensions"
   for EXTENSION in $(echo "${STABLE_EXTENSIONS}" | tr ',' ' '); do
-    URL="${STABLE_PLUGIN_URL}/geoserver-${GS_VERSION}-${EXTENSION}-plugin.zip"
+    URL="${STABLE_PLUGIN_URL}/geoserver-${GEOSERVER_VERSION}-${EXTENSION}-plugin.zip"
     download_extension ${URL} ${EXTENSION}
   done
   echo "Finished download of extensions"