diff --git a/config/telink/app/zephyr.conf b/config/telink/app/zephyr.conf
index c83f5ae..bd920ef 100644
--- a/config/telink/app/zephyr.conf
+++ b/config/telink/app/zephyr.conf
@@ -106,5 +106,6 @@
 # nvs_sector_size = flash_page_size * mult = 256 * 8 = 2048
 CONFIG_SETTINGS_NVS_SECTOR_SIZE_MULT=8
 
-# Shall settings
+# Shell settings
+CONFIG_SHELL=n
 CONFIG_SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE=255
\ No newline at end of file
diff --git a/src/lib/shell/MainLoopZephyr.cpp b/src/lib/shell/MainLoopZephyr.cpp
index e70a29c..17b5d84 100644
--- a/src/lib/shell/MainLoopZephyr.cpp
+++ b/src/lib/shell/MainLoopZephyr.cpp
@@ -14,8 +14,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#include <init.h>
-#include <shell/shell.h>
+#include <zephyr/init.h>
+#include <zephyr/shell/shell.h>
 
 #include <lib/core/CHIPError.h>
 #include <lib/shell/Engine.h>
diff --git a/src/lib/shell/streamer_zephyr.cpp b/src/lib/shell/streamer_zephyr.cpp
index 40a16d5..aad6943 100644
--- a/src/lib/shell/streamer_zephyr.cpp
+++ b/src/lib/shell/streamer_zephyr.cpp
@@ -24,8 +24,8 @@
 
 #include <cassert>
 
-#include <shell/shell.h>
-#include <shell/shell_uart.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_uart.h>
 
 namespace chip {
 namespace Shell {