diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h
index c91ead476..48618b641 100644
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -188,10 +188,11 @@
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_SENSOR_HUB
 #elif defined(ELECROW_PANEL)
 #define HW_VENDOR meshtastic_HardwareModel_CROWPANEL
-#elif defined(RAK3312)
-#define HW_VENDOR meshtastic_HardwareModel_RAK3312
+// The WisMesh Tap V2 is a RAK3312 board, so it must be matched before the generic one.
 #elif defined(RAK_WISMESH_TAP_V2)
 #define HW_VENDOR meshtastic_HardwareModel_WISMESH_TAP_V2
+#elif defined(RAK3312)
+#define HW_VENDOR meshtastic_HardwareModel_RAK3312
 #elif defined(LINK_32)
 #define HW_VENDOR meshtastic_HardwareModel_LINK_32
 #elif defined(T_DECK_PRO)
@@ -216,6 +217,10 @@
 #define HW_VENDOR meshtastic_HardwareModel_MESHNOLOGY_W10
 #elif defined(ELECROW_ThinkNode_M9)
 #define HW_VENDOR meshtastic_HardwareModel_THINKNODE_M9
+#elif defined(HELTEC_V4_R8)
+#define HW_VENDOR meshtastic_HardwareModel_HELTEC_V4_R8
+#elif defined(MINI_EPAPER_S3)
+#define HW_VENDOR meshtastic_HardwareModel_MINI_EPAPER_S3
 #else
 #define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
 #endif
diff --git a/src/platform/nrf52/architecture.h b/src/platform/nrf52/architecture.h
index e9abbbc29..4a6afaeae 100644
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@@ -147,6 +147,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_MUZI_BASE
 #elif defined(HELTEC_MESH_TOWER_V2)
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_TOWER_V2
+#elif defined(HELTEC_MESH_NODE_T096)
+#define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_NODE_T096
 #else
 #define HW_VENDOR meshtastic_HardwareModel_NRF52_UNKNOWN
 #endif