diff --git a/.env.example b/.env.example
index 7d6575b..001a9a4 100644
--- a/.env.example
+++ b/.env.example
@@ -19,4 +19,9 @@ SOURCE_COMMIT=
 # The API key going to be used for the status API
 STATUS_API_KEY=
 # The bot's token
-TOKEN=
\ No newline at end of file
+TOKEN=
+# Frontend envs
+VITE_BOT_API_URL=
+VITE_STATUS_API_KEY=
+VITE_FRONTEND_URL=
+VITE_DISCORD_CLIENT_ID=
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index a8ef596..2250c48 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ ARG SOURCE_COMMIT
 ARG VITE_BOT_API_URL
 ARG VITE_STATUS_API_KEY
 ARG VITE_FRONTEND_URL
+ARG VITE_DISCORD_CLIENT_ID
 ARG STATUS_API_KEY
 
 ENV SOURCE_COMMIT=${SOURCE_COMMIT}
@@ -11,6 +12,7 @@ ENV NODE_ENV=production
 ENV VITE_BOT_API_URL=${VITE_BOT_API_URL}
 ENV VITE_STATUS_API_KEY=${VITE_STATUS_API_KEY}
 ENV VITE_FRONTEND_URL=${VITE_FRONTEND_URL}
+ENV VITE_DISCORD_CLIENT_ID=${VITE_DISCORD_CLIENT_ID}
 ENV STATUS_API_KEY=${STATUS_API_KEY}
 
 WORKDIR /app
@@ -52,13 +54,15 @@ ARG SOURCE_COMMIT
 ARG VITE_BOT_API_URL
 ARG VITE_STATUS_API_KEY
 ARG VITE_FRONTEND_URL
+ARG VITE_DISCORD_CLIENT_ID
 
 ENV SOURCE_COMMIT=${SOURCE_COMMIT}
 ENV NODE_ENV=production
 ENV VITE_BOT_API_URL=${VITE_BOT_API_URL}
 ENV STATUS_API_KEY=${STATUS_API_KEY}
-ENV VITE_STATUS_API_KEY=${STATUS_API_KEY}
+ENV VITE_STATUS_API_KEY=${VITE_STATUS_API_KEY}
 ENV VITE_FRONTEND_URL=${VITE_FRONTEND_URL}
+ENV VITE_DISCORD_CLIENT_ID=${VITE_DISCORD_CLIENT_ID}
 
 RUN addgroup -g 1001 -S nodejs && \
     adduser -S aethel -u 1001
diff --git a/docker-compose.example.yml b/docker-compose.example.yml
index e204a9c..f024f31 100644
--- a/docker-compose.example.yml
+++ b/docker-compose.example.yml
@@ -4,9 +4,12 @@ services:
     build:
       context: .
       args:
-        - VITE_BOT_API_URL=${VITE_BOT_API_URL:-https://aethel.xyz}
+        - VITE_BOT_API_URL=${BOT_API_URL:-https://aethel.xyz}
         - VITE_STATUS_API_KEY=${STATUS_API_KEY}
-        - VITE_FRONTEND_URL=${VITE_FRONTEND_URL:-https://aethel.xyz}
+        - VITE_FRONTEND_URL=${FRONTEND_URL:-https://aethel.xyz}
+        - VITE_DISCORD_CLIENT_ID=${DISCORD_CLIENT_ID}
+        - VITE_STATUS_API_KEY=${STATUS_API_KEY}
+        - STATUS_API_KEY=${STATUS_API_KEY}
         - SOURCE_COMMIT=${SOURCE_COMMIT:-development}
     container_name: aethel-bot
     restart: unless-stopped
@@ -14,6 +17,16 @@ services:
       - .env
     environment:
       NODE_ENV: production
+      TOKEN: ${TOKEN}
+      CLIENT_ID: ${CLIENT_ID}
+      DATABASE_URL: ${DATABASE_URL}
+      API_KEY_ENCRYPTION_SECRET: ${API_KEY_ENCRYPTION_SECRET}
+      STATUS_API_KEY: ${STATUS_API_KEY}
+      OPENROUTER_API_KEY: ${OPENROUTER_API_KEY}
+      OPENWEATHER_API_KEY: ${OPENWEATHER_API_KEY}
+      ALLOWED_ORIGINS: ${ALLOWED_ORIGINS}
+      LOG_LEVEL: ${LOG_LEVEL:-info}
+      SOURCE_COMMIT: ${SOURCE_COMMIT}
     healthcheck:
       test: ["CMD", "ps", "aux", "|", "grep", "node", "|", "grep", "-v", "grep"]
       interval: 30s
@@ -32,9 +45,9 @@ services:
     container_name: aethel-postgres
     restart: unless-stopped
     environment:
-      POSTGRES_DB: aethel
-      POSTGRES_USER: username
-      POSTGRES_PASSWORD: password
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     volumes:
       - postgres_data:/var/lib/postgresql/data
     networks: