diff --git a/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/boot.mount b/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/boot.mount
new file mode 100644
index 0000000..210a26d
--- /dev/null
+++ b/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/boot.mount
@@ -0,0 +1,11 @@
+[Unit]
+Description=U-Boot (/boot)
+DefaultDependencies=no
+Conflicts=umount.target
+Before=local-fs.target umount.target
+
+[Mount]
+What=/dev/mmcblk1p1
+Where=/boot
+Type=vfat
+Options=noauto,nodev
diff --git a/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/local-fs.target.wants/boot.mount b/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/local-fs.target.wants/boot.mount
new file mode 120000
index 0000000..6308030
--- /dev/null
+++ b/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/local-fs.target.wants/boot.mount
@@ -0,0 +1 @@
+../boot.mount
\ No newline at end of file
diff --git a/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/multi-user.target.wants/save-machineid-to-uboot.service b/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/multi-user.target.wants/save-machineid-to-uboot.service
new file mode 120000
index 0000000..b60a4f9
--- /dev/null
+++ b/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/multi-user.target.wants/save-machineid-to-uboot.service
@@ -0,0 +1 @@
+../save-machineid-to-uboot.service
\ No newline at end of file
diff --git a/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/multi-user.target.wants/systemd-journal-upload.service b/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/multi-user.target.wants/systemd-journal-upload.service
new file mode 120000
index 0000000..f70515b
--- /dev/null
+++ b/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/multi-user.target.wants/systemd-journal-upload.service
@@ -0,0 +1 @@
+../systemd-journal-upload.service
\ No newline at end of file
diff --git a/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/save-machineid-to-uboot.service b/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/save-machineid-to-uboot.service
new file mode 100644
index 0000000..892411b
--- /dev/null
+++ b/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/save-machineid-to-uboot.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Save the machine-id into U-Boot environment if not set
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c 'fw_printenv machineid &>/dev/null || fw_setenv machineid $(cat /etc/machine-id)'
diff --git a/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/systemd-journal-upload.service b/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/systemd-journal-upload.service
new file mode 100644
index 0000000..f173525
--- /dev/null
+++ b/board/czechlight/beaglebone/overlay/usr/lib/systemd/system/systemd-journal-upload.service
@@ -0,0 +1,43 @@
+# CzechLight-specific configuration:
+#
+# - do not record a failed unit when that thing dies (likely due to a network issue)
+# - only start when a custom config file exists
+# - do not bring in a network-online.target because that might trigger
+#   extra failure reports (and a watchdog action)
+# - keep retrying upon failure(s)
+
+[Unit]
+Description=Journal Remote Upload Service
+
+[Service]
+DynamicUser=yes
+LockPersonality=yes
+MemoryDenyWriteExecute=yes
+PrivateDevices=yes
+ProtectControlGroups=yes
+ProtectHome=yes
+ProtectHostname=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
+RestrictNamespaces=yes
+RestrictRealtime=yes
+StateDirectory=systemd/journal-upload
+SupplementaryGroups=systemd-journal
+SystemCallArchitectures=native
+User=systemd-journal-upload
+WatchdogSec=3min
+LimitNOFILE=524288
+
+# - ignore failures
+# - read (one) location from the env file
+ExecStart=-/usr/lib/systemd/systemd-journal-upload --save-state --url=${DESTINATION}
+EnvironmentFile=-/cfg/journald-remote
+
+# run forever and ignore any network issues
+Restart=always
+RestartSec=5
+
+[Unit]
+# shared as an env file
+ConditionFileNotEmpty=/cfg/journald-remote