diff --git a/config/packages/modules/climate/windows.yaml b/config/packages/modules/climate/windows.yaml
index c48a1e0..cc7d86d 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/sensors/doors.yaml b/config/packages/sensors/doors.yaml
index 9170988..3a040c5 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 bd352d2..cd1c0d2 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"