diff --git a/package.json b/package.json
index 32e6cf27..205aea69 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
         "winston-transport": "^4.9.0",
         "ws": "^8.18.1",
         "zigbee-herdsman": "8.0.2",
-        "zigbee-herdsman-converters": "25.98.0",
+        "zigbee-herdsman-converters": "25.99.0",
         "zigbee2mqtt-frontend": "0.9.21",
         "zigbee2mqtt-windfront": "2.6.2"
     },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d013c0db..2718b149 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -75,8 +75,8 @@ importers:
         specifier: 8.0.2
         version: 8.0.2
       zigbee-herdsman-converters:
-        specifier: 25.98.0
-        version: 25.98.0
+        specifier: 25.99.0
+        version: 25.99.0
       zigbee2mqtt-frontend:
         specifier: 0.9.21
         version: 0.9.21
@@ -1467,8 +1467,8 @@ packages:
       utf-8-validate:
         optional: true
 
-  zigbee-herdsman-converters@25.98.0:
-    resolution: {integrity: sha512-GBLmtRnxAvWRxb6fnAGjq3OmZq1mnO3XfH5HgL5apy1iirTzvshVkPdZ3YwNbK2KYRNrmQEtYjugDNMj5IOopw==}
+  zigbee-herdsman-converters@25.99.0:
+    resolution: {integrity: sha512-tg9sj9HlUpd/fB21EqjfD9E5JTjURL8BBtnicNGN9u+d6pQN6AvJCRKYp3bneZ4boDfQ8eTLqkKILb+WXU0oiw==}
     engines: {node: '>=20.15.0'}
 
   zigbee-herdsman@8.0.2:
@@ -2748,7 +2748,7 @@ snapshots:
 
   ws@8.18.3: {}
 
-  zigbee-herdsman-converters@25.98.0:
+  zigbee-herdsman-converters@25.99.0:
     dependencies:
       iconv-lite: 0.7.1
       semver: 7.7.3
diff --git a/test/extensions/homeassistant.test.ts b/test/extensions/homeassistant.test.ts
index d539528b..e6ab4c5e 100644
--- a/test/extensions/homeassistant.test.ts
+++ b/test/extensions/homeassistant.test.ts
@@ -1218,10 +1218,13 @@ describe("Extension: HomeAssistant", () => {
             },
             max_temp: "30",
             min_temp: "5",
-            mode_command_topic: "zigbee2mqtt/bosch_rm230z/set/system_mode",
-            mode_state_template: "{{ value_json.system_mode }}",
+            mode_command_topic: "zigbee2mqtt/bosch_rm230z/set",
+            mode_state_template:
+                "{% set values = {'schedule':'auto','manual':'heat','pause':'off'} %}{% set value = value_json.operating_mode %}{% if value == \"manual\" %}{{ value_json.system_mode }}{% else %}{{ values[value] if value in values.keys() else 'off' }}{% endif %}",
+            mode_command_template:
+                "{% set values = { 'auto':'schedule','heat':'manual','cool':'manual','off':'pause'} %}{% if value == \"heat\" or value == \"cool\" %}{\"operating_mode\": \"manual\", \"system_mode\": \"{{ value }}\"}{% else %}{\"operating_mode\": \"{{ values[value] if value in values.keys() else 'pause' }}\"}{% endif %}",
             mode_state_topic: "zigbee2mqtt/bosch_rm230z",
-            modes: ["off", "heat", "cool"],
+            modes: ["off", "heat", "cool", "auto"],
             name: null,
             object_id: "bosch_rm230z",
             origin,