diff --git a/setup/so-functions b/setup/so-functions
index 1a1eb1919..fc0876248 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -2372,6 +2372,13 @@ set_redirect() {
 			;;
 	esac
 }
+
+set_timezone() {
+
+	logCmd "timedatectl set-timezone Etc/UTC"
+
+}
+
 so_add_user() {
 	local username=$1
 	local uid=$2
diff --git a/setup/so-setup b/setup/so-setup
index d048cc8bc..6bca72ab7 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -576,6 +576,7 @@ if ! [[ -f $install_opt_file ]]; then
 	fi
 
 	if [[ $waitforstate ]]; then
+		set_timezone
 		touch /root/accept_changes
 		make_some_dirs
 		percentage=0
@@ -725,6 +726,7 @@ if ! [[ -f $install_opt_file ]]; then
 		systemctl restart salt-minion
 		verify_setup
 	else
+		set_timezone
 		touch /root/accept_changes
 		mkdir -p /opt/so
 		es_heapsize