diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat
index c7cb93f33d..6fdd30d282 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat
@@ -8,7 +8,7 @@ FLASH_RESERVE_START_KB 0
 FLASH_BOOTLOADER_LOAD_KB 64
 
 # board ID for firmware load
-APJ_BOARD_ID 3
+APJ_BOARD_ID 1001
 
 # setup build for a peripheral firmware
 env AP_PERIPH 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat
index 28e6427c80..591e322a72 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat
@@ -12,7 +12,7 @@ define STORAGE_FLASH_PAGE 2
 define HAL_STORAGE_SIZE 8192
 
 # board ID for firmware load
-APJ_BOARD_ID 3
+APJ_BOARD_ID 1001
 
 # setup build for a peripheral firmware
 env AP_PERIPH 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat
index 4cfa488fc1..cfa8291c6b 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat
@@ -7,7 +7,7 @@ FLASH_RESERVE_START_KB 0
 FLASH_BOOTLOADER_LOAD_KB 25
 
 # board ID for firmware load
-APJ_BOARD_ID 3
+APJ_BOARD_ID 1000
 
 # setup build for a peripheral firmware
 env AP_PERIPH 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat
index 45aa1f411e..00efd4e8ab 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat
@@ -11,7 +11,7 @@ define STORAGE_FLASH_PAGE 23
 define HAL_STORAGE_SIZE 800
 
 # board ID for firmware load
-APJ_BOARD_ID 3
+APJ_BOARD_ID 1000
 
 # setup build for a peripheral firmware
 env AP_PERIPH 1