diff --git a/templates/etc/systemd/system/homeassistant.service.j2 b/templates/etc/systemd/system/homeassistant.service.j2
index d851dcb..df8edab 100644
--- a/templates/etc/systemd/system/homeassistant.service.j2
+++ b/templates/etc/systemd/system/homeassistant.service.j2
@@ -2,14 +2,16 @@
 # {{ ansible_managed }}
 [Unit]
 Description=Home Assistant
+Wants=network-online.target
 After=network-online.target
 
 [Service]
 Type=simple
-User=homeassistant
+User={{ homeassistant_user }}
+Group={{ homeassistant_group }}
 ExecStart={{ homeassistant_base_dir }}/venv/bin/hass -c {{ homeassistant_conf_dir }}
 Restart=on-failure
 RestartSec=5s
 
 [Install]
-WantedBy=multi-user.targe
+WantedBy=multi-user.target