diff --git a/futurehome/src/services/battery.ts b/futurehome/src/services/battery.ts
index a11acf4..a883c18 100644
--- a/futurehome/src/services/battery.ts
+++ b/futurehome/src/services/battery.ts
@@ -10,7 +10,7 @@ export function battery__components(vinculumDeviceData: VinculumPd7Device, svc:
       [svc.address]: {
         p: "binary_sensor",
         device_class: "battery",
-        value_template: `{{ value_json['${svc.address}'].alarm.status == 'activ' | iif('on', 'off') }}`,
+        value_template: `{{ (value_json['${svc.address}'].alarm.status == 'activ') | iif('ON', 'OFF') }}`,
         unique_id: svc.address,
       },
     };
diff --git a/futurehome/src/services/sensor_contact.ts b/futurehome/src/services/sensor_contact.ts
index 5bced29..e527b10 100644
--- a/futurehome/src/services/sensor_contact.ts
+++ b/futurehome/src/services/sensor_contact.ts
@@ -9,7 +9,7 @@ export function sensor_contact__components(vinculumDeviceData: VinculumPd7Device
     [svc.address]: {
       p: "binary_sensor",
       device_class: "opening",
-      value_template: `{{ value_json['${svc.address}'].open | iif('on', 'off') }}`,
+      value_template: `{{ value_json['${svc.address}'].open | iif('ON', 'OFF') }}`,
       unique_id: svc.address,
     },
   };
diff --git a/futurehome/src/services/sensor_presence.ts b/futurehome/src/services/sensor_presence.ts
index 20669a0..efb4c5c 100644
--- a/futurehome/src/services/sensor_presence.ts
+++ b/futurehome/src/services/sensor_presence.ts
@@ -9,7 +9,7 @@ export function sensor_presence__components(vinculumDeviceData: VinculumPd7Devic
     [svc.address]: {
       p: "binary_sensor",
       device_class: "presence",
-      value_template: `{{ value_json['${svc.address}'].presence | iif('on', 'off') }}`,
+      value_template: `{{ value_json['${svc.address}'].presence | iif('ON', 'OFF') }}`,
       unique_id: svc.address,
     },
   };