diff --git a/level_zero/CMakeLists.txt b/level_zero/CMakeLists.txt
index cc555d7028..ef84fc4b59 100644
--- a/level_zero/CMakeLists.txt
+++ b/level_zero/CMakeLists.txt
@@ -346,7 +346,7 @@ if(BUILD_WITH_L0)
                              ${COMPUTE_RUNTIME_DEFINITIONS}
   )
 
-  add_subdirectory_unique(api)
+  hide_subdir(api)
   add_subdirectory_unique(source)
 
   set(L0_RELEASE_LIB_NAME "${TARGET_NAME_L0}_lib")
@@ -363,17 +363,13 @@ if(BUILD_WITH_L0)
     add_library(${LIB_NAME} OBJECT
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     )
-
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/api "${NEO_BUILD_DIR}/${LIB_NAME}/api")
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/core/source "${NEO_BUILD_DIR}/${LIB_NAME}/core/source")
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/experimental${BRANCH_DIR_SUFFIX}source "${NEO_BUILD_DIR}/${LIB_NAME}/experimental${BRANCH_DIR_SUFFIX}source")
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/experimental/source/tracing "${NEO_BUILD_DIR}/${LIB_NAME}/experimental/tracing")
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools/source "${NEO_BUILD_DIR}/${LIB_NAME}tools/source")
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sysman/source "${NEO_BUILD_DIR}/${LIB_NAME}sysman/source")
 
-    append_sources_from_properties(L0_API_SOURCES L0_API)
-
-    target_sources(${LIB_NAME} PRIVATE ${L0_API_SOURCES})
-
     if(${MOCKABLE})
       get_property(COMPUTE_RUNTIME_DEFINITIONS
                    TARGET ${NEO_SHARED_MOCKABLE_LIB_NAME}
diff --git a/level_zero/api/CMakeLists.txt b/level_zero/api/CMakeLists.txt
index 79f19aad2d..0e881d4a8e 100644
--- a/level_zero/api/CMakeLists.txt
+++ b/level_zero/api/CMakeLists.txt
@@ -1,28 +1,7 @@
 #
-# Copyright (C) 2020-2022 Intel Corporation
+# Copyright (C) 2020-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-add_subdirectory(core)
-add_subdirectory(driver_experimental/public)
-add_subdirectory(driver_experimental${BRANCH_DIR_SUFFIX})
-add_subdirectory(driver_experimental/tracing)
-add_subdirectory(tools)
-add_subdirectory(sysman)
-add_subdirectory(extensions${BRANCH_DIR_SUFFIX})
-add_subdirectory(extensions/public)
-
-set(L0_API "")
-append_sources_from_properties(L0_API
-                               L0_SRCS_API
-                               L0_PUBLIC_DRIVER_EXPERIMENTAL_EXTENSIONS_API
-                               L0_EXTENDED_DRIVER_EXPERIMENTAL_EXTENSIONS_API
-                               L0_EXPERIMENTAL_TRACING_API
-                               L0_SYSMAN_API
-                               L0_TOOLS_API
-                               L0_EXTENSIONS_SRCS_API
-                               L0_PUBLIC_EXTENSIONS_SRCS_API
-)
-
-set_property(GLOBAL PROPERTY L0_API ${L0_API})
+add_subdirectories()
diff --git a/level_zero/api/core/CMakeLists.txt b/level_zero/api/core/CMakeLists.txt
index 3afb5fdfc2..eb4507dc8b 100644
--- a/level_zero/api/core/CMakeLists.txt
+++ b/level_zero/api/core/CMakeLists.txt
@@ -1,25 +1,25 @@
 #
-# Copyright (C) 2020-2022 Intel Corporation
+# Copyright (C) 2020-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-set(L0_SRCS_API
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_barrier_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdlist_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdqueue_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_context_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_copy_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_core_all_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_core_loader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_device_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_driver_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_event_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_fence_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_image_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_memory_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_module_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_sampler_api_entrypoints.h
+target_sources(${L0_STATIC_LIB_NAME}
+               PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_barrier_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdlist_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdqueue_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_context_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_copy_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_core_all_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_core_loader.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_device_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_driver_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_event_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_fence_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_image_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_memory_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_module_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_sampler_api_entrypoints.h
 )
-set_property(GLOBAL PROPERTY L0_SRCS_API ${L0_SRCS_API})
diff --git a/level_zero/api/driver_experimental/CMakeLists.txt b/level_zero/api/driver_experimental/CMakeLists.txt
index e61611bce8..0e881d4a8e 100644
--- a/level_zero/api/driver_experimental/CMakeLists.txt
+++ b/level_zero/api/driver_experimental/CMakeLists.txt
@@ -1,10 +1,7 @@
 #
-# Copyright (C) 2020-2022 Intel Corporation
+# Copyright (C) 2020-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-set(L0_EXTENDED_DRIVER_EXPERIMENTAL_EXTENSIONS_API
-)
-
-set_property(GLOBAL PROPERTY L0_EXTENDED_DRIVER_EXPERIMENTAL_EXTENSIONS_API ${L0_EXTENDED_DRIVER_EXPERIMENTAL_EXTENSIONS_API})
+add_subdirectories()
diff --git a/level_zero/api/driver_experimental/public/CMakeLists.txt b/level_zero/api/driver_experimental/public/CMakeLists.txt
index 11ab317a56..d1c0fcadfd 100644
--- a/level_zero/api/driver_experimental/public/CMakeLists.txt
+++ b/level_zero/api/driver_experimental/public/CMakeLists.txt
@@ -1,21 +1,20 @@
 #
