diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat
index 12804f9f7d..385e689ac1 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat
@@ -10,8 +10,10 @@ include ../CubeBlack/hwdef.dat
 # these are parameters the Solo requires for proper operation that are different from the 4 standard defaults.
 env DEFAULT_PARAMETERS 'Tools/Frame_params/Solo_Copter-4_GreenCube.param'
 
+undef HAL_OREO_LED_ENABLED
 define HAL_OREO_LED_ENABLED 1
 
+undef HAL_SOLO_GIMBAL_ENABLED
 define HAL_SOLO_GIMBAL_ENABLED HAL_MOUNT_ENABLED
 
 AUTOBUILD_TARGETS Copter
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat
index 696118b716..c16fb1fa6f 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat
@@ -49,9 +49,12 @@ COMPASS AK09916:probe_ICM20948 0 ROTATION_ROLL_180_YAW_90
 # also probe for external compasses
 define HAL_PROBE_EXTERNAL_I2C_COMPASSES
 
+undef HAL_OREO_LED_ENABLED
 define HAL_OREO_LED_ENABLED 1
+
 define HAL_IMU_TEMP_MARGIN_LOW_DEFAULT 5
 
+undef HAL_SOLO_GIMBAL_ENABLED
 define HAL_SOLO_GIMBAL_ENABLED HAL_MOUNT_ENABLED
 
 AUTOBUILD_TARGETS Copter