diff --git a/YaST2-Firstboot.service b/YaST2-Firstboot.service
index db15bf1..8cdb491 100644
--- a/YaST2-Firstboot.service
+++ b/YaST2-Firstboot.service
@@ -2,14 +2,17 @@
 Description=YaST2 Firstboot
 After=apparmor.service local-fs.target YaST2-Second-Stage.service
 Before=getty@tty1.service xdm.service
-ConditionPathExists=/var/lib/YaST2/reconfig_system
+ConditionPathExists=|/var/lib/YaST2/reconfig_system
+ConditionPathExists=|/run/systemd/keep_running
 
 [Service]
 Type=oneshot
-#TTYPath=/var/lib/YaST2/run_suseconfig
-#StandardOutput=tty
+ExecStartPre=/bin/touch /run/systemd/keep_running
 ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot
 ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system
+ExecStartPost=/bin/rm -f /run/systemd/keep_running
+TimeoutSec=0
+RemainAfterExit=true
 
 [Install]
 WantedBy=default.target