diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches b/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches
index 22cf272429a..b8f2922f489 100644
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches
@@ -7,10 +7,10 @@ board=$(board_name)
 
 case "$board" in
 mikrotik,routerboard-760igs)
-	ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "497"
+	ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "529"
 	;;
 telco-electronics,x1)
-	ucidef_add_gpio_switch "modem_reset" "Modem Reset" "496"
+	ucidef_add_gpio_switch "modem_reset" "Modem Reset" "528"
 	;;
 tozed,zlt-s12-pro)
 	ucidef_add_gpio_switch "lt72_power" "Power LTE modem" "lt72_power" "1"
@@ -20,14 +20,14 @@ tplink,eap615-wall-v1)
 	ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "poe-passthrough"
 	;;
 ubnt,edgerouter-x)
-	ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "480"
+	ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "512"
 	;;
 ubnt,edgerouter-x-sfp)
-	ucidef_add_gpio_switch "poe_power_port0" "PoE Power Port0" "400"
-	ucidef_add_gpio_switch "poe_power_port1" "PoE Power Port1" "401"
-	ucidef_add_gpio_switch "poe_power_port2" "PoE Power Port2" "402"
-	ucidef_add_gpio_switch "poe_power_port3" "PoE Power Port3" "403"
-	ucidef_add_gpio_switch "poe_power_port4" "PoE Power Port4" "404"
+	ucidef_add_gpio_switch "poe_power_port0" "PoE Power Port0" "608"
+	ucidef_add_gpio_switch "poe_power_port1" "PoE Power Port1" "609"
+	ucidef_add_gpio_switch "poe_power_port2" "PoE Power Port2" "610"
+	ucidef_add_gpio_switch "poe_power_port3" "PoE Power Port3" "611"
+	ucidef_add_gpio_switch "poe_power_port4" "PoE Power Port4" "612"
 	;;
 zyxel,lte3301-plus|\
 zyxel,lte5398-m904)
@@ -35,10 +35,10 @@ zyxel,lte5398-m904)
 	ucidef_add_gpio_switch "lte_power" "Power LTE modem" "lte_power" "1"
 	;;
 zyxel,nr7101)
-	ucidef_add_gpio_switch "lte_reset" "Reset LTE/5G modem" "483"
+	ucidef_add_gpio_switch "lte_reset" "Reset LTE/5G modem" "515"
 	;;
 zyxel,wap6805)
-	ucidef_add_gpio_switch "qtn_power" "Quantenna Module Power" "496" "1"
+	ucidef_add_gpio_switch "qtn_power" "Quantenna Module Power" "528" "1"
 	;;
 esac