diff --git a/nuttx-configs/nxphlite-v3/nsh/defconfig b/nuttx-configs/nxphlite-v3/nsh/defconfig
index bc75f937ae..ac0db9fd0f 100644
--- a/nuttx-configs/nxphlite-v3/nsh/defconfig
+++ b/nuttx-configs/nxphlite-v3/nsh/defconfig
@@ -390,7 +390,7 @@ CONFIG_ARCH_BOARD="nxphlite-v3"
 # Common Board Options
 #
 CONFIG_ARCH_HAVE_LEDS=y
-CONFIG_ARCH_LEDS=y
+# CONFIG_ARCH_LEDS is not set
 
 #
 # Board-Specific Options
diff --git a/src/drivers/boards/nxphlite-v3/board_config.h b/src/drivers/boards/nxphlite-v3/board_config.h
index a742b212d0..3ee054d022 100644
--- a/src/drivers/boards/nxphlite-v3/board_config.h
+++ b/src/drivers/boards/nxphlite-v3/board_config.h
@@ -69,8 +69,10 @@ __BEGIN_DECLS
 #define GPIO_LED_B             (GPIO_HIGHDRIVE | GPIO_OUTPUT_ONE | PIN_PORTC | PIN8)
 
 
-#define GPIO_LED_D9            (GPIO_HIGHDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTD | PIN14)
-#define GPIO_LED_D10           (GPIO_HIGHDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTD | PIN13)
+#define GPIO_LED_1             (GPIO_HIGHDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTD | PIN13)
+#define GPIO_LED_2             (GPIO_HIGHDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTD | PIN14)
+
+#define BOARD_HAS_CONTROL_STATUS_LEDS 1 // Use D9 and D10
 
 #define GPIO_NFC_IO            (GPIO_HIGHDRIVE | GPIO_OUTPUT_ONE  | PIN_PORTA | PIN26)
 #define GPIO_SENSOR_P_EN       (GPIO_HIGHDRIVE | GPIO_OUTPUT_ONE  | PIN_PORTB | PIN8)
@@ -498,8 +500,8 @@ __BEGIN_DECLS
 		GPIO_BTN_SAFETY,      \
 		GPIO_TONE_ALARM_IDLE, \
 		GPIO_NFC_IO,          \
-		GPIO_LED_D9,          \
-		GPIO_LED_D10          \
+		GPIO_LED_1,           \
+		GPIO_LED_2            \
 	}
 
 /* Automounter */
diff --git a/src/drivers/boards/nxphlite-v3/nxphlite_led.c b/src/drivers/boards/nxphlite-v3/nxphlite_led.c
index 70e6ce7c5f..9a6396f55b 100644
--- a/src/drivers/boards/nxphlite-v3/nxphlite_led.c
+++ b/src/drivers/boards/nxphlite-v3/nxphlite_led.c
@@ -63,10 +63,10 @@ __END_DECLS
 
 
 static uint32_t g_ledmap[] = {
-	GPIO_LED_D9,      // Indexed by LED_BLUE
-	GPIO_LED_D10,     // Indexed by LED_RED, LED_AMBER
+	0,      // Indexed by LED_BLUE
+	GPIO_LED_1,       // Indexed by LED_RED, LED_AMBER
 	GPIO_LED_SAFETY,  // Indexed by LED_SAFETY
-	0,                // Indexed by LED_GREEN
+	GPIO_LED_2,     // Indexed by LED_GREEN
 };
 
 __EXPORT void led_init(void)