diff --git a/flows.json b/flows.json
index 0284331..5c82578 100644
--- a/flows.json
+++ b/flows.json
@@ -977,7 +977,9 @@
             "6f4235c9d4f6a6ea",
             "862666f576addab8",
             "bcef7debc9bda36c",
-            "5ee549aa5e97d4a5"
+            "5ee549aa5e97d4a5",
+            "01d27485bee0d220",
+            "b4d619d31ec9121d"
         ],
         "x": 14,
         "y": 11.5,
@@ -2434,11 +2436,13 @@
             "53b440a31d30df1b",
             "f1f2ac113fe2b639",
             "b96ad84b569ac360",
-            "894e510fd44b01e0"
+            "894e510fd44b01e0",
+            "a11aeb4ccc595a4c",
+            "eee837a3c93b3abd"
         ],
         "x": 14,
         "y": 1319,
-        "w": 1072,
+        "w": 1092,
         "h": 562
     },
     {
@@ -24816,8 +24820,8 @@
         "name": "",
         "scope": "group",
         "uncaught": false,
-        "x": 990,
-        "y": 1800,
+        "x": 1010,
+        "y": 1660,
         "wires": [
             [
                 "7593f77568c03db2"
@@ -24967,6 +24971,166 @@
             ]
         ]
     },
+    {
+        "id": "01d27485bee0d220",
+        "type": "server-state-changed",
+        "z": "72f99805df043603",
+        "g": "e065b1ed4938b477",
+        "name": "Beep Turned On",
+        "server": "9e87348d.9c1c48",
+        "version": 6,
+        "outputs": 2,
+        "exposeAsEntityConfig": "",
+        "entities": {
+            "entity": [
+                "switch.master_bedroom_aircon_prompt_tone"
+            ],
+            "substring": [],
+            "regex": []
+        },
+        "outputInitially": false,
+        "stateType": "str",
+        "ifState": "on",
+        "ifStateType": "str",
+        "ifStateOperator": "is",
+        "outputOnlyOnStateChange": true,
+        "for": "0",
+        "forType": "num",
+        "forUnits": "minutes",
+        "ignorePrevStateNull": false,
+        "ignorePrevStateUnknown": false,
+        "ignorePrevStateUnavailable": false,
+        "ignoreCurrentStateUnknown": false,
+        "ignoreCurrentStateUnavailable": false,
+        "outputProperties": [
+            {
+                "property": "payload",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entityState"
+            }
+        ],
+        "x": 760,
+        "y": 580,
+        "wires": [
+            [
+                "b4d619d31ec9121d"
+            ],
+            []
+        ]
+    },
+    {
+        "id": "b4d619d31ec9121d",
+        "type": "api-call-service",
+        "z": "72f99805df043603",
+        "g": "e065b1ed4938b477",
+        "name": "Turn Off Beep",
+        "server": "9e87348d.9c1c48",
+        "version": 7,
+        "debugenabled": false,
+        "action": "switch.turn_off",
+        "floorId": [],
+        "areaId": [],
+        "deviceId": [],
+        "entityId": [
+            "switch.master_bedroom_aircon_prompt_tone"
+        ],
+        "labelId": [],
+        "data": "",
+        "dataType": "jsonata",
+        "mergeContext": "",
+        "mustacheAltTags": false,
+        "outputProperties": [],
+        "queue": "none",
+        "blockInputOverrides": true,
+        "domain": "switch",
+        "service": "turn_off",
+        "x": 960,
+        "y": 580,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a11aeb4ccc595a4c",
+        "type": "server-state-changed",
+        "z": "72f99805df043603",
+        "g": "5802ea32c1de36e8",
+        "name": "Beep Turned On",
+        "server": "9e87348d.9c1c48",
+        "version": 6,
+        "outputs": 2,
+        "exposeAsEntityConfig": "",
+        "entities": {
+            "entity": [
+                "switch.emma_bedroom_aircon_prompt_tone"
+            ],
+            "substring": [],
+            "regex": []
+        },
+        "outputInitially": false,
+        "stateType": "str",
+        "ifState": "on",
+        "ifStateType": "str",
+        "ifStateOperator": "is",
+        "outputOnlyOnStateChange": true,
+        "for": "0",
+        "forType": "num",
+        "forUnits": "minutes",
+        "ignorePrevStateNull": false,
+        "ignorePrevStateUnknown": false,
+        "ignorePrevStateUnavailable": false,
+        "ignoreCurrentStateUnknown": false,
+        "ignoreCurrentStateUnavailable": false,
+        "outputProperties": [
+            {
+                "property": "payload",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entityState"
+            }
+        ],
+        "x": 780,
+        "y": 1780,
+        "wires": [
+            [
+                "eee837a3c93b3abd"
+            ],
+            []
+        ]
+    },
+    {
+        "id": "eee837a3c93b3abd",
+        "type": "api-call-service",
+        "z": "72f99805df043603",
+        "g": "5802ea32c1de36e8",
+        "name": "Turn Off Beep",
+        "server": "9e87348d.9c1c48",
+        "version": 7,
+        "debugenabled": false,
+        "action": "switch.turn_off",
+        "floorId": [],
+        "areaId": [],
+        "deviceId": [],
+        "entityId": [
+            "switch.emma_bedroom_aircon_prompt_tone"
+        ],
+        "labelId": [],
+        "data": "",
+        "dataType": "jsonata",
+        "mergeContext": "",
+        "mustacheAltTags": false,
+        "outputProperties": [],
+        "queue": "none",
+        "blockInputOverrides": true,
+        "domain": "switch",
+        "service": "turn_off",
+        "x": 980,
+        "y": 1780,
+        "wires": [
+            []
+        ]
+    },
     {
         "id": "48b8af9419ed18d6",
         "type": "subflow:384eaf2f63dcb5db",