diff --git a/docker-compose.yml b/docker-compose.yml
index 6af0abb..a84e205 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,6 @@
 version: "3.3"
 
 services:
-
   traefik:
     image: "traefik:v2.10"
     container_name: "traefik"
@@ -25,8 +24,8 @@ services:
       - "./letsencrypt:/letsencrypt"
       - "./traefik/logs:/logs"
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
-    environment:
-      - TZ=Europe/Berlin
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
     labels:
       - "traefik.enable=true"
       # Make the traefik dashboard available under https://oxmox.root.sx/traefik/dashboard/
@@ -46,6 +45,8 @@ services:
     command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
     volumes:
       - ./nextcloud-db:/var/lib/mysql
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
     environment:
       - PUID=1000
       - PGID=1000
@@ -53,7 +54,6 @@ services:
       - MYSQL_USER=nextcloud
       - MYSQL_PASSWORD_FILE=/run/secrets/nextcloud_db_password
       - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/nextcloud_db_root_password
-      - TZ=Europe/Berlin
     secrets:
       - nextcloud_db_password
       - nextcloud_db_root_password
@@ -66,10 +66,10 @@ services:
     restart: unless-stopped
     links:
       - nextcloud-db
-    depends_on:
-      - nextcloud-db
     volumes:
       - ./nextcloud-app/nextcloud:/var/www/html
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
     environment:
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
@@ -82,7 +82,6 @@ services:
       - NEXTCLOUD_TRUSTED_DOMAINS=*
       #- NEXTCLOUD_ADMIN_USER=admin
       #- NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
-      - TZ=Europe/Berlin
     secrets:
       - nextcloud_db_password
       - nextcloud_db_root_password
@@ -141,7 +140,6 @@ secrets:
   #  environment:
   #    - PUID=1000
   #    - PGID=1000
-  #    - TZ=Europe/Berlin
   #    #- SERVERURL=wireguard.oxmox.root.sx #optional
   #    - SERVERPORT=51820 #optional
   #    - PEERS=1 #optional