diff --git a/ccp/modules/teiler-ui-compose.yml b/ccp/modules/teiler-ui-compose.yml
index c4b5fa4..a893639 100644
--- a/ccp/modules/teiler-ui-compose.yml
+++ b/ccp/modules/teiler-ui-compose.yml
@@ -14,20 +14,18 @@ services:
 
   login:
     #image: "jboss/keycloak:16.1.1"
-    image: docker.verbis.dkfz.de/ccp/dktk-keycloak:test
+    image: docker.verbis.dkfz.de/ccp/dktk-keycloak:latest
     container_name: bridgehead-login
     environment:
       KEYCLOAK_ADMIN: "admin"
       KEYCLOAK_ADMIN_PASSWORD: "${KEYCLOAK_ADMIN_PASSWORD}"
       KC_DB_PASSWORD: "${KEYCLOAK_DB_PASSWORD}" # Set in teiler-setup.sh
-      KC_HOSTNAME: "https://${HOST}/login"
-      #KEYCLOAK_USER: "admin"
-      #KEYCLOAK_PASSWORD: "${KEYCLOAK_ADMIN_PASSWORD}"
-      #DB_PASSWORD: "${KEYCLOAK_DB_PASSWORD}" # Set in teiler-setup.sh
-      TEILER_ROOT_CONFIG_EXTERN_URL: "https://${HOST}/ccp-teiler-root-config"
-      LOGIN_EXTERN_URL: "https://${HOST}/login"
+      KC_HOSTNAME_URL: "https://${HOST}/login"
+      KC_HOSTNAME_STRICT: "false"
+      KC_PROXY_ADDRESS_FORWARDING: "true"
+      TEILER_ROOT_CONFIG_EXTERN_URL: "https://${HOST}/ccp-teiler"
     command:
-      - start-dev --import-realm
+      - start-dev --import-realm --proxy edge --http-relative-path=/login
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.login.rule=PathPrefix(`/login`)"
@@ -42,7 +40,7 @@ services:
     container_name: bridgehead-teiler-root-config
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.teiler_root_config_ccp.rule=PathPrefix(`/ccp-teiler-root-config`)"
+      - "traefik.http.routers.teiler_root_config_ccp.rule=PathPrefix(`/ccp-teiler`)"
       - "traefik.http.services.teiler_root_config_ccp.loadbalancer.server.port=9000"
       - "traefik.http.routers.teiler_root_config_ccp.tls=true"
     environment:
@@ -87,15 +85,15 @@ services:
       DEFAULT_LANGUAGE: "DE"
       CONFIG_ENV_VAR_PATH: "/app/ccp.conf"
       TEILER_CONFIG_UPDATER_CRON: "0 1 * * * *"
-      TEILER_ROOT_CONFIG_URL: "https://${HOST}/ccp-teiler-root-config"
+      TEILER_ROOT_CONFIG_URL: "https://${HOST}/ccp-teiler"
       TEILER_UI_DE_URL: "https://${HOST}/ccp-teiler-ui/de"
       TEILER_UI_EN_URL: "https://${HOST}/ccp-teiler-ui/en"
       TEILER_APP1_NAME: "config"
       #    TEILER_APP2_NAME: "quality-report"
       TEILER_APP3_NAME: "keycloak"
       TEILER_APP3_TITLE: "Keycloak"
-      TEILER_APP4_EN_DESCRIPTION: "Authentication site"
-      TEILER_APP4_DE_DESCRIPTION: "Authentifizierungsseite"
+      TEILER_APP4_DESCRIPTION_EN: "Authentication site"
+      TEILER_APP4_DESCRIPTION_DE: "Authentifizierungsseite"
       TEILER_APP4_SOURCEURL: "https://${HOST}/login/auth/"
       TEILER_APP4_ROLES: "TEILER_ADMIN"
       TEILER_APP4_ISACTIVATED: "true"
@@ -114,10 +112,10 @@ services:
       #    TEILER_APP5_ISEXTERNALLINK: "true"
       #    TEILER_APP5_ISLOCAL: "true"
       TEILER_APP6_NAME: "ldm"
-      TEILER_APP6_EN_TITLE: "Local data management"
-      TEILER_APP6_DE_TITLE: "Lokales Datenmanagement"
-      TEILER_APP6_EN_DESCRIPTION: "Local Data Management"
-      TEILER_APP6_DE_DESCRIPTION: "Lokales Datenmanagement"
+      TEILER_APP6_TITLE_EN: "Local data management"
+      TEILER_APP6_TITLE_DE: "Lokales Datenmanagement"
+      TEILER_APP6_DESCRIPTION_EN: "Local Data Management"
+      TEILER_APP6_DESCRIPTION_DE: "Lokales Datenmanagement"
       TEILER_APP6_SOURCEURL: "${CENTRAXX_URL}"
       TEILER_APP6_ROLES: "TEILER_PUBLIC"
       TEILER_APP6_ISACTIVATED: "${IS_DKTK_SITE}"
@@ -126,7 +124,7 @@ services:
       TEILER_APP6_ISEXTERNALLINK: "true"
       TEILER_APP6_ISLOCAL: "true"
       TEILER_APP7_NAME: "id-manager"
