diff --git a/modules/homelab/services/smarthome/homeassistant/default.nix b/modules/homelab/services/smarthome/homeassistant/default.nix
index 9575325..4f0fd5e 100644
--- a/modules/homelab/services/smarthome/homeassistant/default.nix
+++ b/modules/homelab/services/smarthome/homeassistant/default.nix
@@ -23,7 +23,7 @@ in
     };
     data_dir = lib.mkOption {
       type = lib.types.str;
-      default = "/var/lib/hass";
+      default = "/var/lib/${service}";
       description = "set data directory for ${service}";
     };
     ids = lib.mkOption {
@@ -77,8 +77,8 @@ in
     # override umask to make permissions work out
     systemd.services.${service}.serviceConfig = {
       UMask = lib.mkForce "0007";
-#      User = lib.mkForce "${service}";
-#      Group = lib.mkForce "${service}";
+      User = lib.mkForce "${service}";
+      Group = lib.mkForce "${service}";
     };
 
 #    # open firewall