-# Copyright (C) 2020-2022 Intel Corporation
+# Copyright (C) 2020-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-set(L0_PUBLIC_DRIVER_EXPERIMENTAL_EXTENSIONS_API
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/zex_api.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/zex_cmdlist.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/zex_cmdlist.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/zex_common.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/zex_driver.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/zex_driver.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/zex_memory.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/zex_memory.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/zex_module.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/zex_module.h
+target_sources(${L0_STATIC_LIB_NAME}
+               PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/zex_api.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/zex_cmdlist.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/zex_cmdlist.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/zex_common.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/zex_driver.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/zex_driver.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/zex_memory.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/zex_memory.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/zex_module.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/zex_module.h
 )
-
-set_property(GLOBAL PROPERTY L0_PUBLIC_DRIVER_EXPERIMENTAL_EXTENSIONS_API ${L0_PUBLIC_DRIVER_EXPERIMENTAL_EXTENSIONS_API})
diff --git a/level_zero/api/driver_experimental/tracing/CMakeLists.txt b/level_zero/api/driver_experimental/tracing/CMakeLists.txt
index 965893fd03..8376af0bd8 100644
--- a/level_zero/api/driver_experimental/tracing/CMakeLists.txt
+++ b/level_zero/api/driver_experimental/tracing/CMakeLists.txt
@@ -1,12 +1,11 @@
 #
-# Copyright (C) 2020-2022 Intel Corporation
+# Copyright (C) 2020-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-set(L0_EXPERIMENTAL_TRACING_API
-    ${CMAKE_CURRENT_SOURCE_DIR}/zet_tracing.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/zet_tracing.h
+target_sources(${L0_STATIC_LIB_NAME}
+               PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/zet_tracing.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/zet_tracing.h
 )
-
-set_property(GLOBAL PROPERTY L0_EXPERIMENTAL_TRACING_API ${L0_EXPERIMENTAL_TRACING_API})
diff --git a/level_zero/api/extensions/CMakeLists.txt b/level_zero/api/extensions/CMakeLists.txt
index fac4dd73f6..0e881d4a8e 100644
--- a/level_zero/api/extensions/CMakeLists.txt
+++ b/level_zero/api/extensions/CMakeLists.txt
@@ -1,10 +1,7 @@
 #
-# Copyright (C) 2020-2021 Intel Corporation
+# Copyright (C) 2020-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-set(L0_EXTENSIONS_SRCS_API
-)
-
-set_property(GLOBAL PROPERTY L0_EXTENSIONS_SRCS_API ${L0_EXTENSIONS_SRCS_API})
+add_subdirectories()
diff --git a/level_zero/api/extensions/public/CMakeLists.txt b/level_zero/api/extensions/public/CMakeLists.txt
index 85266d2a53..09dbf0deeb 100644
--- a/level_zero/api/extensions/public/CMakeLists.txt
+++ b/level_zero/api/extensions/public/CMakeLists.txt
@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2020-2021 Intel Corporation
+# Copyright (C) 2020-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-set(L0_PUBLIC_EXTENSIONS_SRCS_API
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_exp_ext.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/zet_exp_ext.cpp
+target_sources(${L0_STATIC_LIB_NAME}
+               PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_exp_ext.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/zet_exp_ext.cpp
 )
-set_property(GLOBAL PROPERTY L0_PUBLIC_EXTENSIONS_SRCS_API ${L0_PUBLIC_EXTENSIONS_SRCS_API})
diff --git a/level_zero/api/sysman/CMakeLists.txt b/level_zero/api/sysman/CMakeLists.txt
index 8303081ec9..11b14c560b 100644
--- a/level_zero/api/sysman/CMakeLists.txt
+++ b/level_zero/api/sysman/CMakeLists.txt
@@ -4,10 +4,10 @@
 # SPDX-License-Identifier: MIT
 #
 
-set(L0_SYSMAN_API
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_sysman_loader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/zes_sysman_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/zes_sysman_all_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/zes_handles_struct.h
+target_sources(${L0_STATIC_LIB_NAME}
+               PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_sysman_loader.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/zes_sysman_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/zes_sysman_all_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/zes_handles_struct.h
 )
-set_property(GLOBAL PROPERTY L0_SYSMAN_API ${L0_SYSMAN_API})
diff --git a/level_zero/api/tools/CMakeLists.txt b/level_zero/api/tools/CMakeLists.txt
index fcb163af67..a25dd7b620 100644
--- a/level_zero/api/tools/CMakeLists.txt
+++ b/level_zero/api/tools/CMakeLists.txt
@@ -1,14 +1,14 @@
 #
-# Copyright (C) 2020-2022 Intel Corporation
+# Copyright (C) 2020-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-set(L0_TOOLS_API
-    ${CMAKE_CURRENT_SOURCE_DIR}/ze_tools_loader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/zet_debug_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/zet_metric_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/zet_module_api_entrypoints.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/zet_tools_all_api_entrypoints.h
+target_sources(${L0_STATIC_LIB_NAME}
+               PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/ze_tools_loader.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/zet_debug_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/zet_metric_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/zet_module_api_entrypoints.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/zet_tools_all_api_entrypoints.h
 )
-set_property(GLOBAL PROPERTY L0_TOOLS_API ${L0_TOOLS_API})