diff --git a/package/czechlight-cfg-fs/cfg-restore-sysrepo.service b/package/czechlight-cfg-fs/cfg-restore-sysrepo.service
index c990d56..9fe0c8a 100644
--- a/package/czechlight-cfg-fs/cfg-restore-sysrepo.service
+++ b/package/czechlight-cfg-fs/cfg-restore-sysrepo.service
@@ -7,6 +7,7 @@
 
 [Service]
 Type=oneshot
+RemainAfterExit=yes
 ExecStart=/bin/sysrepocfg -d startup -f json --import=/cfg/sysrepo/startup.json
 ExecStart=/bin/sysrepocfg -C startup
 
diff --git a/package/czechlight-cfg-fs/openssh-persistent-keys.service b/package/czechlight-cfg-fs/openssh-persistent-keys.service
index d75b616..48e9bd3 100644
--- a/package/czechlight-cfg-fs/openssh-persistent-keys.service
+++ b/package/czechlight-cfg-fs/openssh-persistent-keys.service
@@ -6,6 +6,7 @@
 
 [Service]
 Type=oneshot
+RemainAfterExit=yes
 ExecStartPre=/bin/mkdir -p /cfg/etc/ssh
 ExecStart=/bin/sh -c 'cp -a /etc/ssh/ssh_host_*_key* /cfg/etc/ssh/'