diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
index 624a65052..cdfc6e56e 100644
--- a/units/kmod-static-nodes.service.in
+++ b/units/kmod-static-nodes.service.in
@@ -12,5 +12,6 @@ Before=sysinit.target systemd-tmpfiles-setup-dev.service
 
 [Service]
 Type=oneshot
+RemainAfterExit=yes
 ExecStartPre=@MKDIR_P@ /run/tmpfiles.d
 ExecStart=@KMOD@ static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
diff --git a/units/systemd-tmpfiles-setup-dev.service.in b/units/systemd-tmpfiles-setup-dev.service.in
index 5c45d3465..579e7c6a4 100644
--- a/units/systemd-tmpfiles-setup-dev.service.in
+++ b/units/systemd-tmpfiles-setup-dev.service.in
@@ -14,5 +14,5 @@ ConditionCapability=CAP_MKNOD
 
 [Service]
 Type=oneshot
-RemainAfterExit=true
+RemainAfterExit=yes
 ExecStart=@rootbindir@/systemd-tmpfiles --prefix=/dev --create