diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini
index 37800c06..b3357855 100644
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -45,7 +45,7 @@ build_src_filter = ${rak4631.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<../examples/simple_repeater>
 
-[env:RAK_4631_repeater_bridge_rs232_tx0_rx0]
+[env:RAK_4631_repeater_bridge_rs232_serial1]
 extends = rak4631
 build_flags =
   ${rak4631.build_flags}
@@ -55,9 +55,10 @@ build_flags =
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
   -D MAX_NEIGHBOURS=50
-  -D WITH_RS232_BRIDGE=Serial2
-  -D WITH_RS232_BRIDGE_RX=19
-  -D WITH_RS232_BRIDGE_TX=20
+  -D WITH_RS232_BRIDGE=Serial1
+  -D WITH_RS232_BRIDGE_RX=PIN_SERIAL1_RX
+  -D WITH_RS232_BRIDGE_TX=PIN_SERIAL1_TX
+  -UENV_INCLUDE_GPS
 ;  -D BRIDGE_DEBUG=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -66,8 +67,8 @@ build_src_filter = ${rak4631.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<helpers/bridges/RS232Bridge.cpp>
   +<../examples/simple_repeater>
-  
-[env:RAK_4631_repeater_bridge_rs232_tx1_rx1]
+
+[env:RAK_4631_repeater_bridge_rs232_serial2]
 extends = rak4631
 build_flags =
   ${rak4631.build_flags}
@@ -77,9 +78,9 @@ build_flags =
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
   -D MAX_NEIGHBOURS=50
-  -D WITH_RS232_BRIDGE=Serial1
-  -D WITH_RS232_BRIDGE_RX=15
-  -D WITH_RS232_BRIDGE_TX=16
+  -D WITH_RS232_BRIDGE=Serial2
+  -D WITH_RS232_BRIDGE_RX=PIN_SERIAL2_RX
+  -D WITH_RS232_BRIDGE_TX=PIN_SERIAL2_TX
 ;  -D BRIDGE_DEBUG=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1