diff --git a/docker-compose.yml b/docker-compose.yml
index 8caef38..3d61e13 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -224,9 +224,9 @@ services:
       TOKEN_URI: https://services.humanbrainproject.eu/oidc/token
       AUTH_URI: https://services.humanbrainproject.eu/oidc/authorize
       USER_INFO_URI: https://services.humanbrainproject.eu/oidc/userinfo
-      FRONTEND_LOGIN_URL: ${PORTAL_FRONTEND_URL}/services/login/hbp
-      FRONTEND_AFTER_LOGIN_URL: ${PORTAL_FRONTEND_URL}/home
-      FRONTEND_AFTER_LOGOUT_URL: ${PORTAL_FRONTEND_URL}/services/login/hbp
+      FRONTEND_LOGIN_URL: ${PORTAL_FRONTEND_URL}:${PORTAL_FRONTEND_PORT1}/services/login/hbp
+      FRONTEND_AFTER_LOGIN_URL: ${PORTAL_FRONTEND_URL}:${PORTAL_FRONTEND_PORT1}/home
+      FRONTEND_AFTER_LOGOUT_URL: ${PORTAL_FRONTEND_URL}:${PORTAL_FRONTEND_PORT1}/services/login/hbp
       WOKEN_HOST: ${WOKEN_HOST}
       WOKEN_PORT: ${WOKEN_PORT2}
       WOKEN_AKKA_PATH: /user/entrypoint
diff --git a/settings.default.sh b/settings.default.sh
index d85bbf9..df70f9f 100644
--- a/settings.default.sh
+++ b/settings.default.sh
@@ -145,4 +145,4 @@
 : ${PORTAL_FRONTEND_VERSION:=":2.3.3"} # Stable Config
 : ${PORTAL_FRONTEND_PORT1:="80"}
 : ${PORTAL_FRONTEND_PORT2:="443"}
-: ${PORTAL_FRONTEND_URL:="http://172.16.22.176:${PORTAL_FRONTEND_PORT1}"}
+: ${PORTAL_FRONTEND_URL:="http://localhost"}