diff --git a/pigallery2/docker-compose.yml b/pigallery2/docker-compose.yml
index bae1237..ae5779f 100644
--- a/pigallery2/docker-compose.yml
+++ b/pigallery2/docker-compose.yml
@@ -5,11 +5,13 @@ services:
     image: mariadb
     volumes:
       - ./db-data:/var/lib/mysql
+    restart: unless-stopped
     environment:
       - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
       - MYSQL_USER=pigallery2
       - MYSQL_PASSWORD=${DB_PASSWORD}
       - MYSQL_DATABASE=pigallery2
+      - TZ=Europe/Berlin
 
   pigallery2:
     image: bpatrik/pigallery2:latest
@@ -17,6 +19,7 @@ services:
     container_name: pigallery2
     environment:
       - NODE_ENV=production
+      - TZ=Europe/Berlin
     volumes:
       - "./db-data:/app/data/db"
       - "Photos:/app/data/images:ro"
@@ -24,7 +27,7 @@ services:
       - "./tmp:/app/data/tmp"
     ports:
       - 8090:80
-    restart: always
+    restart: unless-stopped
 
 volumes:
   Photos: