diff --git a/packages/sysutils/systemd/system.d/debugconfig.service b/packages/sysutils/systemd/system.d/debugconfig.service
index b6885cce35..e77759b5e9 100644
--- a/packages/sysutils/systemd/system.d/debugconfig.service
+++ b/packages/sysutils/systemd/system.d/debugconfig.service
@@ -1,15 +1,14 @@
 [Unit]
 Description=Setup debug config
 DefaultDependencies=no
-Before=local-fs.target shutdown.target
-Conflicts=shutdown.target
-
+After=systemd-tmpfiles-setup.service
 ConditionKernelCommandLine=|debugging
 ConditionPathExists=|/storage/.cache/debug.openelec
 
 [Service]
 Type=oneshot
-ExecStart=/bin/sh -c 'mkdir -p /run/openelec/debug; cp /usr/share/debugconf/*.conf /run/openelec/debug'
+ExecStart=/bin/sh -c 'cp /usr/share/debugconf/*.conf /run/openelec/debug'
+RemainAfterExit=yes
 
 [Install]
-WantedBy=local-fs.target
+WantedBy=sysinit.target