diff --git a/automation/domestina.yaml b/automation/domestina.yaml
index cf96969..d66cb83 100644
--- a/automation/domestina.yaml
+++ b/automation/domestina.yaml
@@ -19,9 +19,9 @@
     - service: input_boolean.turn_on
       entity_id: input_boolean.guest_mode
     - service: automation.turn_off
-      entity_id: automation.cube_knock
-    - service: automation.turn_off
-      entity_id: automation.cube_shake
+      entity_id:
+        - automation.cube_knock
+        - automation.cube_shake
 
 - alias: Trigger Domestina End
   trigger:
@@ -44,6 +44,6 @@
     - service: input_boolean.turn_off
       entity_id: input_boolean.guest_mode
     - service: automation.turn_on
-      entity_id: automation.cube_knock
-    - service: automation.turn_on
-      entity_id: automation.cube_shake
+      entity_id:
+        - automation.cube_knock
+        - automation.cube_shake
diff --git a/automation/guest_mode.yaml b/automation/guest_mode.yaml
index 3b4f8f4..e36d64a 100644
--- a/automation/guest_mode.yaml
+++ b/automation/guest_mode.yaml
@@ -7,9 +7,9 @@
     to: "on"
   action:
     - service: automation.turn_off
-      entity_id: automation.leaving_home
-    - service: automation.turn_off
-      entity_id: automation.coming_home
+      entity_id:
+        - automation.leaving_home
+        - automation.coming_home
     - service: input_boolean.turn_off
       entity_id: input_boolean.speech_notifications
 
@@ -22,8 +22,8 @@
     to: "off"
   action:
     - service: automation.turn_on
-      entity_id: automation.leaving_home
-    - service: automation.turn_on
-      entity_id: automation.coming_home
+      entity_id:
+        - automation.leaving_home
+        - automation.coming_home
     - service: input_boolean.turn_on
       entity_id: input_boolean.speech_notifications
diff --git a/automation/presence.yaml b/automation/presence.yaml
index 4ac794e..cc8e8f8 100644
--- a/automation/presence.yaml
+++ b/automation/presence.yaml
@@ -7,9 +7,9 @@
   action:
     - service: script.security_camera_on
     - service: media_player.turn_off
-      entity_id: media_player.living_room_tv
-    - service: media_player.turn_off
-      entity_id: media_player.living_room_tv_2
+      entity_id:
+        - media_player.living_room_tv
+        - media_player.living_room_tv_2
     - service: light.turn_off
       entity_id: light.living_room_all_lights
     - service: input_boolean.turn_off
diff --git a/automation/sleep_mode.yaml b/automation/sleep_mode.yaml
index 1947d6b..329f2f5 100644
--- a/automation/sleep_mode.yaml
+++ b/automation/sleep_mode.yaml
@@ -11,9 +11,9 @@
     - service: fan.turn_on
       entity_id: fan.philips_airpurifier
     - service: media_player.turn_off
-      entity_id: media_player.living_room_tv
-    - service: media_player.turn_off
-      entity_id: media_player.living_room_tv_2
+      entity_id:
+        - media_player.living_room_tv
+        - media_player.living_room_tv_2
     - service: light.turn_off
       entity_id: light.living_room_all_lights
     - delay: "00:00:02"
diff --git a/light.yaml b/light.yaml
index 46c387c..a5bd41f 100644
--- a/light.yaml
+++ b/light.yaml
@@ -8,6 +8,7 @@
     - light.living_room_2
     - light.living_room_3
     - light.living_room_4
+
 - platform: group
   name: Living Room All Lights
   entities: