diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 789ac41a7..c397274af 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -6,10 +6,10 @@ target_include_directories(freertos_kernel_include_${FREERTOS_TAG}
     INTERFACE
         .
         # Note: DEPRECATED but still supported, may be removed in a future release.
-        $<$<NOT:$<TARGET_EXISTS:freertos_config>>:${FREERTOS_CONFIG_FILE_DIRECTORY}>
+        $<$<NOT:$<TARGET_EXISTS:freertos_config_${FREERTOS_TAG}>>:${FREERTOS_CONFIG_FILE_DIRECTORY}>
 )
 
 target_link_libraries(freertos_kernel_include_${FREERTOS_TAG}
     INTERFACE
-        $<$<TARGET_EXISTS:freertos_config>:freertos_config>
+        $<$<TARGET_EXISTS:freertos_config_${FREERTOS_TAG}>:freertos_config_${FREERTOS_TAG}>
 )
diff --git a/portable/CMakeLists.txt b/portable/CMakeLists.txt
index 1cab2bd23..2b7e9304a 100644
--- a/portable/CMakeLists.txt
+++ b/portable/CMakeLists.txt
@@ -1103,9 +1103,9 @@ target_link_libraries(freertos_kernel_port_${FREERTOS_TAG}
     PUBLIC
         $<$<STREQUAL:${FREERTOS_PORT},GCC_RP2040>:pico_base_headers>
         $<$<STREQUAL:${FREERTOS_PORT},GCC_XTENSA_ESP32>:idf::esp32>
-        freertos_kernel_port_headers
+        freertos_kernel_port_headers_${FREERTOS_TAG}
     PRIVATE
-        freertos_kernel_include
+        freertos_kernel_include_${FREERTOS_TAG}
         $<$<STREQUAL:${FREERTOS_PORT},GCC_POSIX>:Threads::Threads>
         "$<$<STREQUAL:${FREERTOS_PORT},GCC_RP2040>:hardware_clocks;hardware_exception>"
         $<$<STREQUAL:${FREERTOS_PORT},MSVC_MINGW>:winmm> # Windows library which implements timers