diff --git a/Dockerfile b/Dockerfile
index e5f8270..62d2691 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,8 +58,8 @@ RUN npm run build
 # ================================
 FROM node:20-alpine AS runner
 
-# Install dumb-init for proper signal handling and Docker CLI for restart capability
-RUN apk add --no-cache dumb-init docker-cli
+# Install dumb-init for proper signal handling, Docker CLI for restart capability, and tzdata for timezone support
+RUN apk add --no-cache dumb-init docker-cli tzdata
 
 WORKDIR /app
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 5d7bbc1..ec351ec 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,9 @@ services:
     ports:
       - "3001:3000"
     environment:
+      # Timezone
+      TZ: Europe/Berlin
+      
       # Node environment
       NODE_ENV: production
       PORT: 3000
@@ -96,6 +99,7 @@ services:
     ports:
       - "5432:5432"
     environment:
+      TZ: Europe/Berlin
       POSTGRES_DB: trading_bot_v4
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}