diff --git a/kas-pypcc-rpi.yml b/kas-pypcc-rpi.yml
index a107f293fdec279e9cdb5eed044a410f7719f413..f15ed3f54ce709f8f82ea60ae3df4e1124dcb420 100644
--- a/kas-pypcc-rpi.yml
+++ b/kas-pypcc-rpi.yml
@@ -86,7 +86,7 @@ local_conf_header:
     DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
     VIRTUAL-RUNTIME_init_manager = "systemd"
     VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
-    IMAGE_INSTALL:append = "nano pv bzip2 python3-pypcc python3-halibut-ipconfig vcgencmd dtc i2c-tools swupdate swupdate-www libgpiod libgpiod-tools libgpiod-dev kernel-module-i2c-gpio"
+    IMAGE_INSTALL:append = "ntp python3-pypcc python3-halibut-ipconfig vcgencmd dtc i2c-tools swupdate swupdate-www libgpiod libgpiod-tools libgpiod-dev kernel-module-i2c-gpio"
     IMAGE_FSTYPES = "tar.bz2 ext4 ext4.gz wic.bz2 wic.bmap"
     SWUPDATE_IMAGES_FSTYPES[core-image-full-cmdline] = ".ubifs"
     IMAGE_BOOT_FILES:append = "halibut.dtbo;overlays/halibut.dtbo"
diff --git a/recipes-support/ntp/ntp/ntp.conf b/recipes-support/ntp/ntp/ntp.conf
new file mode 100644
index 0000000000000000000000000000000000000000..3af27a56579ef9cc17853dc3ab03c332b2b8347d
--- /dev/null
+++ b/recipes-support/ntp/ntp/ntp.conf
@@ -0,0 +1 @@
+server 10.99.250.250 prefer
diff --git a/recipes-support/ntp/ntp_%.bbappend b/recipes-support/ntp/ntp_%.bbappend
new file mode 100644
index 0000000000000000000000000000000000000000..08dc5b6be5733210f14b5ad6db6fb85ace8302e2
--- /dev/null
+++ b/recipes-support/ntp/ntp_%.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += " \
+    file://ntp.conf \
+    "
diff --git a/recipes-support/swupdate/swupdate/rpi/defconfig b/recipes-support/swupdate/swupdate/rpi/defconfig
index 5a57f33466f8b734e9916708ffab328b99690799..e8523a3d680085e9e3045b172a6b09f94d3f3fa5 100644
--- a/recipes-support/swupdate/swupdate/rpi/defconfig
+++ b/recipes-support/swupdate/swupdate/rpi/defconfig
@@ -13,7 +13,7 @@ CONFIG_HAVE_DOT_CONFIG=y
 #
 CONFIG_CURL=y
 # CONFIG_CURL_SSL is not set
-CONFIG_SYSTEMD=n
+CONFIG_SYSTEMD=y
 CONFIG_SCRIPTS=y
 CONFIG_HW_COMPATIBILITY=y
 CONFIG_HW_COMPATIBILITY_FILE="/etc/hwrevision"
diff --git a/recipes-support/swupdate/swupdate_%.bbappend b/recipes-support/swupdate/swupdate_%.bbappend
index 5b39f32f4abd9a01b7319e2a1d85c5b889dfe3f8..cd962aa71b012132e4d8c0580f6d652ea1891202 100644
--- a/recipes-support/swupdate/swupdate_%.bbappend
+++ b/recipes-support/swupdate/swupdate_%.bbappend
@@ -4,3 +4,6 @@ SRC_URI += " \
     file://swupdate.cfg \
     file://defconfig \
     "
+
+DEPENDS += "systemd"
+RDEPENDS_${PN} = "systemd"
\ No newline at end of file