diff --git a/config/configuration.yaml b/config/configuration.yaml
index 2977333..e92663d 100644
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -50,6 +50,10 @@ logbook:
     domains:
       - sun
       - automation
+      - fan
+      - media_player
+      - light
+      - input_boolean
 
 # https://www.home-assistant.io/components/map
 # map:
diff --git a/config/packages/modes/guest_mode.yaml b/config/packages/modes/guest_mode.yaml
index 79c8a9d..8cd6e14 100644
--- a/config/packages/modes/guest_mode.yaml
+++ b/config/packages/modes/guest_mode.yaml
@@ -50,7 +50,7 @@ automation:
         data:
           name: "⚙️ System Module · "
           message: "Telegram · Turning Guest mode on"
-          entity_id: input_boolean.guest_mode
+          domain: input_boolean
 
   - alias: Guest mode · Disable · From Telegram
     trigger:
@@ -69,4 +69,4 @@ automation:
         data:
           name: "⚙️ System Module · "
           message: "Telegram · Turning Guest mode off"
-          entity_id: input_boolean.guest_mode
+          domain: input_boolean
diff --git a/config/packages/modules/climate/purifier.yaml b/config/packages/modules/climate/purifier.yaml
index 7a59c42..c0cc864 100644
--- a/config/packages/modules/climate/purifier.yaml
+++ b/config/packages/modules/climate/purifier.yaml
@@ -272,7 +272,6 @@ automation:
         data:
           name: "💨 Climate module · "
           message: "Purifier On · Humidity is low"
-          entity_id: fan.philips_airpurifier
           domain: fan
 
   - alias: Purifier · Turn on · Low air quality
@@ -299,7 +298,6 @@ automation:
         data:
           name: "💨 Climate Module · "
           message: "Purifier On · Air quality is low"
-          entity_id: fan.philips_airpurifier
           domain: fan
       - condition: state
         entity_id: binary_sensor.purifier_out_of_water
@@ -316,7 +314,6 @@ automation:
         data:
           name: "💨 Climate Module · "
           message: "Purifier Function · Switching to humidification - there is water in the tank"
-          entity_id: fan.philips_airpurifier
           domain: fan
 
   - alias: Purifier · Turn off · Okay humidity
@@ -347,7 +344,6 @@ automation:
         data:
           name: "💨 Climate Module · "
           message: "Purifier Off · Humidity is okay"
-          entity_id: fan.philips_airpurifier
           domain: fan
 
 homeassistant:
diff --git a/config/packages/modules/lighting/state.yaml b/config/packages/modules/lighting/state.yaml
index f2a9e3d..3aa0299 100644
--- a/config/packages/modules/lighting/state.yaml
+++ b/config/packages/modules/lighting/state.yaml
@@ -17,7 +17,6 @@ automation:
         data:
           name: "💡 Lighting Module · "
           message: "Lights On · 30 mins to sunset"
-          entity_id: light.on_after_dark
           domain: light
 
   - alias: Lighting · Turn off all lights after sunrise
diff --git a/config/packages/modules/media/sonos.yaml b/config/packages/modules/media/sonos.yaml
index 27347c6..e2bfa66 100644
--- a/config/packages/modules/media/sonos.yaml
+++ b/config/packages/modules/media/sonos.yaml
@@ -81,7 +81,6 @@ automation:
         data:
           name: "🔊 Media Module · "
           message: "Sonos Mode · Putting Beam in night mode"
-          entity_id: media_player.living_room
           domain: media_player
 
   - alias: Media · Sonos · Put Beam in day mode
@@ -97,7 +96,6 @@ automation:
         data:
           name: "🔊 Media Module · "
           message: "Sonos Mode · Putting Beam in day mode"
-          entity_id: media_player.living_room
           domain: media_player
 
   - alias: Media · Sonos · Volume up on bathroom switch click
diff --git a/config/packages/modules/media/tv.yaml b/config/packages/modules/media/tv.yaml
index 1118dbf..fe63450 100644
--- a/config/packages/modules/media/tv.yaml
+++ b/config/packages/modules/media/tv.yaml
@@ -100,7 +100,6 @@ automation:
         data:
           name: "📺 Media Module · "
           message: "Sonos Group · TV off - joining Beam to Sonos Group"
-          entity_id: media_player.living_room
           domain: media_player
 
   - alias: TV · State · Sync on TV on
@@ -115,7 +114,6 @@ automation:
         data:
           name: "📺 Media Module · "
           message: "Sync TV state · Turning Shield on - TV is on"
-          entity_id: media_player.nvidia_shield
           domain: media_player
 
 
@@ -131,7 +129,6 @@ automation:
         data:
           name: "📺 Media Module · "
           message: "Sync TV state · Turning Shield off - TV is off"
-          entity_id: media_player.nvidia_shield
           domain: media_player
 
   - alias: TV · State · Sync on Shield on
@@ -150,7 +147,6 @@ automation:
         data:
           name: "📺 Media Module · "
           message: "Sync TV state · Turning TV on - Shield is on"
-          entity_id: media_player.living_room_tv
           domain: media_player
 
 
@@ -169,7 +165,6 @@ automation:
         data:
           name: "📺 Media Module · "
           message: "Sync TV state · Turning TV off - Shield is off"
-          entity_id: media_player.living_room_tv
           domain: media_player
 
 homeassistant: