diff --git a/data/com.steampowered.SteamOSManager1.conf b/data/system/com.steampowered.SteamOSManager1.conf
similarity index 100%
rename from data/com.steampowered.SteamOSManager1.conf
rename to data/system/com.steampowered.SteamOSManager1.conf
diff --git a/data/com.steampowered.SteamOSManager1.service b/data/system/com.steampowered.SteamOSManager1.service
similarity index 100%
rename from data/com.steampowered.SteamOSManager1.service
rename to data/system/com.steampowered.SteamOSManager1.service
diff --git a/data/steamos-manager.service b/data/system/steamos-manager.service
similarity index 100%
rename from data/steamos-manager.service
rename to data/system/steamos-manager.service
diff --git a/data/user/com.steampowered.SteamOSManager1.service b/data/user/com.steampowered.SteamOSManager1.service
new file mode 100644
index 0000000..fccfb36
--- /dev/null
+++ b/data/user/com.steampowered.SteamOSManager1.service
@@ -0,0 +1,6 @@
+[D-BUS Service]
+Name=com.steampowered.SteamOSManager1
+Exec=/usr/lib/steamos-manager
+User=root
+SystemdService=steamos-manager.service
+
diff --git a/data/user-steamos-manager.service b/data/user/steamos-manager.service
similarity index 100%
rename from data/user-steamos-manager.service
rename to data/user/steamos-manager.service