diff --git a/userspace/base_setup.sh b/userspace/base_setup.sh
index ebf82ad..9d79e99 100755
--- a/userspace/base_setup.sh
+++ b/userspace/base_setup.sh
@@ -58,7 +58,6 @@ apt-fast install --no-install-recommends -yq \
     build-essential \
     bzip2 \
     curl \
-    chrony \
     cpuset \
     dfu-util \
     evtest \
@@ -97,6 +96,7 @@ apt-fast install --no-install-recommends -yq \
     sshfs \
     sudo \
     systemd-resolved \
+    systemd-timesyncd \
     traceroute \
     tk-dev \
     ubuntu-minimal \
@@ -110,9 +110,6 @@ apt-fast install --no-install-recommends -yq \
 
 rm -rf /var/lib/apt/lists/*
 
-# Allow chrony to make a big adjustment to system time on boot
-echo "makestep 0.1 3" >> /etc/chrony/chrony.conf
-
 # Create dirs
 mkdir /data && chown $USERNAME:$USERNAME /data
 mkdir /persist && chown $USERNAME:$USERNAME /persist