diff --git a/hosts/architect/default.nix b/hosts/architect/default.nix
index ee13021..0322b11 100644
--- a/hosts/architect/default.nix
+++ b/hosts/architect/default.nix
@@ -23,9 +23,7 @@ in
     ./sunshine.nix
     ./postgres.nix
     ./netdata.nix
-    ./homeassistant.nix
     ./searx.nix
-    ./homeassistant.nix
   ];
 
   age.identityPaths = [ "/root/.ssh/id_ed25519" ];
@@ -128,6 +126,61 @@ in
       };
     };
 
+    pepe.services.homeassistant = {
+      enable = true;
+      package = pkgs.unstablePkgs.home-assistant;
+      domain = "home.giugl.io";
+      extraComponents = [
+        "otbr"
+        "litterrobot"
+        "apple_tv"
+        "homekit"
+        "homekit_controller"
+        "spotify"
+        "hue"
+        "sonos"
+        "tplink"
+        "ollama"
+        "wyoming"
+        "whisper"
+        "piper"
+        "isal"
+        "radarr"
+        "sonarr"
+        "mqtt"
+        "mqtt_eventstream"
+        "mqtt_json"
+        "mqtt_room"
+        "mqtt_statestream"
+        "github"
+        "webostv"
+        "reolink"
+        "onvif"
+        "xiaomi_miio"
+        "ring"
+      ];
+      extraPackages = python3Packages: with pkgs.unstablePkgs.python3Packages; [
+        pyporscheconnectapi
+      ];
+      config = {
+        http = {
+          server_host = "127.0.0.1";
+          server_port = 8123;
+          use_x_forwarded_for = true;
+          trusted_proxies = [ "127.0.0.1" ];
+        };
+        homeassistant = {
+          name = "Brigettine Square";
+          latitude = 52.1958;
+          longitude = 0.180746;
+          unit_system = "metric";
+        };
+        default_config = { };
+        automation = "!include automations.yaml";
+        frontend.themes = "!include_dir_merge_named themes";
+      };
+    };
+
     services = {
       gitea = {
         enable = true;