-      TEILER_APP7_TITLE: "Magic PL"
+      TEILER_APP7_TITLE: "ID-Manager"
       TEILER_APP7_DESCRIPTION: "ID Manager"
       TEILER_APP7_SOURCEURL: "https://${HOST}/id-manager/index.html"
       TEILER_APP7_ROLES: "TEILER_PUBLIC"
@@ -136,10 +134,10 @@ services:
       TEILER_APP7_ISEXTERNALLINK: "true"
       TEILER_APP7_ISLOCAL: "true"
       TEILER_APP8_NAME: "patient-list"
-      TEILER_APP8_EN_TITLE: "Patient List"
-      TEILER_APP8_DE_TITLE: "Mainzelliste"
-      TEILER_APP8_EN_DESCRIPTION: "Patient List"
-      TEILER_APP8_DE_DESCRIPTION: "Patientenliste"
+      TEILER_APP8_TITLE_EN: "Patient List"
+      TEILER_APP8_TITLE_DE: "Patientenliste"
+      TEILER_APP8_DESCRIPTION_EN: "Patient List"
+      TEILER_APP8_DESCRIPTION_DE: "Patientenliste"
       TEILER_APP8_SOURCEURL: "https://${HOST}/patientlist"
       TEILER_APP8_ROLES: "TEILER_PUBLIC"
       TEILER_APP8_ISACTIVATED: "true"
@@ -148,10 +146,10 @@ services:
       TEILER_APP8_ISEXTERNALLINK: "true"
       TEILER_APP8_ISLOCAL: "true"
       TEILER_APP9_NAME: "project-pseudonymisation"
-      TEILER_APP9_EN_TITLE: "Project Pseudonymisation"
-      TEILER_APP9_DE_TITLE: "Projectpseudonymisierung"
-      TEILER_APP9_EN_DESCRIPTION: "Project Pseudonymisation"
-      TEILER_APP9_DE_DESCRIPTION: "Projectpseudonymisierung"
+      TEILER_APP9_TITLE_EN: "Project Pseudonymisation"
+      TEILER_APP9_TITLE_DE: "Projectpseudonymisierung"
+      TEILER_APP9_DESCRIPTION_EN: "Project Pseudonymisation"
+      TEILER_APP9_DESCRIPTION_DE: "Projectpseudonymisierung"
       TEILER_APP9_SOURCEURL: "https://${HOST}/id-manager/html/projectSelection.html"
       TEILER_APP9_ROLES: "TEILER_PUBLIC"
       TEILER_APP9_ISACTIVATED: "true"
@@ -161,8 +159,8 @@ services:
       TEILER_APP9_ISLOCAL: "true"
       TEILER_APP10_NAME: "federated-search"
       TEILER_APP10_TITLE: "Lens"
-      TEILER_APP10_EN_DESCRIPTION: "Federated Search"
-      TEILER_APP10_DE_DESCRIPTION: "Föderierte Suche"
+      TEILER_APP10_DESCRIPTION_EN: "Federated Search"
+      TEILER_APP10_DESCRIPTION_DE: "Föderierte Suche"
       TEILER_APP10_SOURCEURL: "https://demo.lens.samply.de/"
       TEILER_APP10_ROLES: "TEILER_PUBLIC"
       TEILER_APP10_ISACTIVATED: "true"
@@ -171,10 +169,10 @@ services:
       TEILER_APP10_ISEXTERNALLINK: "true"
       TEILER_APP10_ISLOCAL: "false"
       TEILER_APP11_NAME: "central-patient-list"
-      TEILER_APP11_EN_TITLE: "Central Patient List"
-      TEILER_APP11_DE_TITLE: "Zentrale Mainzelliste"
-      TEILER_APP11_EN_DESCRIPTION: "Central Patient List"
-      TEILER_APP11_DE_DESCRIPTION: "Zentrale Patientenliste"
+      TEILER_APP11_TITLE_EN: "Central Patient List"
+      TEILER_APP11_TITLE_DE: "Zentrale Patientenliste"
+      TEILER_APP11_DESCRIPTION_EN: "Central Patient List"
+      TEILER_APP11_DESCRIPTION_DE: "Zentrale Patientenliste"
       TEILER_APP11_SOURCEURL: "https://patientlist.ccp-it.dktk.dkfz.de/"
       TEILER_APP11_ROLES: "TEILER_PUBLIC"
       TEILER_APP11_ISACTIVATED: "true"
@@ -183,10 +181,10 @@ services:
       TEILER_APP11_ISEXTERNALLINK: "true"
       TEILER_APP11_ISLOCAL: "false"
       TEILER_APP12_NAME: "central id-manager"
-      TEILER_APP12_EN_TITLE: "Central Magic PL"
-      TEILER_APP12_DE_TITLE: "Zentraler Magic PL"
-      TEILER_APP12_EN_DESCRIPTION: "Central ID Manager"
-      TEILER_APP12_DE_DESCRIPTION: "Zentraler ID-Manager"
+      TEILER_APP12_TITLE_EN: "Central ID-Manager"
+      TEILER_APP12_TITLE_DE: "Zentraler ID-Manager"
+      TEILER_APP12_DESCRIPTION_EN: "Central ID Manager"
+      TEILER_APP12_DESCRIPTION_DE: "Zentraler ID-Manager"
       TEILER_APP12_SOURCEURL: "https://dktk-kne.kgu.de/"
       TEILER_APP12_ROLES: "TEILER_PUBLIC"
       TEILER_APP12_ISACTIVATED: "true"