diff --git a/src/platform/nrf52/architecture.h b/src/platform/nrf52/architecture.h
index cee0e5a10..0c70c6aa1 100644
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@@ -51,8 +51,6 @@
 #define HW_VENDOR meshtastic_HardwareModel_WISMESH_TAP
 #elif defined(WISMESH_TAG)
 #define HW_VENDOR meshtastic_HardwareModel_WISMESH_TAG
-#elif defined(GAT562_MESH_TRIAL_TRACKER)
-#define HW_VENDOR meshtastic_HardwareModel_GAT562_MESH_TRIAL_TRACKER
 #elif defined(NOMADSTAR_METEOR_PRO)
 #define HW_VENDOR meshtastic_HardwareModel_NOMADSTAR_METEOR_PRO
 #elif defined(R1_NEO)
diff --git a/variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini b/variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini
index c6cd23314..44d17e476 100644
--- a/variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini
+++ b/variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini
@@ -1,16 +1,58 @@
-; The very slick RAK wireless RAK 4631 / 4630 board - Unified firmware for 5005/19003, with or without OLED RAK 1921
-[env:gat562_mesh_trial_tracker]
+; Base configuration for all GAT562 mesh devices
+[env:gat562_mesh_base]
 extends = nrf52840_base
-board_level = extra
 board = gat562_mesh_trial_tracker
-board_check = true
-build_flags = ${nrf52840_base.build_flags}
-  -I variants/nrf52840/gat562_mesh_trial_tracker
-  ;-D GAT562_MESH_TRIAL_TRACKER
-  -D PRIVATE_HW
+build_flags = ${nrf52840_base.build_flags} -Ivariants/nrf52840/gat562_mesh_trial_tracker
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
+  -DGAT562_MESH_TRIAL_TRACKER
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/gat562_mesh_trial_tracker>
 lib_deps =
   ${nrf52840_base.lib_deps}
+
+[env:gat562_mesh_trial_tracker]
+extends = env:gat562_mesh_base
+board_level = extra
+build_flags = ${env:gat562_mesh_base.build_flags} -DGAT562_MESH_TRIAL_TRACKER
+  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+  -DADC_MULTIPLIER=1.73
+
+[env:gat562_mesh_tracker_pro]
+extends = env:gat562_mesh_base
+build_flags = ${env:gat562_mesh_base.build_flags} -DGAT562_MESH_TRACKER_PRO
+  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+  -DADC_MULTIPLIER=1.73
+  -DHAS_TRACKBALL=1 ; joystick
+  -DTB_UP=28      ; P0.28
+  -DTB_DOWN=4     ; P0.04
+  -DTB_LEFT=30    ; P0.30
+  -DTB_RIGHT=31   ; P0.31
+  -DTB_PRESS=26   ; P0.26 (SELECT)
+  -DTB_DIRECTION=FALLING
+
+[env:gat562_mesh_watch]
+extends = env:gat562_mesh_base
+board_level = extra
+build_unflags =
+  -DPIN_LED2
+  -DLED_CONN
+  -DLED_BLUE
+build_flags = ${env:gat562_mesh_base.build_flags} -DGAT562_MESH_WATCH
+  -DMESHTASTIC_EXCLUDE_GPS
+  -DADC_MULTIPLIER=1.75
+  -DPIN_VIBRATION=36
+  -DUSERPREFS_RINGTONE_NAG_SECS=9
+
+[env:gat562_mesh_evb_pro]
+extends = env:gat562_mesh_base
+board_level = extra
+build_flags = ${env:gat562_mesh_base.build_flags} -DGAT562_MESH_EVB_PRO
+  -DMESHTASTIC_EXCLUDE_SCREEN
+
+[env:gat562_mesh_solar_relay]
+extends = env:gat562_mesh_base
+board_level = extra
+build_flags = ${env:gat562_mesh_base.build_flags} -DGAT562_MESH_SOLAR_RELAY
+  -DMESHTASTIC_EXCLUDE_GPS
+  -DMESHTASTIC_EXCLUDE_SCREEN
\ No newline at end of file
diff --git a/variants/nrf52840/gat562_mesh_trial_tracker/variant.h b/variants/nrf52840/gat562_mesh_trial_tracker/variant.h
index 6337ac70c..79a75dde1 100644
--- a/variants/nrf52840/gat562_mesh_trial_tracker/variant.h
+++ b/variants/nrf52840/gat562_mesh_trial_tracker/variant.h
@@ -60,11 +60,15 @@ extern "C" {
  * Buttons
  */
 
-#define PIN_BUTTON1 9 // Pin for button on E-ink button module or IO expansion
+#if defined(GAT562_MESH_TRACKER_PRO)
+#define CANCEL_BUTTON_PIN 9
 #define BUTTON_NEED_PULLUP
-#define PIN_BUTTON2 12
-#define PIN_BUTTON3 24
-#define PIN_BUTTON4 25
+#define CANCEL_BUTTON_ACTIVE_LOW true
+#define CANCEL_BUTTON_ACTIVE_PULLUP false
+#else
+#define PIN_BUTTON1 9
+#define BUTTON_NEED_PULLUP
+#endif
 
 /*
  * Analog pins