diff --git a/script/home-assistant@.service b/script/home-assistant@.service
index 6f0f767cddf..983844a95a3 100644
--- a/script/home-assistant@.service
+++ b/script/home-assistant@.service
@@ -1,13 +1,14 @@
-# This is a simple service file for systems with systemd.
+# This is a simple service file for systems with systemd to tun HA as user.
 #
 [Unit]
-Description=Home Assistant
+Description=Home Assistant for %i
 After=network.target
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/hass --config /root/.homeassistant
+User=%i
+WorkingDirectory=%h
+ExecStart=/usr/bin/hass --config %h/.homeassistant/
 
 [Install]
 WantedBy=multi-user.target
-