diff --git a/docker-compose__pilot-lafede.yml b/docker-compose__pilot-lafede.yml
index eb0c935..3e10641 100644
--- a/docker-compose__pilot-lafede.yml
+++ b/docker-compose__pilot-lafede.yml
@@ -25,6 +25,6 @@ services:
       - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND}
       - SUPPORTED_CREDENTIALS=['FederationMembership', 'CourseCredential']
     ports:
-      - 9031:9001
+      - 9021:9001
     volumes:
       - ./idhub1__pilot-lafede:/opt/idhub
diff --git a/docker-compose__pilot-pangea.yml b/docker-compose__pilot-pangea.yml
index dbb3c4e..635b4d7 100644
--- a/docker-compose__pilot-pangea.yml
+++ b/docker-compose__pilot-pangea.yml
@@ -50,7 +50,7 @@ services:
       - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER}
       - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD}
       - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL}
-      - CSRF_TRUSTED_ORIGINS=https://idhub.demo.pangea.org
+      - CSRF_TRUSTED_ORIGINS=https://idhub1.demo.pangea.org
       - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL}
       - EMAIL_HOST=${IDHUB_EMAIL_HOST}
       - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER}
@@ -58,13 +58,13 @@ services:
       - EMAIL_PORT=${IDHUB_EMAIL_PORT}
       - EMAIL_USE_TLS=${IDHUB_EMAIL_USE_TLS}
       - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND}
-      - RESPONSE_URI=https://idhub.demo.pangea.org/oidc4vp/
-      - ALLOW_CODE_URI=https://idhub.demo.pangea.org/oidc4vp/allow_code
+      - RESPONSE_URI=https://idhub1.demo.pangea.org/oidc4vp/
+      - ALLOW_CODE_URI=https://idhub1.demo.pangea.org/oidc4vp/allow_code
       - SUPPORTED_CREDENTIALS=['MembershipCard']
       - SYNC_ORG_DEV=${IDHUB_SYNC_ORG_DEV}
       - ORG_FILE=examples/organizations__pilot_pangea.csv
     ports:
-      - 9021:9001
+      - 9031:9001
     volumes:
       - ./idhub1__pilot-pangea:/opt/idhub
 
@@ -81,7 +81,7 @@ services:
       - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER}
       - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD}
       - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL}
-      - CSRF_TRUSTED_ORIGINS=https://idhub.demo.pangea.org
+      - CSRF_TRUSTED_ORIGINS=https://idhub2.demo.pangea.org
       - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL}
       - EMAIL_HOST=${IDHUB_EMAIL_HOST}
       - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER}
@@ -89,13 +89,13 @@ services:
       - EMAIL_PORT=${IDHUB_EMAIL_PORT}
       - EMAIL_USE_TLS=${IDHUB_EMAIL_USE_TLS}
       - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND}
-      - RESPONSE_URI=https://idhub.demo.pangea.org/oidc4vp/
-      - ALLOW_CODE_URI=https://idhub.demo.pangea.org/oidc4vp/allow_code
+      - RESPONSE_URI=https://idhub2.demo.pangea.org/oidc4vp/
+      - ALLOW_CODE_URI=https://idhub2.demo.pangea.org/oidc4vp/allow_code
       - SUPPORTED_CREDENTIALS=['MembershipCard']
       - SYNC_ORG_DEV=${IDHUB_SYNC_ORG_DEV}
       - ORG_FILE=examples/organizations__pilot_pangea.csv
     ports:
-      - 9022:9002
+      - 9032:9002
     volumes:
       - ./idhub2__pilot-pangea:/opt/idhub