diff --git a/docker-compose.geoserver.yml b/docker-compose.geoserver.yml
new file mode 100644
index 000000000..e43fe2564
--- /dev/null
+++ b/docker-compose.geoserver.yml
@@ -0,0 +1,93 @@
+version: "3.2"
+
+services:
+
+  geoserver:
+    image: clowder/geoserver:${VERSION:-latest}
+    networks:
+      - clowder
+#    user: "55242:17027"
+    environment:
+      - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F}
+      - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder}
+      - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS}
+      - PROXY_ON=${PROXY_ON}
+      - PROXY_HOST=${TRAEFIK_HOST}
+      - PROXY_URL=${PROXY_URL}
+      - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin}
+      - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver}
+      - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE}
+      - GEOSERVER_USER=${GEOSERVER_USER:-admin}
+      - GEOSERVER_URL=${GEOSERVER_URL}
+    ports:
+      - 8080:8080
+    volumes:
+      - /generated/data/mounting:/data_dir
+    restart: unless-stopped
+
+
+
+  ncsa_geo_shp:
+    image: clowder/extractors-geoshp-preview:latest
+    networks:
+      - clowder
+    environment:
+      - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F}
+      - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder}
+      - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS}
+      - PROXY_ON=${PROXY_ON}
+      - PROXY_HOST=${TRAEFIK_HOST}
+      - PROXY_URL=${PROXY_URL}
+      - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin}
+      - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver}
+      - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE}
+      - GEOSERVER_USER=${GEOSERVER_USER:-admin}
+      - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080}
+    depends_on:
+      - geoserver
+      - rabbitmq
+      - clowder
+    restart: unless-stopped
+
+  extractor-geotiff-preview:
+    image: clowder/extractors-geotiff-preview:latest
+    networks:
+      - clowder
+    environment:
+      - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F}
+      - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder}
+      - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS}
+      - PROXY_ON=${PROXY_ON}
+      - PROXY_HOST=${TRAEFIK_HOST}
+      - PROXY_URL=${PROXY_URL}
+      - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin}
+      - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver}
+      - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE}
+      - GEOSERVER_USER=${GEOSERVER_USER:-admin}
+      - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080}
+    depends_on:
+      - geoserver
+    restart: unless-stopped
+
+  extractor-geotiff-metadata:
+    image: clowder/extractors-geotiff-metadata:latest
+    networks:
+      - clowder
+    environment:
+      - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F}
+      - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder}
+      - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS}
+      - PROXY_ON=${PROXY_ON}
+      - PROXY_HOST=${TRAEFIK_HOST}
+      - PROXY_URL=${PROXY_URL}
+      - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin}
+      - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver}
+      - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE}
+      - GEOSERVER_USER=${GEOSERVER_USER:-admin}
+      - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080}
+    depends_on:
+      - geoserver
+    restart: unless-stopped
+
+networks:
+  clowder:
\ No newline at end of file
diff --git a/env.example b/env.example
index ecdce0e5a..a5b1e66ce 100644
--- a/env.example
+++ b/env.example
@@ -101,3 +101,18 @@
 
 # in case of external rabbitmq, the url to clowder
 #RABBITMQ_CLOWDERURL=https://clowder-docker.ncsa.illinois.edu/clowder/
+
+# ----------------------------------------------------------------------
+# GEOSERVER CONFIGURATION
+# ----------------------------------------------------------------------
+
+#PROXY_ON=false
+#PROXY_URL=http://localhost:9000
+
+#GEOSERVER_USERNAME=admin
+#GEOSERVER_PASSWORD=geoserver
+
+#GEOSERVER_WORKSPACE=workspace
+
+#GEOSERVER_USER=admin
+#GEOSERVER_URL=http://localhost:8080