diff --git a/nixos/systems/tewi/home-assistant.nix b/nixos/systems/tewi/home-assistant.nix
index 2ca606d6..b32bc679 100644
--- a/nixos/systems/tewi/home-assistant.nix
+++ b/nixos/systems/tewi/home-assistant.nix
@@ -48,6 +48,20 @@
     field = "iphone-se-irk";
   };
 
+  secrets.files.home-assistant-scenes = {
+    text = builtins.toJSON {
+    };
+    owner = "hass";
+    group = "hass";
+  };
+
+  secrets.files.home-assistant-automations = {
+    text = builtins.toJSON {
+    };
+    owner = "hass";
+    group = "hass";
+  };
+
 
   secrets.files.home-assistant-secrets = {
     text = builtins.toJSON {
@@ -63,6 +77,8 @@
   systemd.services.home-assistant = {
     preStart = lib.mkBefore ''
       cp --no-preserve=mode ${config.secrets.files.home-assistant-secrets.path} ${config.services.home-assistant.configDir}/secrets.yaml
+      cp --no-preserve=mode ${config.secrets.files.home-assistant-scenes.path} ${config.services.home-assistant.configDir}/scenes.yaml
+      cp --no-preserve=mode ${config.secrets.files.home-assistant-automations.path} ${config.services.home-assistant.configDir}/automations.yaml
       cp --no-preserve=mode ${config.secrets.files.ha-integration.path} ${config.services.home-assistant.configDir}/integration.yaml
       '';
   };
@@ -154,7 +170,7 @@
         } // args;
       in [
         (mkESPresenceBeacon {
-          device_id = "!secret iphone_se_irk";
+          device_id = "!secret iphone-se-irk";
           name = "iPhone SE";
           timeout = 2;
           away_timeout = 120;
diff --git a/tf b/tf
index 158e27e7..8581ec83 160000
--- a/tf
+++ b/tf
@@ -1 +1 @@
-Subproject commit 158e27e798d8808a0a54127122a6ceaffa2b12a7
+Subproject commit 8581ec839aa3232215200e277a19af3d1eaef888