diff --git a/.env.production b/.env.production
new file mode 100644
index 0000000..8392a6c
--- /dev/null
+++ b/.env.production
@@ -0,0 +1,7 @@
+SERVER_ID=1403539983821963274
+GUIDES_CHANNEL_ID=1426998962635804712
+REPEL_LOG_CHANNEL_ID=1403540596035027045
+REPEL_ROLE_ID=1403545113904414842
+MODERATORS_ROLE_IDS=1428151937534005379
+ONBOARDING_CHANNEL_ID=tbd
+ONBOARDING_ROLE_ID=tbd
\ No newline at end of file
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 58e6a74..7934b26 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -38,15 +38,10 @@ jobs:
           export NODE_VERSION=$(cat .nvmrc | sed 's/v//')
           echo "Using Node version: $NODE_VERSION"
 
-          # Create .env.local file with secrets
-          cat > .env.local << EOF
+          # Create .env.secrets file with secrets
+          cat > .env.secrets << EOF
           DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }}
           CLIENT_ID=${{ secrets.CLIENT_ID }}
-          GUIDES_CHANNEL_ID=${{ secrets.GUIDES_CHANNEL_ID }}
-          SERVER_ID=${{ secrets.SERVER_ID }}
-          REPEL_LOG_CHANNEL_ID=${{ secrets.REPEL_LOG_CHANNEL_ID }}
-          REPEL_ROLE_ID=${{ secrets.REPEL_ROLE_ID }}
-          MODERATORS_ROLE_IDS=${{ secrets.MODERATORS_ROLE_IDS }}
           EOF
 
           # Stop any existing containers
diff --git a/docker-compose.yml b/docker-compose.yml
index 0978750..26368e0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,8 +9,10 @@ services:
     container_name: webdev-bot-prod
     restart: unless-stopped
     env_file:
-      - .env.local
+      - .env.production
+      - .env.secrets
     environment:
+      - NODE_ENV=production
       - GUIDES_TRACKER_PATH=/app/data/guides-tracker.json
     volumes:
       # Persist guides tracker data
diff --git a/src/loadEnvFile.ts b/src/loadEnvFile.ts
index d402947..42ea608 100644
--- a/src/loadEnvFile.ts
+++ b/src/loadEnvFile.ts
@@ -32,4 +32,7 @@ function loadEnvFile(filePath: string) {
 }
 
 // Load local environment file if it exists
-loadEnvFile(join(process.cwd(), '.env.local'));
+const isProd = process.env.NODE_ENV === 'production';
+if (!isProd) {
+  loadEnvFile(join(process.cwd(), '.env.local'));
+}