diff --git a/board/common/cleanups.sh b/board/common/cleanups.sh
index b5b34a4a23..3aa5ab3943 100755
--- a/board/common/cleanups.sh
+++ b/board/common/cleanups.sh
@@ -210,6 +210,7 @@ rm -f ${TARGET}/etc/init.d/S20urandom
 rm -f ${TARGET}/etc/init.d/S21rngd
 rm -f ${TARGET}/etc/init.d/S48sntp
 rm -f ${TARGET}/etc/init.d/S49ntp
+rm -f ${TARGET}/etc/init.d/S49chrony
 rm -f ${TARGET}/etc/init.d/S50sshd
 rm -f ${TARGET}/etc/init.d/S50proftpd
 rm -f ${TARGET}/etc/init.d/S50postgresql
diff --git a/board/common/overlay/etc/init.d/S50date b/board/common/overlay/etc/init.d/S50date
index ec434993d6..f32451a78b 100755
--- a/board/common/overlay/etc/init.d/S50date
+++ b/board/common/overlay/etc/init.d/S50date
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PROG_DATE="/bin/date"
-PROG_NTPD="/usr/sbin/ntpd"
+PROG_NTPD="/usr/sbin/chronyd"
 PROG_SNTP="/usr/bin/sntp"
 LOG_SNTP="/var/log/sntp.log"
 
