diff --git a/Tools/ardupilotwaf/px4/cmake/configs/nuttx_aerofc-v1_apm.cmake b/Tools/ardupilotwaf/px4/cmake/configs/nuttx_aerofc-v1_apm.cmake
index 0979505744..ec555e255f 100644
--- a/Tools/ardupilotwaf/px4/cmake/configs/nuttx_aerofc-v1_apm.cmake
+++ b/Tools/ardupilotwaf/px4/cmake/configs/nuttx_aerofc-v1_apm.cmake
@@ -12,6 +12,10 @@ list(APPEND config_module_list
 list(REMOVE_ITEM config_module_list
     drivers/stm32/adc
     drivers/stm32/tone_alarm
+    systemcmds/bl_update
+    systemcmds/mtd
+    systemcmds/usb_connected
+    systemcmds/otp
 )
 
 list(REMOVE_ITEM config_extra_builtin_cmds