diff --git a/nextcloud/10.0/Dockerfile b/nextcloud/10.0/Dockerfile
index a3fee83..d65bfd1 100644
--- a/nextcloud/10.0/Dockerfile
+++ b/nextcloud/10.0/Dockerfile
@@ -10,7 +10,7 @@ ENV UID=991 GID=991 \
     APC_SHM_SIZE=128M \
     OPCACHE_MEM_SIZE=128 \
     CRON_PERIOD=15m \
-    TZ=Europe/Berlin \
+    TZ=Etc/UTC \
     DB_TYPE=sqlite3 \
     ADMIN_USER=admin \
     ADMIN_PASSWORD=admin
@@ -33,6 +33,7 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
     libsmbclient \
     samba-client \
     su-exec \
+    tzdata \
     php7@commuedge \
     php7-fpm@commuedge \
     php7-intl@commuedge \
diff --git a/nextcloud/10.0/run.sh b/nextcloud/10.0/run.sh
index 280907e..16b4785 100644
--- a/nextcloud/10.0/run.sh
+++ b/nextcloud/10.0/run.sh
@@ -5,8 +5,6 @@ sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf /etc/ph
        -e "s/<OPCACHE_MEM_SIZE>/$OPCACHE_MEM_SIZE/g" /etc/php7/conf.d/00_opcache.ini \
        -e "s/<CRON_PERIOD>/$CRON_PERIOD/g" /etc/s6.d/cron/run
 
-echo ${TZ:-UTC} >/etc/timezone
-
 # Put the configuration and apps into volumes
 ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null
 ln -sf /apps2 /nextcloud &>/dev/null
diff --git a/nextcloud/10.0/setup.sh b/nextcloud/10.0/setup.sh
index a3059df..b6d9d92 100755
--- a/nextcloud/10.0/setup.sh
+++ b/nextcloud/10.0/setup.sh
@@ -80,7 +80,6 @@ echo "Automatic configuration finished."
 # * We need to set the logdateformat to something that will work correctly with fail2ban
 # Use PHP to read the settings file, modify it, and write out the new settings array.
 
-TIMEZONE=$(cat /etc/timezone)
 CONFIG_TEMP=$(/bin/mktemp)
 php7 <<EOF > $CONFIG_TEMP && mv $CONFIG_TEMP $CONFIGFILE
 <?php
@@ -92,7 +91,7 @@ include("/config/config.php");
 //\$CONFIG['overwrite.cli.url'] = '/cloud';
 \$CONFIG['mail_from_address'] = 'administrator'; # just the local part, matches our master administrator address
 
-\$CONFIG['logtimezone'] = '$TIMEZONE';
+\$CONFIG['logtimezone'] = '$TZ';
 \$CONFIG['logdateformat'] = 'Y-m-d H:i:s';
 
 echo "<?php\n\\\$CONFIG = ";
diff --git a/nextcloud/daily/Dockerfile b/nextcloud/daily/Dockerfile
index a3145cc..70cdbc8 100644
--- a/nextcloud/daily/Dockerfile
+++ b/nextcloud/daily/Dockerfile
@@ -8,7 +8,7 @@ ENV UID=991 GID=991 \
     APC_SHM_SIZE=128M \
     OPCACHE_MEM_SIZE=128 \
     CRON_PERIOD=15m \
-    TZ=Europe/Berlin \
+    TZ=Etc/UTC \
     DB_TYPE=sqlite3 \
     ADMIN_USER=admin \
     ADMIN_PASSWORD=admin
@@ -30,6 +30,7 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
     libsmbclient \
     samba-client \
     su-exec \
+    tzdata \
     php7@commuedge \
     php7-fpm@commuedge \
     php7-intl@commuedge \
diff --git a/nextcloud/daily/run.sh b/nextcloud/daily/run.sh
index 280907e..16b4785 100644
--- a/nextcloud/daily/run.sh
+++ b/nextcloud/daily/run.sh
@@ -5,8 +5,6 @@ sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf /etc/ph
        -e "s/<OPCACHE_MEM_SIZE>/$OPCACHE_MEM_SIZE/g" /etc/php7/conf.d/00_opcache.ini \
        -e "s/<CRON_PERIOD>/$CRON_PERIOD/g" /etc/s6.d/cron/run
 
-echo ${TZ:-UTC} >/etc/timezone
-
 # Put the configuration and apps into volumes
 ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null
 ln -sf /apps2 /nextcloud &>/dev/null
diff --git a/nextcloud/daily/setup.sh b/nextcloud/daily/setup.sh
index a3059df..b6d9d92 100755
--- a/nextcloud/daily/setup.sh
+++ b/nextcloud/daily/setup.sh
@@ -80,7 +80,6 @@ echo "Automatic configuration finished."
 # * We need to set the logdateformat to something that will work correctly with fail2ban
 # Use PHP to read the settings file, modify it, and write out the new settings array.
 
-TIMEZONE=$(cat /etc/timezone)
 CONFIG_TEMP=$(/bin/mktemp)
 php7 <<EOF > $CONFIG_TEMP && mv $CONFIG_TEMP $CONFIGFILE
 <?php
@@ -92,7 +91,7 @@ include("/config/config.php");
 //\$CONFIG['overwrite.cli.url'] = '/cloud';
 \$CONFIG['mail_from_address'] = 'administrator'; # just the local part, matches our master administrator address
 
-\$CONFIG['logtimezone'] = '$TIMEZONE';
+\$CONFIG['logtimezone'] = '$TZ';
 \$CONFIG['logdateformat'] = 'Y-m-d H:i:s';
 
 echo "<?php\n\\\$CONFIG = ";