@@ -47,7 +47,11 @@ set_current_date_http() {
 }
 
 set_current_date_ntp() {
-    ${PROG_NTPD} -gq &>/dev/null
+    if [[ -n "${DATE_NTP_SERVER}" ]]; then
+        sed -i "s/pool .*/pool ${DATE_NTP_SERVER} iburst/" ${NTP_CONF}
+    fi
+
+    ${PROG_NTPD} -f ${NTP_CONF} -q -t ${DATE_TIMEOUT} &>/dev/null
     if [[ $? == 0 ]]; then
         logger -t date "current system date/time set to $(date) via NTP"
         return 0
@@ -58,8 +62,8 @@ set_current_date_ntp() {
 }
 
 set_current_date_sntp() {
-    sntp_args="-t ${DATE_TIMEOUT} -K /var/lib/ntp/kod -Ss"
-    server=$(cat ${NTP_CONF} | grep server | head -n 1 | cut -d ' ' -f 2)
+    sntp_args="-t ${DATE_TIMEOUT} -K /dev/null -Ss"
+    server=$(cat ${NTP_CONF} | grep pool | head -n 1 | cut -d ' ' -f 2)
     ${PROG_SNTP} ${sntp_args} ${server} &>${LOG_SNTP}
     if [[ $? == 0 ]]; then
         logger -t date "current system date/time set to $(date) via SNTP"
@@ -94,32 +98,22 @@ start_http() {
 }
 
 start_ntp() {
-    mkdir -p /var/lib/ntp
-    touch /var/lib/ntp/kod
-
-    cat ${NTP_CONF} | grep -v iburst > ${NTP_CONF}.tmp
-
     if [[ -n "${DATE_NTP_SERVER}" ]]; then
-        echo "server ${DATE_NTP_SERVER} iburst" > ${NTP_CONF}
-    else
-        cat ${SYS_NTP_CONF} | grep iburst > ${NTP_CONF}
+        sed -i "s/pool .*/pool ${DATE_NTP_SERVER} iburst/" ${NTP_CONF}
     fi
 
-    cat ${NTP_CONF}.tmp >> ${NTP_CONF}
-    rm ${NTP_CONF}.tmp
-
     if [[ "${DATE_METHOD}" == "sntp" ]]; then
         msg_begin "Setting current date using SNTP"
         set_current_date_sntp
         test $? == 0 && msg_done "$(${PROG_DATE})" || msg_fail
     else # assuming ntp
         msg_begin "Setting current date using NTP"
-        set_current_date_ntp || set_current_date_ntp
+        set_current_date_ntp
         test $? == 0 && msg_done "$(${PROG_DATE})" || msg_fail
     fi
 
     msg_begin "Starting ntpd"
-    ${PROG_NTPD} -g -c ${NTP_CONF}
+    ${PROG_NTPD} -f ${NTP_CONF}
     test $? == 0 && msg_done || msg_fail
 }
 
diff --git a/board/common/overlay/etc/ntp.conf b/board/common/overlay/etc/ntp.conf
index 55e387c0a8..75ee7fa6f4 100644
--- a/board/common/overlay/etc/ntp.conf
+++ b/board/common/overlay/etc/ntp.conf
@@ -1,14 +1,6 @@
-tinker panic 0
-
-server 0.pool.ntp.org iburst
-server 1.pool.ntp.org iburst
-server 2.pool.ntp.org iburst
-
-server 127.127.1.0
-fudge 127.127.1.0 stratum 10
-
-restrict default noquery nopeer
-restrict 127.0.0.1
-restrict ::1
-
-driftfile /var/lib/ntp/ntp.drift
+pool pool.ntp.org iburst
+driftfile /var/lib/chrony.drift
+makestep 1000 10
+rtcsync
+hwclockfile /data/etc/adjtime
+log tracking
diff --git a/configs/bananapim1_defconfig b/configs/bananapim1_defconfig
index 18c03d5d89..4c3682f53d 100644
--- a/configs/bananapim1_defconfig
+++ b/configs/bananapim1_defconfig
@@ -81,6 +81,7 @@ BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE_UCP=y
 BR2_PACKAGE_SEMVER_SORT=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_CHRONY=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
@@ -95,6 +96,7 @@ BR2_PACKAGE_NET_TOOLS=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
+# BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_PROFTPD=y
diff --git a/configs/nanopineo2_defconfig b/configs/nanopineo2_defconfig
index 55354c6e3c..c76582c2a0 100644
--- a/configs/nanopineo2_defconfig
+++ b/configs/nanopineo2_defconfig
@@ -73,6 +73,7 @@ BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE_UCP=y
 BR2_PACKAGE_SEMVER_SORT=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_CHRONY=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
@@ -87,6 +88,7 @@ BR2_PACKAGE_NET_TOOLS=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
+# BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_PROFTPD=y
diff --git a/configs/nanopineo_defconfig b/configs/nanopineo_defconfig
index 4d289ba01c..3d5109dc12 100644
--- a/configs/nanopineo_defconfig
+++ b/configs/nanopineo_defconfig
@@ -73,6 +73,7 @@ BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE_UCP=y
 BR2_PACKAGE_SEMVER_SORT=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_CHRONY=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
@@ -86,6 +87,7 @@ BR2_PACKAGE_NET_TOOLS=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
+# BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_PROFTPD=y
diff --git a/configs/nanopir1_defconfig b/configs/nanopir1_defconfig
index 41f07e856e..68fce1c4fd 100644
--- a/configs/nanopir1_defconfig
+++ b/configs/nanopir1_defconfig
@@ -52,6 +52,7 @@ BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_PCRE_UCP=y
 BR2_PACKAGE_SEMVER_SORT=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_CHRONY=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
@@ -62,6 +63,7 @@ BR2_PACKAGE_NET_TOOLS=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
+# BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
diff --git a/configs/odroidxu4_defconfig b/configs/odroidxu4_defconfig
index 03362b6bea..fdaadb797a 100644
--- a/configs/odroidxu4_defconfig
+++ b/configs/odroidxu4_defconfig
@@ -76,6 +76,7 @@ BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE_UCP=y
 BR2_PACKAGE_SEMVER_SORT=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_CHRONY=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
@@ -90,6 +91,7 @@ BR2_PACKAGE_NET_TOOLS=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
+# BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_PROFTPD=y
diff --git a/configs/orangepione_defconfig b/configs/orangepione_defconfig
index 9b25348b08..508c630b0f 100644
--- a/configs/orangepione_defconfig
+++ b/configs/orangepione_defconfig
@@ -76,6 +76,7 @@ BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE_UCP=y
 BR2_PACKAGE_SEMVER_SORT=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_CHRONY=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
@@ -90,6 +91,7 @@ BR2_PACKAGE_NET_TOOLS=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
+# BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_PROFTPD=y
diff --git a/configs/orangepizero_defconfig b/configs/orangepizero_defconfig
index e22525fcb6..fce4da7122 100644
--- a/configs/orangepizero_defconfig
+++ b/configs/orangepizero_defconfig
@@ -76,6 +76,7 @@ BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE_UCP=y
 BR2_PACKAGE_SEMVER_SORT=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_CHRONY=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
@@ -90,6 +91,7 @@ BR2_PACKAGE_NET_TOOLS=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
+# BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_PROFTPD=y
diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
index 76bc72d2d5..5e76e0d0ec 100644
--- a/configs/raspberrypi2_defconfig
+++ b/configs/raspberrypi2_defconfig
@@ -83,6 +83,7 @@ BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_SEMVER_SORT=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_CHRONY=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
@@ -97,6 +98,7 @@ BR2_PACKAGE_NET_TOOLS=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
+# BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_PROFTPD=y
diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig
index 06e0b3cca7..0e1b0a0994 100644
--- a/configs/raspberrypi3_defconfig
+++ b/configs/raspberrypi3_defconfig
@@ -84,6 +84,7 @@ BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE_UCP=y
 BR2_PACKAGE_SEMVER_SORT=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_CHRONY=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
@@ -98,6 +99,7 @@ BR2_PACKAGE_NET_TOOLS=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
+# BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_PROFTPD=y
diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig
index ce0a4915e8..a8484b8978 100644
--- a/configs/raspberrypi4_defconfig
+++ b/configs/raspberrypi4_defconfig
@@ -83,6 +83,7 @@ BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_SEMVER_SORT=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_CHRONY=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
@@ -97,6 +98,7 @@ BR2_PACKAGE_NET_TOOLS=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
+# BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_PROFTPD=y
diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
index cb0954e38d..41c0006433 100644
--- a/configs/raspberrypi_defconfig
+++ b/configs/raspberrypi_defconfig
@@ -91,6 +91,7 @@ BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_SEMVER_SORT=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_CHRONY=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
@@ -105,6 +106,7 @@ BR2_PACKAGE_NET_TOOLS=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
+# BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_PROFTPD=y
diff --git a/configs/tinkerboard_defconfig b/configs/tinkerboard_defconfig
index cf3942899d..826bd5d42b 100644
--- a/configs/tinkerboard_defconfig
+++ b/configs/tinkerboard_defconfig
@@ -77,6 +77,7 @@ BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE_UCP=y
 BR2_PACKAGE_SEMVER_SORT=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_CHRONY=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
@@ -91,6 +92,7 @@ BR2_PACKAGE_NET_TOOLS=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
+# BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_PROFTPD=y