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
index 892411b..4a74b83 100644
--- 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
@@ -3,4 +3,5 @@
 
 [Service]
 Type=oneshot
+RemainAfterExit=yes
 ExecStart=/bin/sh -c 'fw_printenv machineid &>/dev/null || fw_setenv machineid $(cat /etc/machine-id)'
diff --git a/board/czechlight/clearfog/overlay/usr/lib/systemd/system/save-machineid-to-uboot.service b/board/czechlight/clearfog/overlay/usr/lib/systemd/system/save-machineid-to-uboot.service
index 892411b..4a74b83 100644
--- a/board/czechlight/clearfog/overlay/usr/lib/systemd/system/save-machineid-to-uboot.service
+++ b/board/czechlight/clearfog/overlay/usr/lib/systemd/system/save-machineid-to-uboot.service
@@ -3,4 +3,5 @@
 
 [Service]
 Type=oneshot
+RemainAfterExit=yes
 ExecStart=/bin/sh -c 'fw_printenv machineid &>/dev/null || fw_setenv machineid $(cat /etc/machine-id)'
diff --git a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-i2c-adt7463.service b/board/czechlight/common/overlay/usr/lib/systemd/system/cla-i2c-adt7463.service
index dde5b6b..c56b443 100644
--- a/board/czechlight/common/overlay/usr/lib/systemd/system/cla-i2c-adt7463.service
+++ b/board/czechlight/common/overlay/usr/lib/systemd/system/cla-i2c-adt7463.service
@@ -8,6 +8,7 @@
 
 [Service]
 Type=oneshot
+RemainAfterExit=yes
 
 # Configuration for two-wire fans (0b1111)
 ExecStart=/sbin/i2cset -y 1 0x2e 0x73 0x0f b