diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79ff2479f5..12c151ca33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,10 +124,12 @@ if(MSVC AND ENABLE_VS_FASTLINK)
   string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG " /debug:FASTLINK")
 endif()
 if(UNIX)
-  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -g")
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g")
-  set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -g")
-  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -g")
+  if(NEO_BUILD_DEBUG_SYMBOLS_PACKAGE)
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -g")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g")
+    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -g")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -g")
+  endif()
   set(CMAKE_C_FLAGS_RELEASEINTERNAL "${CMAKE_C_FLAGS_RELEASEINTERNAL} -g")
   set(CMAKE_CXX_FLAGS_RELEASEINTERNAL "${CMAKE_CXX_FLAGS_RELEASEINTERNAL} -g")
   set(CMAKE_SHARED_LINKER_FLAGS_RELEASEINTERNAL "${CMAKE_SHARED_LINKER_FLAGS_RELEASEINTERNAL} -g")
@@ -198,10 +200,10 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${NEO_BINARY_DIR}/lib)
 include(version.cmake)
 
 # set variables for symbols stripping
-if(UNIX)
+if(UNIX AND NEO_BUILD_DEBUG_SYMBOLS_PACKAGE)
   set_property(GLOBAL PROPERTY DEBUG_SYMBOL_FILES "")
   set_property(GLOBAL PROPERTY IGDRCL_SYMBOL_FILE "")
-  set_property(GLOBAL APPEND PROPERTY NEO_OCL_COMPONENTS_LIST "neo_debug_symbols")
+  set_property(GLOBAL APPEND PROPERTY NEO_OCL_COMPONENTS_LIST "opencl-debuginfo")
   set(STRIP_SYMBOLS_TARGET strip_debug_symbols)
   set(DEBUG_SYMBOL_INSTALL_DIR "/usr/lib/debug${CMAKE_INSTALL_FULL_LIBDIR}")
   add_custom_target(${STRIP_SYMBOLS_TARGET} ALL)
diff --git a/level_zero/CMakeLists.txt b/level_zero/CMakeLists.txt
index 34dfd0335c..b549814133 100644
--- a/level_zero/CMakeLists.txt
+++ b/level_zero/CMakeLists.txt
@@ -491,17 +491,19 @@ if(BUILD_WITH_L0)
   )
 
   if(UNIX)
-    get_filename_component(lib_file_name $<TARGET_FILE:${TARGET_NAME_L0}> NAME_WE)
-    set(symbols_file_name ${lib_file_name}.debug)
-    set(debug_symbols_target_name "${STRIP_SYMBOLS_TARGET}_${TARGET_NAME_L0}")
-    add_custom_target(${debug_symbols_target_name}
-                      COMMAND sh -c "objcopy --only-keep-debug ${lib_file_name} ${symbols_file_name}"
-                      COMMAND sh -c "strip -g ${lib_file_name}"
-                      COMMAND sh -c "objcopy --add-gnu-debuglink=${symbols_file_name} ${lib_file_name}"
-    )
-    add_dependencies(${debug_symbols_target_name} ${TARGET_NAME_L0})
-    add_dependencies(${STRIP_SYMBOLS_TARGET} ${debug_symbols_target_name})
-    set_property(GLOBAL APPEND PROPERTY DEBUG_SYMBOL_FILES "${symbols_file_name}")
+    if(NEO_BUILD_DEBUG_SYMBOLS_PACKAGE)
+      get_filename_component(lib_file_name $<TARGET_FILE:${TARGET_NAME_L0}> NAME_WE)
+      set(symbols_file_name ${lib_file_name}.debug)
+      set(debug_symbols_target_name "${STRIP_SYMBOLS_TARGET}_${TARGET_NAME_L0}")
+      add_custom_target(${debug_symbols_target_name}
+                        COMMAND sh -c "objcopy --only-keep-debug ${lib_file_name} ${symbols_file_name}"
+                        COMMAND sh -c "strip -g ${lib_file_name}"
+                        COMMAND sh -c "objcopy --add-gnu-debuglink=${symbols_file_name} ${lib_file_name}"
+      )
+      add_dependencies(${debug_symbols_target_name} ${TARGET_NAME_L0})
+      add_dependencies(${STRIP_SYMBOLS_TARGET} ${debug_symbols_target_name})
+      set_property(GLOBAL APPEND PROPERTY DEBUG_SYMBOL_FILES "${symbols_file_name}")
+    endif()
 
     install(TARGETS ${TARGET_NAME_L0}
             LIBRARY
diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index 007f8f1493..71ddd96826 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -14,7 +14,7 @@ components:
   infra:
     branch: infra
     dest_dir: infra
-    revision: 2a6203efa762f35246582ce5c01f540a15ce795d
+    revision: a33c9e2b52d54ef59b10a35d41aac319f3188ac9
     type: git
   internal:
     branch: master
diff --git a/opencl/source/CMakeLists.txt b/opencl/source/CMakeLists.txt
index 69d7e7321a..67470617ce 100644
--- a/opencl/source/CMakeLists.txt
+++ b/opencl/source/CMakeLists.txt
@@ -135,17 +135,19 @@ if(${GENERATE_EXECUTABLE})
   )
 
   if(UNIX)
