diff --git a/src/core/shower.cpp b/src/core/shower.cpp
index 372337311..c9e0ad06d 100644
--- a/src/core/shower.cpp
+++ b/src/core/shower.cpp
@@ -151,7 +151,7 @@ void Shower::loop() {
 // turn off hot water to send a shot of cold
 void Shower::shower_alert_start() {
     LOG_DEBUG("Shower Alert started");
-    (void)Command::call(EMSdevice::DeviceType::BOILER, "tapactivated", "false", 9);
+    (void)Command::call(EMSdevice::DeviceType::BOILER, "tapactivated", "false", DeviceValueTAG::TAG_DHW1);
     doing_cold_shot_   = true;
     force_coldshot     = false;
     alert_timer_start_ = uuid::get_uptime_sec(); // timer starts now
@@ -161,7 +161,7 @@ void Shower::shower_alert_start() {
 void Shower::shower_alert_stop() {
     if (doing_cold_shot_) {
         LOG_DEBUG("Shower Alert stopped");
-        (void)Command::call(EMSdevice::DeviceType::BOILER, "tapactivated", "true", 9);
+        (void)Command::call(EMSdevice::DeviceType::BOILER, "tapactivated", "true", DeviceValueTAG::TAG_DHW1);
         doing_cold_shot_ = false;
         force_coldshot   = false;
         next_alert_ += shower_alert_trigger_;
diff --git a/src/test/test.cpp b/src/test/test.cpp
index 59927e424..a2764901d 100644
--- a/src/test/test.cpp
+++ b/src/test/test.cpp
@@ -263,8 +263,8 @@ bool Test::test(const std::string & cmd, int8_t id1, int8_t id2) {
     if (cmd == "src") {
         EMSESP::logger().notice("Adding SRC plus thermostat...");
 
-        add_device(0x50, 17); // MX400 module
-        uart_telegram("50 00 FF 00 0A DD 00 E6 36 2A"); // monitor, temperatures
+        add_device(0x50, 17);                                       // MX400 module
+        uart_telegram("50 00 FF 00 0A DD 00 E6 36 2A");             // monitor, temperatures
         uart_telegram("50 00 FF 00 0A B5 00 FF 00 24 01 FF 24 00"); // mode, childlock
         // switchprogram
         uart_telegram("50 00 FF 00 0A 65 2A 00 3C 2A FF FF 2A FF FF 2A FF FF 2A FF FF 2A FF FF");
@@ -764,7 +764,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         test("boiler");
 
         // device type, command, data
-        Command::call(EMSdevice::DeviceType::BOILER, "tapactivated", "false", 9);
+        Command::call(EMSdevice::DeviceType::BOILER, "tapactivated", "false", DeviceValueTAG::TAG_DHW1);
         ok = true;
     }