diff --git a/config/packages/devices/bedroom/purifier.yaml b/config/packages/devices/bedroom/purifier.yaml
index 87b684a..a9c0962 100644
--- a/config/packages/devices/bedroom/purifier.yaml
+++ b/config/packages/devices/bedroom/purifier.yaml
@@ -1,8 +1,8 @@
 # Philips Purifier
 # https://github.com/xMrVizzy/Philips-AirPurifier
 fan:
-  platform: philips_airpurifier
-  host: !secret philips_purifier_ip
+  - platform: philips_airpurifier
+    host: !secret philips_purifier_ip
 
 input_select:
   purifier_speed:
diff --git a/config/packages/modules/climate/windows.yaml b/config/packages/modules/climate/windows.yaml
index cc7d86d..c48a1e0 100644
--- a/config/packages/modules/climate/windows.yaml
+++ b/config/packages/modules/climate/windows.yaml
@@ -18,8 +18,8 @@ binary_sensor:
     name: "Living room right window"
     state_topic: "z2m_deconz/living_room_right_window"
     availability_topic: "z2m_deconz/bridge/state"
-    payload_on: false
-    payload_off: true
+    payload_on: "false"
+    payload_off: "true"
     value_template: "{{ value_json.contact }}"
     device_class: "window"
 
@@ -27,8 +27,8 @@ binary_sensor:
     name: "Bedroom left window"
     state_topic: "z2m_deconz/bedroom_left_window"
     availability_topic: "z2m_deconz/bridge/state"
-    payload_on: false
-    payload_off: true
+    payload_on: "false"
+    payload_off: "true"
     value_template: "{{ value_json.contact }}"
     device_class: "window"
 
@@ -36,8 +36,8 @@ binary_sensor:
     name: "Bedroom right window"
     state_topic: "z2m_deconz/bedroom_right_window"
     availability_topic: "z2m_deconz/bridge/state"
-    payload_on: false
-    payload_off: true
+    payload_on: "false"
+    payload_off: "true"
     value_template: "{{ value_json.contact }}"
     device_class: "window"
 
@@ -45,8 +45,8 @@ binary_sensor:
     name: "Kitchen window"
     state_topic: "z2m_deconz/kitchen_window"
     availability_topic: "z2m_deconz/bridge/state"
-    payload_on: false
-    payload_off: true
+    payload_on: "false"
+    payload_off: "true"
     value_template: "{{ value_json.contact }}"
     device_class: "window"
 
diff --git a/config/packages/modules/media/sonos.yaml b/config/packages/modules/media/sonos.yaml
index 15bdd5b..3d6352b 100644
--- a/config/packages/modules/media/sonos.yaml
+++ b/config/packages/modules/media/sonos.yaml
@@ -14,7 +14,6 @@ binary_sensor:
     sensors:
       sonos_recoverable:
         friendly_name: Sonos recoverable
-        entity_id: media_player.master_bedroom
         value_template: >-
 
           {% set content_id = state_attr('media_player.master_bedroom', 'media_content_id') %}
diff --git a/config/packages/modules/presence.yaml b/config/packages/modules/presence.yaml
index db5fca9..ff1bff0 100644
--- a/config/packages/modules/presence.yaml
+++ b/config/packages/modules/presence.yaml
@@ -45,7 +45,6 @@ binary_sensor:
         friendly_name: Georgi
         device_class: presence
         value_template: "{{ is_state('input_boolean.georgi_home', 'on') }}"
-        entity_id: input_boolean.georgi_home
         icon_template: >
           {% if is_state('input_boolean.georgi_home', 'on') %} mdi:account
           {% else %} mdi:account-off-outline
@@ -54,13 +53,11 @@ binary_sensor:
       trisensor_motion:
         friendly_name: TriSensor motion
         device_class: motion
-        entity_id: sensor.trisensor_burglar
         value_template: "{{ is_state('sensor.trisensor_burglar', '8') }}"
 
       multisensor_motion:
         friendly_name: MultiSensor motion
         device_class: motion
-        entity_id: sensor.multisensor_6_burglar
         value_template: "{{ is_state('sensor.multisensor_6_burglar', '8') }}"
 
 sensor:
diff --git a/config/packages/sensors/doors.yaml b/config/packages/sensors/doors.yaml
index 3a040c5..9170988 100644
--- a/config/packages/sensors/doors.yaml
+++ b/config/packages/sensors/doors.yaml
@@ -36,15 +36,15 @@ binary_sensor:
     name: "Bedroom door"
     state_topic: "z2m_deconz/bedroom_door"
     availability_topic: "z2m_deconz/bridge/state"
-    payload_on: false
-    payload_off: true
+    payload_on: "false"
+    payload_off: "true"
     value_template: "{{ value_json.contact }}"
     device_class: "door"
   - platform: mqtt
     name: "Front door"
     state_topic: "z2m_deconz/front_door"
     availability_topic: "z2m_deconz/bridge/state"
-    payload_on: false
-    payload_off: true
+    payload_on: "false"
+    payload_off: "true"
     value_template: "{{ value_json.contact }}"
     device_class: "door"
diff --git a/config/packages/sensors/motion.yaml b/config/packages/sensors/motion.yaml
index cd1c0d2..bd352d2 100644
--- a/config/packages/sensors/motion.yaml
+++ b/config/packages/sensors/motion.yaml
@@ -3,16 +3,16 @@ binary_sensor:
     name: "Hallway motion occupancy"
     state_topic: "z2m_deconz/hallway_motion"
     availability_topic: "z2m_deconz/bridge/state"
-    payload_on: true
-    payload_off: false
+    payload_on: "true"
+    payload_off: "false"
     value_template: "{{ value_json.occupancy }}"
     device_class: "motion"
   - platform: mqtt
     name: "Kitchen motion occupancy"
     state_topic: "z2m_deconz/kitchen_motion"
     availability_topic: "z2m_deconz/bridge/state"
-    payload_on: true
-    payload_off: false
+    payload_on: "true"
+    payload_off: "false"
     value_template: "{{ value_json.occupancy }}"
     device_class: "motion"