diff --git a/.wt-station-g3-prod b/.wt-station-g3-prod
new file mode 160000
index 00000000..bfc43e94
--- /dev/null
+++ b/.wt-station-g3-prod
@@ -0,0 +1 @@
+Subproject commit bfc43e94f8495307346c16e9f8014617fd2e5cbe
diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini
index 1715e361..aa05a857 100644
--- a/variants/heltec_v3/platformio.ini
+++ b/variants/heltec_v3/platformio.ini
@@ -109,6 +109,7 @@ lib_deps =
 [env:Heltec_v3_repeater_observer_mqtt]
 extends = Heltec_lora32_v3
 upload_port = /dev/cu.usbserial-4
+; External I2C sensors (BMP280 etc.) on header pins 33/34, same as the Heltec_v3_sensor env
 extra_scripts =
   ${esp32_base.extra_scripts}
   pre:scripts/generate_cert_bundle.py
@@ -142,6 +143,8 @@ build_flags =
 #  -D MQTT_PORT=1883
 #  -D MQTT_USERNAME='"your-username"'
 #  -D MQTT_PASSWORD='"your-password"'
+  -D ENV_PIN_SDA=33
+  -D ENV_PIN_SCL=34
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}
   +<helpers/bridges/MQTTBridge.cpp>
   +<helpers/MQTTMessageBuilder.cpp>
@@ -180,6 +183,7 @@ lib_deps =
 
 [env:Heltec_v3_room_server_observer_mqtt]
 extends = Heltec_lora32_v3
+; External I2C sensors (BMP280 etc.) on header pins 33/34, same as the Heltec_v3_sensor env
 extra_scripts =
   ${esp32_base.extra_scripts}
   pre:scripts/generate_cert_bundle.py
@@ -205,6 +209,8 @@ build_flags =
   -D ESP32_CPU_FREQ=160
   -D MQTT_WIFI_TX_POWER=WIFI_POWER_11dBm
   -D WITH_SNMP=1
+  -D ENV_PIN_SDA=33
+  -D ENV_PIN_SCL=34
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<helpers/bridges/MQTTBridge.cpp>
diff --git a/variants/rak3112/platformio.ini b/variants/rak3112/platformio.ini
index e7222a22..0998a180 100644
--- a/variants/rak3112/platformio.ini
+++ b/variants/rak3112/platformio.ini
@@ -100,6 +100,7 @@ lib_deps =
 
 [env:RAK_3112_repeater_observer_mqtt]
 extends = rak3112
+; External I2C sensors on pins 33/34, same as the RAK_3112_sensor env
 extra_scripts =
   ${esp32_base.extra_scripts}
   pre:scripts/generate_cert_bundle.py
@@ -129,6 +130,8 @@ build_flags =
 #  -D MQTT_PORT=1883
 #  -D MQTT_USERNAME='"your-username"'
 #  -D MQTT_PASSWORD='"your-password"'
+  -D ENV_PIN_SDA=33
+  -D ENV_PIN_SCL=34
 build_src_filter = ${rak3112.build_src_filter}
   +<helpers/bridges/MQTTBridge.cpp>
   +<helpers/MQTTMessageBuilder.cpp>
@@ -164,6 +167,7 @@ lib_deps =
 
 [env:RAK_3112_room_server_observer_mqtt]
 extends = rak3112
+; External I2C sensors on pins 33/34, same as the RAK_3112_sensor env
 extra_scripts =
   ${esp32_base.extra_scripts}
   pre:scripts/generate_cert_bundle.py
@@ -188,6 +192,8 @@ build_flags =
   -D ESP32_CPU_FREQ=160
   -D MQTT_WIFI_TX_POWER=WIFI_POWER_11dBm
   -D WITH_SNMP=1
+  -D ENV_PIN_SDA=33
+  -D ENV_PIN_SCL=34
 build_src_filter = ${rak3112.build_src_filter}
   +<helpers/bridges/MQTTBridge.cpp>
   +<helpers/MQTTMessageBuilder.cpp>