diff --git a/cce/modules/lens-compose.yml b/cce/modules/lens-compose.yml
index 536e206..2ff3dc7 100644
--- a/cce/modules/lens-compose.yml
+++ b/cce/modules/lens-compose.yml
@@ -23,9 +23,9 @@ services:
       OAUTH2_PROXY_PROVIDER: oidc
       OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true"
       # Use the same issuer as Project Manager so Lens can forward the token to its API.
-      OAUTH2_PROXY_OIDC_ISSUER_URL: ${PM_OIDC_URL}
-      OAUTH2_PROXY_CLIENT_ID: ${PM_OIDC_PRIVATE_CLIENT_ID}
-      OAUTH2_PROXY_CLIENT_SECRET: ${PM_OIDC_PRIVATE_SECRET}
+      OAUTH2_PROXY_OIDC_ISSUER_URL: ${LENS_OIDC_PRIVATE_URL}
+      OAUTH2_PROXY_CLIENT_ID: ${LENS_OIDC_PRIVATE_CLIENT_ID}
+      OAUTH2_PROXY_CLIENT_SECRET: ${LENS_OIDC_PRIVATE_SECRET}
       OAUTH2_PROXY_COOKIE_SECRET: ${LENS_AUTH_COOKIE_SECRET}
       OAUTH2_PROXY_COOKIE_NAME: _BRIDGEHEAD_oauth2_lens
       OAUTH2_PROXY_COOKIE_REFRESH: 4m
diff --git a/cce/modules/lens-setup.sh b/cce/modules/lens-setup.sh
index 8843789..50a1eb7 100644
--- a/cce/modules/lens-setup.sh
+++ b/cce/modules/lens-setup.sh
@@ -3,4 +3,9 @@
 if [ -n "$ENABLE_LENS" ];then
   LENS_AUTH_COOKIE_SECRET="$(echo "This is a salt string to generate one consistent cookie secret for the Lens oauth2 proxy." | sha1sum | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | tr -d '\n' | head -c 32)"
   OVERRIDE+=" -f ./$PROJECT/modules/lens-compose.yml"
+
+  LENS_OIDC_PRIVATE_URL="https://sso.verbis.dkfz.de/application/o/cce-project-manager-api/"
+  LENS_OIDC_PRIVATE_CLIENT_ID="cce-project-manager-api"
+  LENS_OIDC_PRIVATE_SECRET="$(echo \"This is a salt string to generate the private secret for the project manager oidc public client. It is not required to be secret.\" | sha1sum | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
+
 fi
diff --git a/cce/modules/project-manager-compose.yml b/cce/modules/project-manager-compose.yml
index 794e439..c0e356f 100644
--- a/cce/modules/project-manager-compose.yml
+++ b/cce/modules/project-manager-compose.yml
@@ -44,6 +44,8 @@ services:
     depends_on:
       project-manager-api-db:
         condition: service_healthy
+      forward_proxy:
+        condition: service_healthy
 
   project-manager-api-db:
     container_name: project-manager-api-db