diff --git a/fedora-rpi.ks b/fedora-rpi.ks
index 5a0bebe..a5d84cb 100644
--- a/fedora-rpi.ks
+++ b/fedora-rpi.ks
@@ -26,4 +26,13 @@ uboot-images-armv8
 cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
 
 grubby --args='quiet systemd.show_status=1' --update-kernel=ALL
+
+systemctl enable chrony-wait
+# Ensure clock is synchronized before trying to get host certs signed
+mkdir -p /etc/systemd/system/ssh-host-cert-sign@.service.d
+cat > /etc/systemd/system/ssh-host-cert-sign@.service.d/time-sync.conf <<EOF
+[Unit]
+After=time-sync.target
+Wants=time-sync.target
+EOF
 %end