diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index e7f8298f5e..738497c99a 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -31,7 +31,7 @@ components:
     branch: master
     dest_dir: infra
     fetch_tags: true
-    revision: v6163
+    revision: v6164
     type: git
   internal:
     branch: master
diff --git a/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh b/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh
index c59db5e2e2..74f68205f4 100755
--- a/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh
+++ b/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh
@@ -14,6 +14,8 @@ REPO_DIR="$( cd "$( dirname "${DIR}/../../../../" )" && pwd )"
 BUILD_DIR="${REPO_DIR}/../build_l0_gpu_driver"
 NEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS:-FALSE}
 NEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION:-FALSE}
+NEO_LEGACY_PLATFORMS_SUPPORT=${NEO_LEGACY_PLATFORMS_SUPPORT:-TRUE}
+NEO_CURRENT_PLATFORMS_SUPPORT=${NEO_CURRENT_PLATFORMS_SUPPORT:-TRUE}
 SPEC_FILE="${SPEC_FILE:-${OS_TYPE}}"
 
 BRANCH_SUFFIX="$( cat ${REPO_DIR}/.branch )"
@@ -83,6 +85,18 @@ if [ -z "${BRANCH_SUFFIX}" ]; then
     fi
 fi
 
+echo "NEO_CURRENT_PLATFORMS_SUPPORT: ${NEO_CURRENT_PLATFORMS_SUPPORT}"
+echo "NEO_LEGACY_PLATFORMS_SUPPORT: ${NEO_LEGACY_PLATFORMS_SUPPORT}"
+
+if [[ "${NEO_LEGACY_PLATFORMS_SUPPORT}" == "TRUE" ]] && [[ ! "${NEO_CURRENT_PLATFORMS_SUPPORT}" == "TRUE" ]]; then
+    echo "Building Legacy package"
+    export NEO_OCLOC_VERSION_MODE=0
+    perl -pi -e "s/^Package: intel-level-zero-gpu$/Package: intel-level-zero-gpu-legacy1/" "$BUILD_DIR/debian/control"
+else
+    echo "Building Current/Full package"
+    export NEO_OCLOC_VERSION_MODE=1
+fi
+
 # Update rules file with new version
 perl -pi -e "s/^ver = .*/ver = $NEO_L0_VERSION_PATCH/" $BUILD_DIR/debian/rules
 
diff --git a/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/intel-level-zero-gpu-legacy1.install b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/intel-level-zero-gpu-legacy1.install
new file mode 100644
index 0000000000..5ad2d8f7a8
--- /dev/null
+++ b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/intel-level-zero-gpu-legacy1.install
@@ -0,0 +1 @@
+usr/lib/*/libze_intel_gpu*.so.*
diff --git a/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules
index 4a3c7a9072..a691b26c4c 100755
--- a/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules
+++ b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules
@@ -11,15 +11,21 @@ NEO_SKIP_UNIT_TESTS ?= FALSE
 NEO_ENABLE_i915_PRELIM_DETECTION ?= TRUE
 NEO_ENABLE_XE_EU_DEBUG_SUPPORT ?= FALSE
 NEO_FORCE_USE_AUB_STREAM ?= TRUE
+NEO_LEGACY_PLATFORMS_SUPPORT ?= TRUE
+NEO_CURRENT_PLATFORMS_SUPPORT ?= TRUE
+NEO_OCLOC_VERSION_MODE ?= 1
 
 override_dh_auto_configure:
 	dh_auto_configure -- ${NEO_BUILD_EXTRA_OPTS} \
 		-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
+		-DNEO_OCLOC_VERSION_MODE=${NEO_OCLOC_VERSION_MODE} \
 		-DNEO_VERSION_BUILD=$(ver) \
 		-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} \
 		-DNEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION} \
+		-DNEO_LEGACY_PLATFORMS_SUPPORT=${NEO_LEGACY_PLATFORMS_SUPPORT} \
+		-DNEO_CURRENT_PLATFORMS_SUPPORT=${NEO_CURRENT_PLATFORMS_SUPPORT} \
 		-DNEO_BUILD_WITH_OCL=FALSE \
 		-DRELEASE_WITH_REGKEYS=${RELEASE_WITH_REGKEYS} \
 		-DIGDRCL_FORCE_USE_LIBVA=${IGDRCL_FORCE_USE_LIBVA} \