diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/defaults.parm
index 5cf74f8c3c..822750cfc0 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/defaults.parm
@@ -20,8 +20,10 @@ CAM1_RELAY_ON,0
 CAM1_SERVO_OFF,1000
 CAM1_TYPE,2
 CAN_D1_UC_OPTION,10
+CAN_D1_UC_SRV_BM,1824
 CAN_D2_UC_NODE,20
 CAN_D2_UC_OPTION,10
+CAN_D2_UC_SRV_BM,1824
 CAN_LOGLEVEL,4
 CAN_P1_DRIVER,1
 CAN_P2_DRIVER,2
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Ottano/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Ottano/defaults.parm
index 7d426c2647..d4f459fc28 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Ottano/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Ottano/defaults.parm
@@ -37,9 +37,7 @@ BATT5_MONITOR,8
 BATT6_MONITOR,8
 BRD_SAFETY_MASK,2016
 CAN_D1_UC_ESC_BM,9
-CAN_D1_UC_SRV_BM,1600
 CAN_D2_UC_ESC_BM,6
-CAN_D2_UC_SRV_BM,1600
 COMPASS_PRIO1_ID,70411
 COMPASS_PRIO2_ID,72963
 COMPASS_USE3,0
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Volanti/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Volanti/defaults.parm
index d0601f94d0..ac310fb73a 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Volanti/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Volanti/defaults.parm
@@ -31,9 +31,7 @@ BATT4_CAPACITY,0
 BATT4_MONITOR,9
 BRD_SAFETY_MASK,16352
 CAN_D1_UC_ESC_BM,19
-CAN_D1_UC_SRV_BM,1824
 CAN_D2_UC_ESC_BM,12
-CAN_D2_UC_SRV_BM,1824
 COMPASS_PRIO1_ID,70403
 COMPASS_PRIO2_ID,72963
 COMPASS_PRIO3_ID,590114