-    get_filename_component(lib_file_name $<TARGET_FILE:${NEO_DYNAMIC_LIB_NAME}> NAME_WE)
-    set(symbols_file_name ${lib_file_name}.debug)
-    set(debug_symbols_target_name "${STRIP_SYMBOLS_TARGET}_${NEO_DYNAMIC_LIB_NAME}")
-    add_custom_target(${debug_symbols_target_name}
-                      COMMAND sh -c "objcopy --only-keep-debug ${lib_file_name} ${symbols_file_name}"
-                      COMMAND sh -c "strip -g ${lib_file_name}"
-                      COMMAND sh -c "objcopy --add-gnu-debuglink=${symbols_file_name} ${lib_file_name}"
-    )
-    add_dependencies(${debug_symbols_target_name} ${NEO_DYNAMIC_LIB_NAME})
-    add_dependencies(${STRIP_SYMBOLS_TARGET} ${debug_symbols_target_name})
-    set_property(GLOBAL PROPERTY IGDRCL_SYMBOL_FILE "${symbols_file_name}")
+    if(NEO_BUILD_DEBUG_SYMBOLS_PACKAGE)
+      get_filename_component(lib_file_name $<TARGET_FILE:${NEO_DYNAMIC_LIB_NAME}> NAME_WE)
+      set(symbols_file_name ${lib_file_name}.debug)
+      set(debug_symbols_target_name "${STRIP_SYMBOLS_TARGET}_${NEO_DYNAMIC_LIB_NAME}")
+      add_custom_target(${debug_symbols_target_name}
+                        COMMAND sh -c "objcopy --only-keep-debug ${lib_file_name} ${symbols_file_name}"
+                        COMMAND sh -c "strip -g ${lib_file_name}"
+                        COMMAND sh -c "objcopy --add-gnu-debuglink=${symbols_file_name} ${lib_file_name}"
+      )
+      add_dependencies(${debug_symbols_target_name} ${NEO_DYNAMIC_LIB_NAME})
+      add_dependencies(${STRIP_SYMBOLS_TARGET} ${debug_symbols_target_name})
+      set_property(GLOBAL PROPERTY IGDRCL_SYMBOL_FILE "${symbols_file_name}")
+    endif()
 
     install(FILES
             $<TARGET_FILE:${NEO_DYNAMIC_LIB_NAME}>
diff --git a/package.cmake b/package.cmake
index 21af3303fc..2363d0cdb2 100644
--- a/package.cmake
+++ b/package.cmake
@@ -45,16 +45,18 @@ if(UNIX)
   )
   install(FILES ${NEO_BINARY_DIR}/intel.icd DESTINATION ${OCL_ICD_VENDORDIR} COMPONENT opencl)
 
-  get_property(DEBUG_SYMBOL_FILES GLOBAL PROPERTY DEBUG_SYMBOL_FILES)
-  install(FILES ${DEBUG_SYMBOL_FILES}
-          DESTINATION ${DEBUG_SYMBOL_INSTALL_DIR}
-          COMPONENT neo_debug_symbols
-  )
-  get_property(IGDRCL_SYMBOL_FILE GLOBAL PROPERTY IGDRCL_SYMBOL_FILE)
-  install(FILES ${IGDRCL_SYMBOL_FILE}
-          DESTINATION ${DEBUG_SYMBOL_INSTALL_DIR}/intel-opencl
-          COMPONENT neo_debug_symbols
-  )
+  if(NEO_BUILD_DEBUG_SYMBOLS_PACKAGE)
+    get_property(DEBUG_SYMBOL_FILES GLOBAL PROPERTY DEBUG_SYMBOL_FILES)
+    install(FILES ${DEBUG_SYMBOL_FILES}
+            DESTINATION ${DEBUG_SYMBOL_INSTALL_DIR}
+            COMPONENT opencl-debuginfo
+    )
+    get_property(IGDRCL_SYMBOL_FILE GLOBAL PROPERTY IGDRCL_SYMBOL_FILE)
+    install(FILES ${IGDRCL_SYMBOL_FILE}
+            DESTINATION ${DEBUG_SYMBOL_INSTALL_DIR}/intel-opencl
+            COMPONENT opencl-debuginfo
+    )
+  endif()
 
   if(NEO_CPACK_GENERATOR)
     set(CPACK_GENERATOR "${NEO_CPACK_GENERATOR}")
