diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index 7b336c1728..b5db993ec1 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -41,7 +41,7 @@ components:
     dest_dir: kernels_bin
     type: git
     branch: kernels_bin
-    revision: 3554-5034
+    revision: 3554-5043
   kmdaf:
     branch: kmdaf
     dest_dir: kmdaf
diff --git a/shared/test/common/common_main.cpp b/shared/test/common/common_main.cpp
index 74e8fc85ea..a52daa62da 100644
--- a/shared/test/common/common_main.cpp
+++ b/shared/test/common/common_main.cpp
@@ -415,8 +415,12 @@ int main(int argc, char **argv) {
         } else {
             builtInsFileName = KernelBinaryHelper::BUILT_INS;
         }
-        retrieveBinaryKernelFilename(fclDebugVars.fileName, builtInsFileName + "_", ".spv");
-        retrieveBinaryKernelFilename(igcDebugVars.fileName, builtInsFileName + "_", ".bin");
+        std::string options = "";
+        if (defaultHwInfo->featureTable.flags.ftrHeaplessMode) {
+            options = "-heapless";
+        }
+        retrieveBinaryKernelFilename(fclDebugVars.fileName, builtInsFileName + "_", ".spv", options);
+        retrieveBinaryKernelFilename(igcDebugVars.fileName, builtInsFileName + "_", ".bin", options);
 
         gEnvironment->setMockFileNames(fclDebugVars.fileName, igcDebugVars.fileName);
         gEnvironment->setDefaultDebugVars(fclDebugVars, igcDebugVars, hwInfoForTests);
diff --git a/shared/test/common/helpers/test_files.cpp b/shared/test/common/helpers/test_files.cpp
index 9c321d1a2e..e0ce1ea7be 100644
--- a/shared/test/common/helpers/test_files.cpp
+++ b/shared/test/common/helpers/test_files.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -26,11 +26,11 @@ void retrieveBinaryKernelFilename(std::string &outputFilename, const std::string
     outputFilename.reserve(2 * testFiles.length());
     outputFilename.append(testFiles);
     outputFilename.append(kernelName);
+    outputFilename.append(binaryNameSuffix);
     if (false == options.empty()) {
         outputFilename.append(options);
         outputFilename.append("_");
     }
-    outputFilename.append(binaryNameSuffix);
     outputFilename.append(extension);
 }
 
diff --git a/shared/test/common/test_files/CMakeLists.txt b/shared/test/common/test_files/CMakeLists.txt
index 6c65acccfd..a8dd64ef81 100644
--- a/shared/test/common/test_files/CMakeLists.txt
+++ b/shared/test/common/test_files/CMakeLists.txt
@@ -18,7 +18,7 @@ function(compile_kernels_gen device revision_id platform_name use_stateless_suff
 
     set(outputname_base "${basename}_${platform_name}")
     if(${use_heapless})
-      set(outputname_base "${outputname_base}-heapless")
+      set(outputname_base "${outputname_base}-heapless_")
     elseif(${use_stateless_suffix})
       set(outputname_base "${outputname_base}-cl-intel-greater-than-4GB-buffer-required_")
     endif()
@@ -32,13 +32,15 @@ function(compile_kernels_gen device revision_id platform_name use_stateless_suff
       )
 
       set(heapless_mode "disable")
+      set(internal_options "")
       if(${use_heapless})
         set(heapless_mode "enable")
+        set(internal_options "${HEAPLESS_INTERNAL_OPTIONS}")
       endif()
 
       add_custom_command(
                          OUTPUT ${output_files}
-                         COMMAND ${ocloc_cmd_prefix} -file ${absolute_filepath} -device ${device} -heapless_mode ${heapless_mode} -${NEO_BITS} -out_dir ${outputdir} -output_no_suffix -output ${outputname_base} -revision_id ${revision_id}
+                         COMMAND ${ocloc_cmd_prefix} -file ${absolute_filepath} -device ${device} -heapless_mode ${heapless_mode} -internal_options ${internal_options} -${NEO_BITS} -out_dir ${outputdir} -output_no_suffix -output ${outputname_base} -revision_id ${revision_id}
                          WORKING_DIRECTORY ${workdir}
                          DEPENDS ${filepath} ocloc copy_compiler_files
       )
@@ -60,6 +62,8 @@ function(compile_kernels_gen device revision_id platform_name use_stateless_suff
   set(compiled_kernels_${platform_name}_${revision_id} ${compiled_kernels_${platform_name}_${revision_id}} PARENT_SCOPE)
 endfunction()
 
+add_subdirectories()
+
 file(GLOB_RECURSE TEST_KERNELS *.cl)
 file(GLOB_RECURSE TEST_KERNELS_IMAGES *_images.cl)
 add_custom_target(prepare_test_kernels_for_shared)
@@ -84,6 +88,9 @@ macro(macro_for_each_platform)
   set(STATELESS_SUPPORT FALSE)
   CORE_CONTAINS_PLATFORM("SUPPORTED_STATELESS" ${CORE_TYPE} ${PLATFORM_IT} STATELESS_SUPPORT)
 
+  set(HEAPLESS_SUPPORT FALSE)
+  CORE_CONTAINS_PLATFORM("SUPPORTED_HEAPLESS" ${CORE_TYPE} ${PLATFORM_IT} HEAPLESS_SUPPORT)
+
   foreach(REVISION_CONFIG ${${PLATFORM_IT}_${CORE_TYPE}_REVISIONS})
     parse_revision_config(${REVISION_CONFIG} ${PLATFORM_IT_LOWER} DEVICE_ID REVISION_ID)
 
@@ -113,3 +120,4 @@ endmacro()
 
 set(PREVIOUS_TARGET "")
 apply_macro_for_each_core_type("TESTED")
+