diff --git a/platformio.ini b/platformio.ini
index 29abac4..0219010 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -102,3 +102,31 @@ build_src_filter = ${arduino_base.build_src_filter}
   +<helpers/stm32>
 lib_deps = ${arduino_base.lib_deps}
   file://arch/stm32/Adafruit_LittleFS_stm32
+
+[sensor_base]
+build_flags =
+  -D ENV_INCLUDE_GPS=1
+  -D ENV_INCLUDE_AHTX0=1
+  -D ENV_INCLUDE_BME280=1
+  -D ENV_INCLUDE_BMP280=1
+  -D ENV_INCLUDE_SHTC3=1
+  -D ENV_INCLUDE_SHT4X=1
+  -D ENV_INCLUDE_LPS22HB=1
+  -D ENV_INCLUDE_INA3221=1
+  -D ENV_INCLUDE_INA219=1
+  -D ENV_INCLUDE_INA260=1
+  -D ENV_INCLUDE_MLX90614=1
+  -D ENV_INCLUDE_VL53L0X=1
+lib_deps =
+  adafruit/Adafruit INA3221 Library @ ^1.0.1
+  adafruit/Adafruit INA219 @ ^1.2.3
+  adafruit/Adafruit INA260 Library @ ^1.5.3
+  adafruit/Adafruit AHTX0 @ ^2.0.5
+  adafruit/Adafruit BME280 Library @ ^2.3.0
+  adafruit/Adafruit BMP280 Library @ ^2.6.8
+  adafruit/Adafruit SHTC3 Library @ ^1.0.1
+  sensirion/Sensirion I2C SHT4x @ ^1.1.2
+  arduino-libraries/Arduino_LPS22HB @ ^1.0.2
+  adafruit/Adafruit MLX90614 Library @ ^2.1.5
+  adafruit/Adafruit_VL53L0X @ ^1.2.4
+  stevemarple/MicroNMEA @ ^2.0.6
diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini
index 97eef51..08eb500 100644
--- a/variants/heltec_v3/platformio.ini
+++ b/variants/heltec_v3/platformio.ini
@@ -3,6 +3,7 @@ extends = esp32_base
 board = esp32-s3-devkitc-1
 build_flags =
   ${esp32_base.build_flags}
+  ${sensor_base.build_flags}
   -I variants/heltec_v3
   -D HELTEC_LORA_V3
   -D RADIO_CLASS=CustomSX1262
@@ -17,12 +18,6 @@ build_flags =
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
-  -D ENV_INCLUDE_AHTX0=1
-  -D ENV_INCLUDE_BME280=1
-  -D ENV_INCLUDE_BMP280=1
-  -D ENV_INCLUDE_INA3221=1
-  -D ENV_INCLUDE_INA219=1
-  -D ENV_INCLUDE_GPS=1
   -D PIN_GPS_RX=47
   -D PIN_GPS_TX=48
   -D PIN_GPS_EN=26
@@ -31,13 +26,7 @@ build_src_filter = ${esp32_base.build_src_filter}
   +<helpers/sensors>
 lib_deps =
   ${esp32_base.lib_deps}
-  adafruit/Adafruit SSD1306 @ ^2.5.13
-  adafruit/Adafruit INA3221 Library @ ^1.0.1
-  adafruit/Adafruit INA219 @ ^1.2.3
-  adafruit/Adafruit AHTX0 @ ^2.0.5
-  adafruit/Adafruit BME280 Library @ ^2.3.0
-  adafruit/Adafruit BMP280 Library@^2.6.8
-  stevemarple/MicroNMEA @ ^2.0.6
+  ${sensor_base.lib_deps}
 
 [env:Heltec_v3_repeater]
 extends = Heltec_lora32_v3
@@ -157,8 +146,6 @@ build_flags =
   -D ADMIN_PASSWORD='"password"'
   -D ENV_PIN_SDA=33
   -D ENV_PIN_SCL=34
-  -D ENV_INCLUDE_MLX90614=1
-  -D ENV_INCLUDE_VL53L0X=1
   -D DISPLAY_CLASS=SSD1306Display
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -168,8 +155,6 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter}
 lib_deps =
   ${Heltec_lora32_v3.lib_deps}
   ${esp32_ota.lib_deps}
-  adafruit/Adafruit MLX90614 Library @ ^2.1.5
-  adafruit/Adafruit_VL53L0X @ ^1.2.4
 
 [env:Heltec_WSL3_repeater]
 extends = Heltec_lora32_v3
diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini
index ba4a8e2..8fb4d1b 100644
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -4,6 +4,7 @@ platform = https://github.com/maxgerhardt/platform-nordicnrf52.git#rak
 board = wiscore_rak4631
 board_check = true
 build_flags = ${nrf52_base.build_flags}
+  ${sensor_base.build_flags}
   -I variants/rak4631
   -D RAK_4631
   -D RAK_BOARD
@@ -18,33 +19,14 @@ build_flags = ${nrf52_base.build_flags}
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
-  -D ENV_INCLUDE_GPS=1
-  -D ENV_INCLUDE_AHTX0=1
-  -D ENV_INCLUDE_BME280=1
-  -D ENV_INCLUDE_BMP280=1
-  -D ENV_INCLUDE_SHTC3=1
-  -D ENV_INCLUDE_LPS22HB=1
-  -D ENV_INCLUDE_INA3221=1
-  -D ENV_INCLUDE_INA219=1
-  -D ENV_INCLUDE_INA260=1
-  -D ENV_INCLUDE_SHT4X=1
 build_src_filter = ${nrf52_base.build_src_filter}
   +<../variants/rak4631>
   +<helpers/sensors>
 lib_deps =
   ${nrf52_base.lib_deps}
+  ${sensor_base.lib_deps}
   adafruit/Adafruit SSD1306 @ ^2.5.13
-  stevemarple/MicroNMEA @ ^2.0.6
-  arduino-libraries/Arduino_LPS22HB@^1.0.2
-  adafruit/Adafruit INA3221 Library @ ^1.0.1
-  adafruit/Adafruit INA219 @ ^1.2.3
-  adafruit/Adafruit AHTX0 @ ^2.0.5
-  adafruit/Adafruit BME280 Library @ ^2.3.0
-  adafruit/Adafruit BMP280 Library @ ^2.6.8
-  adafruit/Adafruit SHTC3 Library @ ^1.0.1
-  adafruit/Adafruit INA260 Library @ ^1.5.3
-  sparkfun/SparkFun u-blox GNSS Arduino Library @ ^2.2.27
-  sensirion/Sensirion I2C SHT4x @ ^1.1.2
+  sparkfun/SparkFun u-blox GNSS Arduino Library@^2.2.27
 
 [env:RAK_4631_Repeater]
 extends = rak4631
@@ -133,3 +115,18 @@ build_src_filter = ${rak4631.build_src_filter}
 lib_deps =
   ${rak4631.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:RAK_4631_sensor]
+extends = rak4631
+build_flags =
+  ${rak4631.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
+  -D ADVERT_NAME='"RAK4631 Sensor"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+;  -D MESH_PACKET_LOGGING=1
+  -D MESH_DEBUG=1
+build_src_filter = ${rak4631.build_src_filter}
+  +<helpers/ui/SSD1306Display.cpp>
+  +<../examples/simple_sensor>
\ No newline at end of file