@@ -117,17 +119,17 @@ if(UNIX)
     set(CPACK_DEBIAN_OPENCL_FILE_NAME "intel-opencl_${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}-1~${os_codename}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
     set(CPACK_DEBIAN_OCLOC_FILE_NAME "intel-ocloc_${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}-1~${os_codename}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
     set(CPACK_DEBIAN_LEVEL-ZERO-GPU_FILE_NAME "intel-level-zero-gpu_${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_VERSION_BUILD}-1~${os_codename}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
-    set(CPACK_DEBIAN_NEO_DEBUG_SYMBOLS_FILE_NAME "intel-opencl-debuginfo_${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}-1~${os_codename}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
+    set(CPACK_DEBIAN_OPENCL-DEBUGINFO_FILE_NAME "intel-opencl-debuginfo_${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}-1~${os_codename}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
 
     set(CPACK_RPM_OPENCL_FILE_NAME "intel-opencl-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}-${CPACK_RPM_PACKAGE_RELEASE}%{?dist}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
     set(CPACK_RPM_OCLOC_FILE_NAME "intel-ocloc-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}-${CPACK_RPM_PACKAGE_RELEASE}%{?dist}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
     set(CPACK_RPM_LEVEL-ZERO-GPU_FILE_NAME "intel-level-zero-gpu-${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_VERSION_BUILD}-${CPACK_RPM_PACKAGE_RELEASE}%{?dist}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
-    set(CPACK_RPM_NEO_DEBUG_SYMBOLS_FILE_NAME "intel-opencl-debuginfo-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}-${CPACK_RPM_PACKAGE_RELEASE}%{?dist}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
+    set(CPACK_RPM_OPENCL-DEBUGINFO_FILE_NAME "intel-opencl-debuginfo-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}-${CPACK_RPM_PACKAGE_RELEASE}%{?dist}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
 
     set(CPACK_ARCHIVE_OPENCL_FILE_NAME "intel-opencl-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}-${os_codename}-${CPACK_PACKAGE_ARCHITECTURE}")
     set(CPACK_ARCHIVE_OCLOC_FILE_NAME "intel-ocloc-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}-${os_codename}-${CPACK_PACKAGE_ARCHITECTURE}")
     set(CPACK_ARCHIVE_LEVEL-ZERO-GPU_FILE_NAME "intel-level-zero-gpu-${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_VERSION_BUILD}-${os_codename}_${CPACK_PACKAGE_ARCHITECTURE}")
-    set(CPACK_ARCHIVE_NEO_DEBUG_SYMBOLS_FILE_NAME "intel-opencl-debuginfo-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}-${os_codename}-${CPACK_PACKAGE_ARCHITECTURE}")
+    set(CPACK_ARCHIVE_OPENCL-DEBUGINFO_FILE_NAME "intel-opencl-debuginfo-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}-${os_codename}-${CPACK_PACKAGE_ARCHITECTURE}")
   else()
     if(CPACK_GENERATOR STREQUAL "DEB")
       set(CPACK_PACKAGE_FILE_NAME "intel-compute-runtime_${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
diff --git a/shared/offline_compiler/source/CMakeLists.txt b/shared/offline_compiler/source/CMakeLists.txt
index 4b21071a6e..71080a0314 100644
--- a/shared/offline_compiler/source/CMakeLists.txt
+++ b/shared/offline_compiler/source/CMakeLists.txt
@@ -191,17 +191,19 @@ else()
 endif()
 
 if(UNIX)
-  get_filename_component(lib_file_name $<TARGET_FILE:${OCLOC_NAME}_lib> NAME_WE)
-  set(symbols_file_name ${lib_file_name}.debug)
-  set(debug_symbols_target_name "${STRIP_SYMBOLS_TARGET}_${OCLOC_NAME}_lib")
-  add_custom_target(${debug_symbols_target_name}
-                    COMMAND sh -c "objcopy --only-keep-debug ${lib_file_name} ${symbols_file_name}"
-                    COMMAND sh -c "strip -g ${lib_file_name}"
-                    COMMAND sh -c "objcopy --add-gnu-debuglink=${symbols_file_name} ${lib_file_name}"
-  )
-  add_dependencies(${debug_symbols_target_name} ${OCLOC_NAME}_lib)
-  add_dependencies(${STRIP_SYMBOLS_TARGET} ${debug_symbols_target_name})
-  set_property(GLOBAL APPEND PROPERTY DEBUG_SYMBOL_FILES "${symbols_file_name}")
+  if(NEO_BUILD_DEBUG_SYMBOLS_PACKAGE)
+    get_filename_component(lib_file_name $<TARGET_FILE:${OCLOC_NAME}_lib> NAME_WE)
+    set(symbols_file_name ${lib_file_name}.debug)
+    set(debug_symbols_target_name "${STRIP_SYMBOLS_TARGET}_${OCLOC_NAME}_lib")
+    add_custom_target(${debug_symbols_target_name}
+                      COMMAND sh -c "objcopy --only-keep-debug ${lib_file_name} ${symbols_file_name}"
+                      COMMAND sh -c "strip -g ${lib_file_name}"
+                      COMMAND sh -c "objcopy --add-gnu-debuglink=${symbols_file_name} ${lib_file_name}"
+    )
+    add_dependencies(${debug_symbols_target_name} ${OCLOC_NAME}_lib)
+    add_dependencies(${STRIP_SYMBOLS_TARGET} ${debug_symbols_target_name})
+    set_property(GLOBAL APPEND PROPERTY DEBUG_SYMBOL_FILES "${symbols_file_name}")
+  endif()
 
   set_property(GLOBAL APPEND PROPERTY NEO_OCL_COMPONENTS_LIST ${OCLOC_NAME})
   install(FILES $<TARGET_FILE:${OCLOC_NAME}>