diff --git a/cmake/FindCMSIS.cmake b/cmake/FindCMSIS.cmake
index d6a1a7c2..59cbe681 100644
--- a/cmake/FindCMSIS.cmake
+++ b/cmake/FindCMSIS.cmake
@@ -285,7 +285,9 @@ foreach(COMP ${CMSIS_FIND_COMPONENTS_FAMILIES})
 
         find_path(CMSIS_${FAMILY}${CORE_U}_${RTOS_COMP}_PATH
             NAMES "cmsis_os${RTOS_COMP_VERSION}.h"
-            PATHS "${STM32_CUBE_${FAMILY}_PATH}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_${RTOS_COMP}"
+            PATHS
+                "${STM32_CUBE_${FAMILY}_PATH}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_${RTOS_COMP}"
+                "${STM32_CUBE_${FAMILY}_PATH}/Drivers/CMSIS/RTOS2/Include"
             NO_DEFAULT_PATH
         )
         if (NOT CMSIS_${FAMILY}${CORE_U}_${RTOS_COMP}_PATH)
@@ -294,7 +296,9 @@ foreach(COMP ${CMSIS_FIND_COMPONENTS_FAMILIES})
 
         find_file(CMSIS_${FAMILY}${CORE_U}_${RTOS_COMP}_SOURCE
             NAMES "cmsis_os${RTOS_COMP_VERSION}.c"
-            PATHS "${STM32_CUBE_${FAMILY}_PATH}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_${RTOS_COMP}"
+            PATHS
+                "${STM32_CUBE_${FAMILY}_PATH}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_${RTOS_COMP}"
+                "${STM32_CUBE_${FAMILY}_PATH}/Drivers/CMSIS/RTOS2/Template"
             NO_DEFAULT_PATH
         )
         if (NOT CMSIS_${FAMILY}${CORE_U}_${RTOS_COMP}_SOURCE)