diff --git a/deployment/deploy.bash b/deployment/deploy.bash
index 96c6dda..741c7b6 100644
--- a/deployment/deploy.bash
+++ b/deployment/deploy.bash
@@ -8,10 +8,7 @@ if [[ `whoami` == "root" ]]; then
 fi
 ROOT_SQL_PASS=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
 CURUSER=$(whoami)
-echo "Etc/UTC" | sudo tee -a /etc/timezone
-sudo rm -rf /etc/localtime
-sudo ln -s /usr/share/zoneinfo/Zulu /etc/localtime
-sudo dpkg-reconfigure -f noninteractive tzdata
+sudo timedatectl set-timezone Etc/UTC
 sudo apt-get update
 sudo DEBIAN_FRONTEND=noninteractive apt-get -y upgrade
 sudo debconf-set-selections <<< "mysql-server mysql-server/root_password password $ROOT_SQL_PASS"
diff --git a/deployment/leaf.bash b/deployment/leaf.bash
index e7127ca..0c4940b 100644
--- a/deployment/leaf.bash
+++ b/deployment/leaf.bash
@@ -7,10 +7,7 @@ if [[ `whoami` == "root" ]]; then
     exit 1
 fi
 CURUSER=$(whoami)
-echo "Etc/UTC" | sudo tee -a /etc/timezone
-sudo rm -rf /etc/localtime
-sudo ln -s /usr/share/zoneinfo/Zulu /etc/localtime
-sudo dpkg-reconfigure -f noninteractive tzdata
+sudo timedatectl set-timezone Etc/UTC
 sudo apt-get update
 sudo DEBIAN_FRONTEND=noninteractive apt-get -y upgrade
 sudo DEBIAN_FRONTEND=noninteractive apt-get -y install git python-virtualenv python3-virtualenv curl ntp build-essential screen cmake pkg-config libboost-all-dev libevent-dev libunbound-dev libminiupnpc-dev libunwind8-dev liblzma-dev libldns-dev libexpat1-dev libgtest-dev libzmq3-dev