diff --git a/README.md b/README.md
index 6292ca6..a2a97f8 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,6 @@ Pass as environment variables. If not passed, the default values will be used.
 
 ## TODOs
 
-* CORS
 * configuration of JNDI connections in the tomcat/custom tomcat configuration in general
 * default data for gs datadir?
 * log4j properties
diff --git a/docker-compose-demo.yml b/docker-compose-demo.yml
index 6a3a9a0..4411215 100644
--- a/docker-compose-demo.yml
+++ b/docker-compose-demo.yml
@@ -13,6 +13,8 @@ services:
       - STABLE_EXTENSIONS=wps,csw
       - INITIAL_MEMORY=1G
       - MAXIMUM_MEMORY=2G
+      - JAIEXT_ENABLED=true
+      - GEOSERVER_DATA_DIR=/opt/geoserver_data/
     volumes:
       - ./demo_data/geoserver_data:/opt/geoserver_data/:Z
       - ./demo_data/additional_libs:/opt/additional_libs:Z # by mounting this we can install libs from host on startup