diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57969e3566..ea082f3e22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,10 +256,21 @@ if(NEO_SKIP_UNIT_TESTS)
   set(NEO_SKIP_L0_BLACK_BOX_TESTS TRUE)
 endif()
 
-if(DEFINED DO_NOT_RUN_AUB_TESTS)
-  set(NEO_SKIP_AUB_TEST_RUN ${DO_NOT_RUN_AUB_TESTS})
+if(NOT DEFINED NEO_SKIP_AUB_TESTS_RUN)
+  set(NEO_SKIP_AUB_TESTS_RUN TRUE)
 endif()
 
+if(NOT DEFINED NEO_SKIP_AUB_TESTS)
+  set(NEO_SKIP_AUB_TESTS TRUE)
+endif()
+
+if(NOT NEO_SKIP_AUB_TESTS_RUN)
+  set(NEO_SKIP_AUB_TESTS FALSE)
+endif()
+
+message(STATUS "NEO_SKIP_AUB_TESTS: ${NEO_SKIP_AUB_TESTS}")
+message(STATUS "NEO_SKIP_AUB_TESTS_RUN: ${NEO_SKIP_AUB_TESTS_RUN}")
+
 # Set our build directory
 if(NOT DEFINED NEO_BUILD_DIR)
   set(NEO_BUILD_DIR ${CMAKE_BINARY_DIR})
diff --git a/cmake/run_aub_test_target.cmake b/cmake/run_aub_test_target.cmake
index 846a01cc39..c4b08f1e31 100644
--- a/cmake/run_aub_test_target.cmake
+++ b/cmake/run_aub_test_target.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2023 Intel Corporation
+# Copyright (C) 2020-2024 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -47,7 +47,7 @@ if(NOT NEO_SKIP_OCL_UNIT_TESTS OR NOT NEO_SKIP_L0_UNIT_TESTS)
 
 endif()
 
-if(NOT NEO_SKIP_OCL_UNIT_TESTS)
+if(TARGET igdrcl_aub_tests)
   add_dependencies(aub_tests igdrcl_aub_tests)
   add_dependencies(run_${product}_${revision_id}_aub_tests prepare_test_kernels_for_ocl)
 
@@ -71,7 +71,7 @@ if(NOT NEO_SKIP_OCL_UNIT_TESTS)
   )
 endif()
 
-if(NOT NEO_SKIP_L0_UNIT_TESTS AND BUILD_WITH_L0)
+if(TARGET ze_intel_gpu_aub_tests)
   add_dependencies(aub_tests ze_intel_gpu_aub_tests)
   add_dependencies(run_${product}_${revision_id}_aub_tests prepare_test_kernels_for_l0)
 
@@ -95,7 +95,7 @@ if(NOT NEO_SKIP_L0_UNIT_TESTS AND BUILD_WITH_L0)
   )
 endif()
 
