diff --git a/variants/rak_wismesh_tag/platformio.ini b/variants/rak_wismesh_tag/platformio.ini
index 59d551759..0ee5bfedc 100644
--- a/variants/rak_wismesh_tag/platformio.ini
+++ b/variants/rak_wismesh_tag/platformio.ini
@@ -28,14 +28,12 @@ build_flags = ${nrf52_base.build_flags}
   -D PIN_BOARD_SCL=PIN_WIRE_SCL
 build_src_filter = ${nrf52_base.build_src_filter}
   +<../variants/rak_wismesh_tag>
-  +<helpers/ui/buzzer.cpp>
   +<helpers/ui/MomentaryButton.cpp>
   +<helpers/ui/NullDisplayDriver.cpp>
   +<helpers/sensors>
 lib_deps =
   ${nrf52_base.lib_deps}
   ${sensor_base.lib_deps}
-  end2endzone/NonBlockingRTTTL@^1.3.0
 
 [env:RAK_WisMesh_Tag_Repeater]
 extends = rak_wismesh_tag
@@ -77,11 +75,13 @@ build_flags =
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${rak_wismesh_tag.build_src_filter}
+  +<helpers/ui/buzzer.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-orig/*.cpp>
 lib_deps =
   ${rak_wismesh_tag.lib_deps}
   densaugeo/base64 @ ~1.4.0
+  end2endzone/NonBlockingRTTTL@^1.3.0
 
 [env:RAK_WisMesh_Tag_companion_radio_ble]
 extends = rak_wismesh_tag
@@ -98,12 +98,14 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
   -D MESH_DEBUG=1
 build_src_filter = ${rak_wismesh_tag.build_src_filter}
+  +<helpers/ui/buzzer.cpp>
   +<helpers/nrf52/SerialBLEInterface.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-orig/*.cpp>
 lib_deps =
   ${rak4631.lib_deps}
   densaugeo/base64 @ ~1.4.0
+  end2endzone/NonBlockingRTTTL@^1.3.0
 
 [env:RAK_WisMesh_Tag_sensor]
 extends = rak4631