diff --git a/scripts/cloudron-setup b/scripts/cloudron-setup
index a9f39db22..1079d762e 100755
--- a/scripts/cloudron-setup
+++ b/scripts/cloudron-setup
@@ -206,6 +206,11 @@ if ! /bin/bash "${box_src_tmp_dir}/scripts/installer.sh" --data-file "${DATA_FIL
 fi
 rm "${DATA_FILE}"
 
+echo "=> Configuring host"
+sed -e 's/^#NTP=/NTP=0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org/' -i /etc/systemd/timesyncd.conf
+timedatectl set-ntp 1
+timedatectl set-timezone UTC
+
 echo -n "=> Waiting for cloudron to be ready (this takes some time) ..."
 while true; do
     echo -n "."
diff --git a/setup/start.sh b/setup/start.sh
index 17d63196e..a2f86efcc 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -18,12 +18,6 @@ readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 source "${script_dir}/argparser.sh" "$@" # this injects the arg_* variables used below
 
-echo "==> Configuring host"
-sed -e 's/^#NTP=/NTP=0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org/' -i /etc/systemd/timesyncd.conf
-timedatectl set-ntp 1
-timedatectl set-timezone UTC
-hostnamectl set-hostname "${arg_admin_fqdn}"
-
 echo "==> Configuring docker"
 cp "${script_dir}/start/docker-cloudron-app.apparmor" /etc/apparmor.d/docker-cloudron-app
 systemctl enable apparmor