diff --git a/README.md b/README.md
index 436856b..243da2d 100644
--- a/README.md
+++ b/README.md
@@ -139,7 +139,9 @@ To enable a PostgreSQL JNDI resource, provide the following environment variable
 * ``POSTGRES_DB``
 * ``POSTGRES_USERNAME``
 * ``POSTGRES_PASSWORD``
-* ``POSTGRES_JNDI_RESOURCE_NAME`` (optional; defaults to ``java:comp/env/jdbc/postgres``)
+* ``POSTGRES_JNDI_RESOURCE_NAME`` (optional; defaults to ``jdbc/postgres``)
+
+In geoserver, you can then reference this JNDI resource using the name `java:comp/env/jdbc/postgres` (if using default).
 
 For advanced customization of the connection pool, you can provide your own customized "context.xml"
 file to Apache Tomcat by mounting it to the container at ``/opt/config_overrides/context.xml``.
diff --git a/docker-compose-demo.yml b/docker-compose-demo.yml
index bdb1bda..c3556ba 100644
--- a/docker-compose-demo.yml
+++ b/docker-compose-demo.yml
@@ -13,6 +13,22 @@ services:
       - INSTALL_EXTENSIONS=true
       - STABLE_EXTENSIONS=wps,csw
       - EXTRA_JAVA_OPTS=-Xms1G -Xmx2G
+      - POSTGRES_JNDI_ENABLED=true
+      - POSTGRES_HOST=postgis
+      - POSTGRES_PORT=5432
+      - POSTGRES_DB=geoserver
+      - POSTGRES_USERNAME=geoserver
+      - POSTGRES_PASSWORD=geoserver
+      - POSTGRES_JNDI_RESOURCE_NAME=jdbc/postgres
     volumes:
       - ./geoserver_data:/opt/geoserver_data/:Z
       - ./additional_libs:/opt/additional_libs:Z # by mounting this we can install libs from host on startup
+  postgis:
+    image: postgis/postgis:16-3.4-alpine
+    ports:
+      - 5555:5432
+    environment:
+      POSTGRES_USER: geoserver
+      POSTGRES_PASSWORD: geoserver
+    volumes:
+      - ./postgis/postgresql_data:/var/lib/postgresql/data:Z
\ No newline at end of file
diff --git a/startup.sh b/startup.sh
index 8578ecd..9195d26 100755
--- a/startup.sh
+++ b/startup.sh
@@ -94,7 +94,7 @@ if [ "${POSTGRES_JNDI_ENABLED}" = "true" ]; then
 
   # Set up some default values
   if [ -z "${POSTGRES_JNDI_RESOURCE_NAME}" ]; then
-    export POSTGRES_JNDI_RESOURCE_NAME="java:comp/env/jdbc/postgres"
+    export POSTGRES_JNDI_RESOURCE_NAME="jdbc/postgres"
   fi
   if [ -z "${POSTGRES_PORT}" ]; then
     export POSTGRES_PORT="5432"