diff --git a/examples/bluetooth/controller_hci_uart/main/controller_hci_uart_demo.c b/examples/bluetooth/controller_hci_uart/main/controller_hci_uart_demo.c
index 0aa130de8f..0cce686de2 100644
--- a/examples/bluetooth/controller_hci_uart/main/controller_hci_uart_demo.c
+++ b/examples/bluetooth/controller_hci_uart/main/controller_hci_uart_demo.c
@@ -14,7 +14,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "nvs.h"
+#include "nvs_flash.h"
 #include "bt.h"
 #include "driver/uart.h"
 #include "esp_log.h"
diff --git a/tools/ci/build_examples.sh b/tools/ci/build_examples.sh
index 14a8e9b425..65b82160fe 100755
--- a/tools/ci/build_examples.sh
+++ b/tools/ci/build_examples.sh
@@ -134,7 +134,7 @@ build_example () {
 
 EXAMPLE_NUM=0
 
-find ${IDF_PATH}/examples/ -type f -name Makefile | \
+find ${IDF_PATH}/examples/ -type f -name Makefile | sort | \
 while read FN
 do
     if [[ $EXAMPLE_NUM -lt $START_NUM || $EXAMPLE_NUM -ge $END_NUM ]]