diff --git a/nextcloud/10.0/run.sh b/nextcloud/10.0/run.sh
index 16b4785..280907e 100644
--- a/nextcloud/10.0/run.sh
+++ b/nextcloud/10.0/run.sh
@@ -5,6 +5,8 @@ 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 4ebe925..a3059df 100755
--- a/nextcloud/10.0/setup.sh
+++ b/nextcloud/10.0/setup.sh
@@ -79,7 +79,6 @@ echo "Automatic configuration finished."
 #   users within the proper timeframe
 # * 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.
-echo ${TZ:-UTC} >/etc/timezone
 
 TIMEZONE=$(cat /etc/timezone)
 CONFIG_TEMP=$(/bin/mktemp)
diff --git a/nextcloud/daily/run.sh b/nextcloud/daily/run.sh
index 16b4785..280907e 100644
--- a/nextcloud/daily/run.sh
+++ b/nextcloud/daily/run.sh
@@ -5,6 +5,8 @@ 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 4ebe925..a3059df 100755
--- a/nextcloud/daily/setup.sh
+++ b/nextcloud/daily/setup.sh
@@ -79,7 +79,6 @@ echo "Automatic configuration finished."
 #   users within the proper timeframe
 # * 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.
-echo ${TZ:-UTC} >/etc/timezone
 
 TIMEZONE=$(cat /etc/timezone)
 CONFIG_TEMP=$(/bin/mktemp)