diff --git a/files/build_templates/ntp-config.timer b/files/build_templates/ntp-config.timer
new file mode 100644
index 0000000000..ab2d2e755a
--- /dev/null
+++ b/files/build_templates/ntp-config.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Delays NTP configuration service until SONiC has started
+
+[Timer]
+OnBootSec=5min
+Unit=ntp-config.service
+
+[Install]
+WantedBy=timers.target
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 4ef014a30e..8064b2d71b 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -302,7 +302,9 @@ sudo LANG=C cp $SCRIPTS_DIR/syncd.sh $FILESYSTEM_ROOT/usr/local/bin/syncd.sh
 # Copy systemd timer configuration
 # It implements delayed start of services
 sudo cp $BUILD_TEMPLATES/snmp.timer $FILESYSTEM_ROOT/etc/systemd/system/
+sudo cp $BUILD_TEMPLATES/ntp-config.timer $FILESYSTEM_ROOT/etc/systemd/system/
 sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable snmp.timer
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable ntp-config.timer
 
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get remove -y python-dev
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get clean -y