diff --git a/variants/esp32s3/rak_wismesh_tap_v2/platformio.ini b/variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
index 8423bb4df..96b1a067b 100644
--- a/variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
+++ b/variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
@@ -1,6 +1,26 @@
 ; rak_wismeshtap2 rak3112
+[ft5x06]
+build_flags =
+  -D LGFX_TOUCH=FT5x06
+  -D LGFX_TOUCH_I2C_FREQ=100000
+  -D LGFX_TOUCH_I2C_PORT=0
+  -D LGFX_TOUCH_I2C_ADDR=0x38
+  -D LGFX_TOUCH_I2C_SDA=9
+  -D LGFX_TOUCH_I2C_SCL=40
+  -D LGFX_TOUCH_RST=-1
+  -D LGFX_TOUCH_INT=39
+
+[env:rak_wismesh_tap_v2]
+custom_meshtastic_hw_model = 116
+custom_meshtastic_hw_model_slug = WISMESH_TAP_V2
+custom_meshtastic_architecture = esp32-s3
+custom_meshtastic_actively_supported = true
+custom_meshtastic_support_level = 1
+custom_meshtastic_display_name = RAK WisMesh Tap V2
+custom_meshtastic_images = rak-wismesh-tap-v2.svg
+custom_meshtastic_tags = RAK
+custom_meshtastic_partition_scheme = 8MB
 
-[rak_wismeshtap_s3]
 extends = esp32s3_base
 board = wiscore_rak3312
 board_check = true
@@ -18,23 +38,11 @@ lib_deps =
   # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.19
 
-[ft5x06]
-extends = mesh_tab_base
-build_flags = 
-  -D LGFX_TOUCH=FT5x06
-  -D LGFX_TOUCH_I2C_FREQ=100000
-  -D LGFX_TOUCH_I2C_PORT=0
-  -D LGFX_TOUCH_I2C_ADDR=0x38
-  -D LGFX_TOUCH_I2C_SDA=9
-  -D LGFX_TOUCH_I2C_SCL=40
-  -D LGFX_TOUCH_RST=-1
-  -D LGFX_TOUCH_INT=39
-
 [env:rak_wismesh_tap_v2-tft]
-extends = rak_wismeshtap_s3
+extends = env:rak_wismesh_tap_v2
 
 build_flags =
-  ${rak_wismeshtap_s3.build_flags}
+  ${env:rak_wismesh_tap_v2.build_flags}
   -D CONFIG_ARDUHAL_ESP_LOG
   -D CONFIG_ARDUHAL_LOG_COLORS=1
   -D CONFIG_DISABLE_HAL_LOCKS=1
@@ -69,9 +77,9 @@ build_flags =
   -D VIEW_320x240
   -D USE_PACKET_API
   ${ft5x06.build_flags}
-  -D LGFX_SCREEN_WIDTH=240
-  -D LGFX_SCREEN_HEIGHT=320
-  -D DISPLAY_SIZE=320x240 ; landscape mode
+  -D LGFX_SCREEN_WIDTH=240 ; native panel width (portrait)
+  -D LGFX_SCREEN_HEIGHT=320 ; native panel height (portrait)
+  -D DISPLAY_SIZE=320x240 ; UI runs in landscape mode
   -D LGFX_PANEL=ST7789
   -D LGFX_ROTATION=1
   -D LGFX_TOUCH_X_MIN=0
@@ -83,7 +91,7 @@ build_flags =
   -D MAP_FULL_REDRAW=1
 
 lib_deps =
-  ${rak_wismeshtap_s3.lib_deps}
+  ${env:rak_wismesh_tap_v2.lib_deps}
   ${device-ui_base.lib_deps}