diff --git a/demo/complex/.env b/demo/complex/.env
index d58a3c3..eccc9c9 100644
--- a/demo/complex/.env
+++ b/demo/complex/.env
@@ -1,6 +1,5 @@
 AUTHENTICATION=internal
 ENV=demo
-USERTOKEN=
 REPO_DATABASE_TYPE=mariadb
 REPO_JDBC_URL=default
 REPO_HOST=midpoint_data
@@ -9,9 +8,6 @@ REPO_DATABASE=registry
 REPO_USER=registry_user
 REPO_MISSING_SCHEMA_ACTION=create
 REPO_UPGRADEABLE_SCHEMA_ACTION=stop
-REPO_PASSWORD_FILE=/run/secrets/mp_database_password.txt
-MP_KEYSTORE_PASSWORD_FILE=/run/secrets/mp_keystore_password.txt
 MP_MEM_MAX=2048m
 MP_MEM_INIT=1024m
-LOGOUT_URL=https://localhost:8443/Shibboleth.sso/Logout
 SSO_HEADER=uid
diff --git a/demo/complex/docker-compose.yml b/demo/complex/docker-compose.yml
index aa9b0f9..7080c66 100644
--- a/demo/complex/docker-compose.yml
+++ b/demo/complex/docker-compose.yml
@@ -148,17 +148,14 @@ services:
      - REPO_PORT
      - REPO_DATABASE
      - REPO_USER
-     - REPO_PASSWORD_FILE
      - REPO_MISSING_SCHEMA_ACTION
      - REPO_UPGRADEABLE_SCHEMA_ACTION
      - REPO_SCHEMA_VERSION_IF_MISSING
      - REPO_SCHEMA_VARIANT
-     - MP_KEYSTORE_PASSWORD_FILE
      - MP_MEM_MAX
      - MP_MEM_INIT
      - MP_JAVA_OPTS
      - SSO_HEADER
-     - LOGOUT_URL
      - TIER_BEACON_OPT_OUT
     networks:
      - net
@@ -207,6 +204,8 @@ services:
      - net
     ports:
      - 15672:15672
+    volumes:
+     - mq:/var/lib/rabbitmq
 
 networks:
   net:    
@@ -246,3 +245,4 @@ volumes:
   midpoint_data:
   midpoint_mysql:
   midpoint_home:
+  mq: