diff --git a/docker-compose__pilot-xo9b.yml b/docker-compose__pilot-xo9b.yml
index 8865c53..3c62bdc 100644
--- a/docker-compose__pilot-xo9b.yml
+++ b/docker-compose__pilot-xo9b.yml
@@ -5,20 +5,13 @@ services:
     init: true
     image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest
     environment:
-      - ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL}
-      - CREATE_TEST_USERS=true
-      # when enabling this pilot for its end users
-      # ADMIN_EMAIL=IDHUB_PILOT_XO9B_IDHUB1__ADMIN_EMAIL
-      # TODO destroy CREATE_TEST_USERS=true
+      - INITIAL_ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL}
+      - INITIAL_ADMIN_PASSWORD=${IDHUB_PILOT_TEST__ADMIN_PASSWORD}
       - SECRET_KEY=${IDHUB_SECRET_KEY:-publicsecretisnotsecureVtmKBfxpVV47PpBCF2Nzz2H6qnbd}
-      - ALLOWED_HOSTS=${IDHUB_ALLOWED_HOSTS:-*}
       - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/}
       - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/}
       - PORT=${IDHUB_PORT:-9001}
-      - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER}
-      - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD}
-      - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL}
-      - CSRF_TRUSTED_ORIGINS=https://idhub1-xo9b.demo.pangea.org
+      - DOMAIN=idhub1-xo9b.demo.pangea.org
       - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL}
       - EMAIL_HOST=${IDHUB_EMAIL_HOST}
       - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER}
@@ -26,11 +19,10 @@ services:
       - EMAIL_PORT=${IDHUB_EMAIL_PORT}
       - EMAIL_USE_TLS=${IDHUB_EMAIL_USE_TLS}
       - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND}
-      - RESPONSE_URI=https://idhub1-xo9b.demo.pangea.org/oidc4vp/
-      - ALLOW_CODE_URI=https://idhub1-xo9b.demo.pangea.org/oidc4vp/allow_code
       - SUPPORTED_CREDENTIALS=['FinancialVulnerabilityCredential']
       - SYNC_ORG_DEV=${IDHUB_SYNC_ORG_DEV}
-      - ORG_FILE=examples/organizations__pilot_xo9b.csv
+      - OIDC_ORGS=examples/organizations__pilot_xo9b.csv
+      - OIDC_REDIRECT=true
     ports:
       - 9001:9001
     volumes:
@@ -41,20 +33,11 @@ services:
     init: true
     image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest
     environment:
-      - ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL}
-      - CREATE_TEST_USERS=true
-      # when enabling this pilot for its end users
-      # ADMIN_EMAIL=IDHUB_PILOT_XO9B_IDHUB2__ADMIN_EMAIL
-      # TODO destroy CREATE_TEST_USERS=true
+      - DOMAIN=idhub2-xo9b.demo.pangea.org
       - SECRET_KEY=${IDHUB_SECRET_KEY:-publicsecretisnotsecureVtmKBfxpVV47PpBCF2Nzz2H6qnbd}
-      - ALLOWED_HOSTS=${IDHUB_ALLOWED_HOSTS:-*}
       - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/}
       - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/}
       - PORT=${IDHUB_PORT:-9002}
-      - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER}
-      - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD}
-      - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL}
-      - CSRF_TRUSTED_ORIGINS=https://idhub2-xo9b.demo.pangea.org
       - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL}
       - EMAIL_HOST=${IDHUB_EMAIL_HOST}
       - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER}
@@ -62,11 +45,10 @@ services:
       - EMAIL_PORT=${IDHUB_EMAIL_PORT}
       - EMAIL_USE_TLS=${IDHUB_EMAIL_USE_TLS}
       - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND}
-      - RESPONSE_URI=https://idhub2-xo9b.demo.pangea.org/oidc4vp/
-      - ALLOW_CODE_URI=https://idhub2-xo9b.demo.pangea.org/oidc4vp/allow_code
       - SUPPORTED_CREDENTIALS=['FinancialVulnerabilityCredential']
       - SYNC_ORG_DEV=${IDHUB_SYNC_ORG_DEV}
-      - ORG_FILE=examples/organizations__pilot_xo9b.csv
+      - OIDC_ORGS=examples/organizations__pilot_xo9b.csv
+      - OIDC_REDIRECT=true
     ports:
       - 9002:9002
     volumes: