diff --git a/docker-compose.yml b/docker-compose.yml
index 7207a82..8685b55 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,32 +5,39 @@ services:
     build: .
     container_name: wxconnect
     restart: unless-stopped
+    env_file:
+      - .env
     environment:
       # MQTT Configuration
-      MQTT_HOST: ikarus.egfh.internal
-      MQTT_PORT: 1883
-      MQTT_TOPIC: weather/loop
+      MQTT_HOST: ${MQTT_HOST}
+      MQTT_PORT: ${MQTT_PORT}
+      MQTT_USERNAME: ${MQTT_USERNAME}
+      MQTT_PASSWORD: ${MQTT_PASSWORD}
+      MQTT_TOPIC: ${MQTT_TOPIC}
       MQTT_CLIENT_ID: wxconnect-docker
       
-      # Database Configuration - Oracle on pve-ora19c-1
-      DB_TYPE: oracle
-      DB_HOST: pve-ora19c-1
-      DB_PORT: 1521
-      DB_NAME: shed.pattinson.org
-      DB_USERNAME: C##WEATHER
-      DB_PASSWORD: weather123
-      DB_SCHEMA: C##WEATHER
+      # Database Configuration
+      DB_TYPE: ${DB_TYPE}
+      DB_HOST: ${DB_HOST}
+      DB_PORT: ${DB_PORT}
+      DB_NAME: ${DB_NAME}
+      DB_USERNAME: ${DB_USERNAME}
+      DB_PASSWORD: ${DB_PASSWORD}
+      DB_SCHEMA: ${DB_SCHEMA}
       
       # Oracle specific
-      ORACLE_SID: shed.pattinson.org
+      ORACLE_SID: ${ORACLE_SID}
+      
+      # MS SQL specific
+      MSSQL_DRIVER: ${MSSQL_DRIVER}
       
       # Logging
-      LOG_LEVEL: DEBUG
+      LOG_LEVEL: ${LOG_LEVEL}
       
       # Application Settings
-      RECONNECT_INTERVAL: 30
-      BATCH_SIZE: 1
-      BATCH_TIMEOUT: 60
+      RECONNECT_INTERVAL: ${RECONNECT_INTERVAL}
+      BATCH_SIZE: ${BATCH_SIZE}
+      BATCH_TIMEOUT: ${BATCH_TIMEOUT}
     
     volumes:
       - ./logs:/app/logs