diff --git a/caprover_deploy.sh b/caprover_deploy.sh
index 692efda2..2014b227 100755
--- a/caprover_deploy.sh
+++ b/caprover_deploy.sh
@@ -25,34 +25,11 @@ function generate_default_app_name() {
 # take app name as first argument or use the default generated app name
 APP_NAME=${1:-$(generate_default_app_name)}
 
-if [[ "$APP_NAME" == "myvbv" ]]; then
-    VITE_LOGOUT_REDIRECT="https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://myvbv.iterativ.ch/"
-                          https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/B2C_1_SignUpAndSignIn_v3/oauth2/v2.0/
-    VITE_SENTRY_ENV="production"
-elif [[ "$APP_NAME" == "myvbv-stage" ]]; then
-    VITE_LOGOUT_REDIRECT="https://vbvtst.b2clogin.com/vbvtst.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://myvbv-stage.iterativ.ch/"
-                          https://vbvtst.b2clogin.com/vbvtst.onmicrosoft.com/B2C_1_SignUpAndSignIn_v3/oauth2/v2.0/
-    VITE_SENTRY_ENV="stage"
-elif [[ "$APP_NAME" == "vbv-lernwelt" ]]; then
-    VITE_OAUTH_API_BASE_URL=  https://vbvdev.b2clogin.com/vbvdev.onmicrosoft.com/B2C_1_SignUpAndSignIn_v3/oauth2/v2.0/
-    VITE_LOGOUT_REDIRECT="    https://vbvdev.b2clogin.com/vbvdev.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://vbv-lernwelt.control.iterativ.ch"
-    VITE_SENTRY_ENV="development"
-elif [[ "$APP_NAME" == "prod-azure" ]]; then
-    VITE_LOGOUT_REDIRECT="https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://my.vbv-afa.ch/"
-    VITE_SENTRY_ENV="production"
-fi
-
 echo "Deploy to $APP_NAME"
-echo "VITE_SENTRY_ENV: $VITE_SENTRY_ENV"
-echo "VITE_LOGOUT_REDIRECT: $VITE_LOGOUT_REDIRECT"
-
-export VITE_SENTRY_ENV=$VITE_SENTRY_ENV
-export VITE_LOGOUT_REDIRECT=$VITE_LOGOUT_REDIRECT
-
 
 # create client for django
 npm run build
-python server/manage.py collectstatic --no-input
+VITE_APP_ENVIRONMENT=dev python server/manage.py collectstatic --no-input
 
 if [[ "$APP_NAME" == "prod-azure" ]]; then
     # build and push azure docker container
diff --git a/client/src/main.ts b/client/src/main.ts
index 0e11e50d..d1216063 100644
--- a/client/src/main.ts
+++ b/client/src/main.ts
@@ -14,10 +14,9 @@ declare module "pinia" {
   }
 }
 
-if (
-  window.location.href.indexOf("localhost") >= 0 ||
-  window.location.href.indexOf("127.0.0.1") >= 0
-) {
+const appEnv = import.meta.env.VITE_APP_ENVIRONMENT || "local";
+
+if (appEnv === "local") {
   log.setLevel("trace");
 } else {
   log.setLevel("warn");
@@ -28,12 +27,10 @@ const app = createApp(App);
 
 Sentry.init({
   app,
-  environment: import.meta.env.VITE_APP_ENVIRONMENT || "local",
+  environment: appEnv,
   dsn: "https://2df6096a4fd94bd6b4802124d10e4b8d@o8544.ingest.sentry.io/4504157846372352",
   tracesSampleRate: 0.0,
-  enabled:
-    import.meta.env.VITE_APP_ENVIRONMENT.startsWith("prod") ||
-    import.meta.env.VITE_APP_ENVIRONMENT.startsWith("stage"),
+  enabled: appEnv.startsWith("prod") || appEnv.startsWith("stage"),
 });
 
 // todo: define lang setup
diff --git a/client/src/router/guards.ts b/client/src/router/guards.ts
index 6ca8fc14..f7090336 100644
--- a/client/src/router/guards.ts
+++ b/client/src/router/guards.ts
@@ -15,8 +15,8 @@ export const updateLoggedIn: NavigationGuard = async () => {
 export const redirectToLoginIfRequired: NavigationGuard = (to) => {
   const userStore = useUserStore();
   if (loginRequired(to) && !userStore.loggedIn) {
-    const sentryEnv = import.meta.env.VITE_APP_ENVIRONMENT;
-    const ssoLogin = sentryEnv.startsWith("prod") || sentryEnv.startsWith("stage");
+    const appEnv = import.meta.env.VITE_APP_ENVIRONMENT || "local";
+    const ssoLogin = appEnv.startsWith("prod") || appEnv.startsWith("stage");
     return ssoLogin ? `/login?next=${to.fullPath}` : `/login-local?next=${to.fullPath}`;
   }
 };
diff --git a/compose/django/docker_start.sh b/compose/django/docker_start.sh
index e888148f..16637c5b 100644
--- a/compose/django/docker_start.sh
+++ b/compose/django/docker_start.sh
@@ -10,5 +10,3 @@ python /app/manage.py collectstatic --no-input --no-post-process
 python /app/manage.py reset_schema
 
 /usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:7555 --chdir=/app -k uvicorn.workers.UvicornWorker
-
-
diff --git a/env/bitbucket/prepare_for_deployment.sh b/env/bitbucket/prepare_for_deployment.sh
index 7db1b2a3..2359750c 100755
--- a/env/bitbucket/prepare_for_deployment.sh
+++ b/env/bitbucket/prepare_for_deployment.sh
@@ -12,9 +12,6 @@ export PATH="$PWD/vbvvenv/bin:$PATH"
 
 docker login --username=iterativ --password=$DOCKER_PASSWORD_TOKEN
 
-# only used for `python manage.py collectstatic` so value doesn't matter
-export VITE_APP_ENVIRONMENT=dev
-
 pip install -r $BITBUCKET_CLONE_DIR/server/requirements/requirements-dev.txt
 
 npm install -g caprover
diff --git a/env_secrets/prod-azure.json b/env_secrets/prod-azure.json
index 00840c82..f7328995 100644
Binary files a/env_secrets/prod-azure.json and b/env_secrets/prod-azure.json differ