diff --git a/math/kissfft/CMakeLists.txt b/math/kissfft/CMakeLists.txt
index 07c8e5f06..868413075 100644
--- a/math/kissfft/CMakeLists.txt
+++ b/math/kissfft/CMakeLists.txt
@@ -33,6 +33,8 @@ if(CONFIG_MATH_KISSFFT)
       kissfft_fetch
       URL ${KISSFFT_URL} SOURCE_DIR ${KISSFFT_DIR} BINARY_DIR
           ${CMAKE_BINARY_DIR}/apps/math/kissfft/kissfft
+      PATCH_COMMAND patch -d ${KISSFFT_DIR} -p1 <
+                    ${CMAKE_CURRENT_LIST_DIR}/kissfft.patch
       DOWNLOAD_NO_PROGRESS true
       TIMEOUT 30)
 
@@ -40,14 +42,6 @@ if(CONFIG_MATH_KISSFFT)
 
     if(NOT kissfft_fetch_POPULATED)
       FetchContent_Populate(kissfft_fetch)
-
-      # Apply the patch after fetching the content
-      execute_process(
-        COMMAND ${CMAKE_COMMAND} -E echo "Applying patch to kissfft"
-        WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
-
-      execute_process(COMMAND patch -d ${KISSFFT_DIR} -p1 <
-                              ${CMAKE_CURRENT_LIST_DIR}/kissfft.patch)
     endif()
   endif()
 
diff --git a/mlearning/tflite-micro/CMakeLists.txt b/mlearning/tflite-micro/CMakeLists.txt
index c52d492d0..c5da0ea2d 100644
--- a/mlearning/tflite-micro/CMakeLists.txt
+++ b/mlearning/tflite-micro/CMakeLists.txt
@@ -34,6 +34,14 @@ if(CONFIG_TFLITEMICRO)
       tflite_micro_fetch
       URL ${TFLITE_MICRO_URL} SOURCE_DIR ${TFLITE_MICRO_DIR} BINARY_DIR
           ${CMAKE_BINARY_DIR}/apps/mlearning/tflite-micro/tflite-micro
+      PATCH_COMMAND
+        patch -d ${TFLITE_MICRO_DIR} -p1 <
+        ${CMAKE_CURRENT_LIST_DIR}/tflite-micro.patch && patch -d
+        ${TFLITE_MICRO_DIR} -p1 <
+        ${CMAKE_CURRENT_LIST_DIR}/0001-dequantize-int8.patch && patch -d
+        ${TFLITE_MICRO_DIR} -p1 <
+        ${CMAKE_CURRENT_LIST_DIR}/0002-quantize-int8.patch && patch -d
+        ${TFLITE_MICRO_DIR} -p1 < ${CMAKE_CURRENT_LIST_DIR}/0003-mean-int8.patch
       DOWNLOAD_NO_PROGRESS true
       TIMEOUT 30)
 
@@ -41,21 +49,6 @@ if(CONFIG_TFLITEMICRO)
 
     if(NOT tflite_micro_fetch_POPULATED)
       FetchContent_Populate(tflite_micro_fetch)
-
-      # Apply the patch after fetching the content
-      execute_process(
-        COMMAND ${CMAKE_COMMAND} -E echo "Applying patch to tflite-micro"
-        WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
-      execute_process(COMMAND patch -d ${TFLITE_MICRO_DIR} -p1 <
-                              ${CMAKE_CURRENT_LIST_DIR}/tflite-micro.patch)
-      execute_process(
-        COMMAND patch -d ${TFLITE_MICRO_DIR} -p1 <
-                ${CMAKE_CURRENT_LIST_DIR}/0001-dequantize-int8.patch)
-      execute_process(
-        COMMAND patch -d ${TFLITE_MICRO_DIR} -p1 <
-                ${CMAKE_CURRENT_LIST_DIR}/0002-quantize-int8.patch)
-      execute_process(COMMAND patch -d ${TFLITE_MICRO_DIR} -p1 <
-                              ${CMAKE_CURRENT_LIST_DIR}/0003-mean-int8.patch)
     endif()
   endif()
 
diff --git a/mlearning/tflite-micro/Kconfig b/mlearning/tflite-micro/Kconfig
index 4363d7c88..b7eaf75cc 100644
--- a/mlearning/tflite-micro/Kconfig
+++ b/mlearning/tflite-micro/Kconfig
@@ -24,7 +24,7 @@ config TFLITEMICRO
 	depends on SYSTEM_FLATBUFFERS && MATH_GEMMLOWP && MATH_KISSFFT && MATH_RUY
 
 if TFLITEMICRO
-	config TFLITEMICRO_DEBUG
+config TFLITEMICRO_DEBUG
 	bool "Print tflite-micro's debug message"
 	default n
 
@@ -33,11 +33,11 @@ config TFLITEMICRO_TOOL
 	default n
 
 if TFLITEMICRO_TOOL
-	config TFLITEMICRO_TOOL_PRIORITY
+config TFLITEMICRO_TOOL_PRIORITY
 	int "tflite-micro tool priority"
 	default 100
 
-	config TFLITEMICRO_TOOL_STACKSIZE
+config TFLITEMICRO_TOOL_STACKSIZE
 	int "tflite-micro tool stacksize"
 	default 4096