diff --git a/docker-compose.yml b/docker-compose.yml
index d1810cc..1c7e7e3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -72,6 +72,9 @@ services:
     build:
       context: ./frontend
       dockerfile: Dockerfile
+      args:
+        AZURE_AD_TENANT_ID: ${AZURE_AD_TENANT_ID:-e519c2e6-bc6d-4fdf-8d9c-923c2f002385}
+        AZURE_AD_CLIENT_ID: ${AZURE_AD_CLIENT_ID:-9079054c-9620-4757-a256-23413042f1ef}
     ports:
       - "3000:3000"
     environment:
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 24a3a20..4f0c467 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -5,6 +5,10 @@ COPY package.json package-lock.json ./
 RUN npm ci
 COPY . .
 ENV API_INTERNAL_URL=http://api:8000
+ARG AZURE_AD_TENANT_ID
+ARG AZURE_AD_CLIENT_ID
+ENV NEXT_PUBLIC_AZURE_TENANT_ID=$AZURE_AD_TENANT_ID
+ENV NEXT_PUBLIC_AZURE_CLIENT_ID=$AZURE_AD_CLIENT_ID
 RUN npm run build
 
 FROM node:20-alpine
diff --git a/frontend/lib/msalConfig.ts b/frontend/lib/msalConfig.ts
index fe05c32..b7d61f5 100644
--- a/frontend/lib/msalConfig.ts
+++ b/frontend/lib/msalConfig.ts
@@ -1,9 +1,14 @@
 import { Configuration, PopupRequest } from '@azure/msal-browser';
 
+const TENANT_ID =
+  process.env.NEXT_PUBLIC_AZURE_TENANT_ID || 'e519c2e6-bc6d-4fdf-8d9c-923c2f002385';
+const CLIENT_ID =
+  process.env.NEXT_PUBLIC_AZURE_CLIENT_ID || '9079054c-9620-4757-a256-23413042f1ef';
+
 export const msalConfig: Configuration = {
   auth: {
-    clientId: process.env.NEXT_PUBLIC_AZURE_CLIENT_ID!,
-    authority: `https://login.microsoftonline.com/${process.env.NEXT_PUBLIC_AZURE_TENANT_ID}`,
+    clientId: CLIENT_ID,
+    authority: `https://login.microsoftonline.com/${TENANT_ID}`,
     redirectUri:
       typeof window !== 'undefined'
         ? `${window.location.origin}/ppt-tool/login`