diff --git a/rootfs/standard/usr/bin/mynode_post_upgrade.sh b/rootfs/standard/usr/bin/mynode_post_upgrade.sh
index c37dc226..54f34315 100755
--- a/rootfs/standard/usr/bin/mynode_post_upgrade.sh
+++ b/rootfs/standard/usr/bin/mynode_post_upgrade.sh
@@ -161,9 +161,13 @@ if ! skip_base_upgrades ; then
         $TORIFY apt-get -y install cloud-init
     fi
 
-    # Make sure some software is removed
+    # Use timesyncd for NTP
     apt-get -y purge ntp # (conflicts with systemd-timedatectl)
     apt-get -y purge chrony # (conflicts with systemd-timedatectl)
+    if [ $IS_ARMBIAN = 1 ] ; then
+        $TORIFY apt-get -y install systemd-timesyncd
+        timedatectl set-ntp true
+    fi
 
 
     # Install nginx
diff --git a/setup/setup_device.sh b/setup/setup_device.sh
index 5b6801f9..b57cc853 100755
--- a/setup/setup_device.sh
+++ b/setup/setup_device.sh
@@ -241,6 +241,10 @@ fi
 if [ $IS_X86 = 1 ]; then
     apt-get -y install cloud-init
 fi
+if [ $IS_ARMBIAN = 1 ] ; then
+    apt-get -y install systemd-timesyncd
+    timedatectl set-ntp true
+fi
 
 # Make sure some software is removed
 apt-get -y purge ntp # (conflicts with systemd-timedatectl)