diff --git a/docker-compose.yml b/docker-compose.yml
index 4917b8a..115ce3e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -156,7 +156,7 @@ services:
                 -Drepo.port=8080
                 -Ddw.server.applicationConnectors[0].type=http
                 -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-                -Didentity-service.auth-server-url=${IDENTITY_SERVICE_BASEURL}/auth
+                -Didentity-service.auth-server-url=${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
                 -Didentity-service.resource=acs-sync
                 "
         depends_on:
@@ -171,7 +171,7 @@ services:
             APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
             APP_BASE_SHARE_URL: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/#/preview/s"
             APP_CONFIG_AUTH_TYPE: OAUTH
-            APP_CONFIG_OAUTH2_HOST: "${IDENTITY_SERVICE_BASEURL}/auth/realms/alfresco"
+            APP_CONFIG_OAUTH2_HOST: "${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth/realms/alfresco"
             APP_CONFIG_OAUTH2_CLIENTID: alfresco
             APP_CONFIG_OAUTH2_IMPLICIT_FLOW: "true"
             APP_CONFIG_OAUTH2_REDIRECT_LOGIN: "/workspace/"