-if(DO_NOT_RUN_AUB_TESTS)
+if(NEO_SKIP_AUB_TESTS_RUN)
   set_target_properties(run_${product}_${revision_id}_aub_tests PROPERTIES
                         EXCLUDE_FROM_DEFAULT_BUILD TRUE
                         EXCLUDE_FROM_ALL TRUE
diff --git a/level_zero/core/test/aub_tests/CMakeLists.txt b/level_zero/core/test/aub_tests/CMakeLists.txt
index 8f0b96ad56..4c4e0e2027 100644
--- a/level_zero/core/test/aub_tests/CMakeLists.txt
+++ b/level_zero/core/test/aub_tests/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-if(DEFINED AUB_STREAM_PROJECT_NAME)
+if(NOT NEO_SKIP_AUB_TESTS AND DEFINED AUB_STREAM_PROJECT_NAME)
   link_libraries(${ASAN_LIBS} ${TSAN_LIBS})
 
   set(TARGET_NAME ${TARGET_NAME_L0}_aub_tests)
diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index ac8e3ba841..2f1cfe2058 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -31,7 +31,7 @@ components:
     branch: master
     dest_dir: infra
     fetch_tags: true
-    revision: v5869
+    revision: v5872
     type: git
   internal:
     branch: master
diff --git a/opencl/test/unit_test/aub_tests/CMakeLists.txt b/opencl/test/unit_test/aub_tests/CMakeLists.txt
index 926c198313..aaf50246df 100644
--- a/opencl/test/unit_test/aub_tests/CMakeLists.txt
+++ b/opencl/test/unit_test/aub_tests/CMakeLists.txt
@@ -1,10 +1,10 @@
 #
-# Copyright (C) 2018-2023 Intel Corporation
+# Copyright (C) 2018-2024 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-if(DEFINED AUB_STREAM_PROJECT_NAME)
+if(NOT NEO_SKIP_AUB_TESTS AND DEFINED AUB_STREAM_PROJECT_NAME)
   project(igdrcl_aub_tests)
 
   set(OPENCL_AUB_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/scripts/packaging/opencl/build_opencl_deb.sh b/scripts/packaging/opencl/build_opencl_deb.sh
index 5e176d4fa7..80cdc2c71b 100755
--- a/scripts/packaging/opencl/build_opencl_deb.sh
+++ b/scripts/packaging/opencl/build_opencl_deb.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #
-# Copyright (C) 2021-2023 Intel Corporation
+# Copyright (C) 2021-2024 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -13,6 +13,7 @@ REPO_DIR="$( cd "$( dirname "${DIR}/../../../../" )" && pwd )"
 
 BUILD_DIR="${REPO_DIR}/../build_opencl"
 NEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS:-FALSE}
+NEO_SKIP_AUB_TESTS_RUN=${NEO_SKIP_AUB_TESTS_RUN:-TRUE}
 NEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION:-FALSE}
 SPEC_FILE="${SPEC_FILE:-${OS_TYPE}}"
 
@@ -27,7 +28,7 @@ LOG_CCACHE_STATS="${LOG_CCACHE_STATS:-0}"
 
 export BUILD_ID="${BUILD_ID:-1}"
 export CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}"
-export DO_NOT_RUN_AUB_TESTS="${DO_NOT_RUN_AUB_TESTS:-FALSE}"
+export NEO_SKIP_AUB_TESTS_RUN="${NEO_SKIP_AUB_TESTS_RUN:-TRUE}"
 
 source "${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/functions.sh"
 source "${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/opencl/opencl.sh"
diff --git a/scripts/packaging/opencl/ubuntu_20.04/debian/rules b/scripts/packaging/opencl/ubuntu_20.04/debian/rules
index 38cf1ffd88..6d9a5229e1 100755
--- a/scripts/packaging/opencl/ubuntu_20.04/debian/rules
+++ b/scripts/packaging/opencl/ubuntu_20.04/debian/rules
@@ -7,6 +7,7 @@ NEO_DISABLE_BUILTINS_COMPILATION ?= FALSE
 RELEASE_WITH_REGKEYS ?= FALSE
 IGDRCL_FORCE_USE_LIBVA ?= FALSE
 NEO_SKIP_UNIT_TESTS ?= FALSE
+NEO_SKIP_AUB_TESTS_RUN ?= TRUE
 NEO_ENABLE_i915_PRELIM_DETECTION ?= TRUE
 NEO_ENABLE_XE_EU_DEBUG_SUPPORT ?= FALSE
 NEO_FORCE_USE_AUB_STREAM ?= TRUE
@@ -17,7 +18,7 @@ override_dh_auto_configure:
 		-DNEO_OCL_VERSION_MAJOR=${NEO_OCL_VERSION_MAJOR} \
 		-DNEO_OCL_VERSION_MINOR=${NEO_OCL_VERSION_MINOR} \
 		-DNEO_VERSION_BUILD=${NEO_OCL_VERSION_BUILD} \
-		-DDO_NOT_RUN_AUB_TESTS=${DO_NOT_RUN_AUB_TESTS} \
+		-DNEO_SKIP_AUB_TESTS_RUN=${NEO_SKIP_AUB_TESTS_RUN} \
 		-DNEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS} \
 		-DNEO_ENABLE_i915_PRELIM_DETECTION=${NEO_ENABLE_i915_PRELIM_DETECTION} \
 		-DNEO_ENABLE_XE_EU_DEBUG_SUPPORT=${NEO_ENABLE_XE_EU_DEBUG_SUPPORT} \