diff --git a/home-server.nix b/home-server.nix
index 85a513e..707ded7 100644
--- a/home-server.nix
+++ b/home-server.nix
@@ -23,7 +23,6 @@ in with builtins; {
     ./services/etebase.nix
     ./services/genie.nix
     ./services/home-assistant
-    ./services/esphome.nix
     ./services/watchtower.nix
     ./services/immich.nix
     ./services/miniflux.nix
diff --git a/services/home-assistant/default.nix b/services/home-assistant/default.nix
index 26099ff..61a3159 100644
--- a/services/home-assistant/default.nix
+++ b/services/home-assistant/default.nix
@@ -6,6 +6,8 @@ let
   port = config.services.home-assistant.config.http.server_port;
   geniePort = 3232;
 in {
+  imports = [ ./esphome.nix ];
+
   # just installed for ConBee firmware updates
   environment.systemPackages = with pkgs; [ deconz ];
 
diff --git a/services/esphome.nix b/services/home-assistant/esphome.nix
similarity index 91%
rename from services/esphome.nix
rename to services/home-assistant/esphome.nix
index f4480d4..3d32f09 100644
--- a/services/esphome.nix
+++ b/services/home-assistant/esphome.nix
@@ -7,7 +7,7 @@ let
   inherit (config.services.home-assistant) configDir;
   passwordFile = config.age.secrets.esphome-password.path;
 in {
-  age.secrets.esphome-password.file = ../secrets/esphome/password.age;
+  age.secrets.esphome-password.file = ../../secrets/esphome/password.age;
 
   services.nginx = {
     virtualHosts."esphome.felschr.com" = {