diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index 0e08cb5a73..aa66519a90 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -20,7 +20,7 @@ components:
   infra:
     branch: master
     dest_dir: infra
-    revision: 1a97e1ce0773b532a7abb3da3befd111fcf0edb2
+    revision: 2c5a94b4d2399c6ae6da50da001b25da43f125aa
     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 e7815cd3df..1ec34c75f6 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
@@ -83,28 +83,6 @@ if [ -z "${BRANCH_SUFFIX}" ]; then
     if [ ! -z "${IGC_DEVEL_VERSION}" ]; then
         perl -pi -e "s/^ intel-igc-opencl-devel(?=,|$)/ intel-igc-opencl-devel (=$IGC_DEVEL_VERSION)/" "$BUILD_DIR/debian/control"
     fi
-else
-    GMM_VERSION=$(apt-cache policy libigdgmm11 | grep Installed | cut -f2- -d ':' | xargs)
-    if [ ! -z "${GMM_VERSION}" ]; then
-        perl -pi -e "s/^ libigdgmm11(?=,|$)/ libigdgmm11 (=$GMM_VERSION)/" "$BUILD_DIR/debian/control"
-    fi
-    GMM_DEVEL_VERSION=$(apt-cache policy libigdgmm-dev | grep Installed | cut -f2- -d ':' | xargs)
-    if [ ! -z "${GMM_DEVEL_VERSION}" ]; then
-        perl -pi -e "s/^ libigdgmm-dev(?=,|$)/ libigdgmm-dev (=$GMM_DEVEL_VERSION)/" "$BUILD_DIR/debian/control"
-    fi
-
-    IGC_VERSION=$(apt-cache policy libigdfcl1 | grep Installed | cut -f2- -d ':' | xargs)
-    if [ ! -z "${IGC_VERSION}" ]; then
-        perl -pi -e "s/^ libigdfcl1(?=,|$)/ libigdfcl1 (=$IGC_VERSION)/" "$BUILD_DIR/debian/control"
-    fi
-    IGC_DEVEL_VERSION=$(apt-cache policy libigdfcl-dev | grep Installed | cut -f2- -d ':' | xargs)
-    if [ ! -z "${IGC_DEVEL_VERSION}" ]; then
-        perl -pi -e "s/^ libigdfcl-dev(?=,|$)/ libigdfcl-dev (=$IGC_DEVEL_VERSION)/" "$BUILD_DIR/debian/control"
-    fi
-    IGC_CORE_VERSION=$(apt-cache policy libigc1 | grep Installed | cut -f2- -d ':' | xargs)
-    if [ ! -z "${IGC_CORE_VERSION}" ]; then
-        perl -pi -e "s/^ libigc1(?=,|$)/ libigc1 (=$IGC_CORE_VERSION)/" "$BUILD_DIR/debian/control"
-    fi
 fi
 
 # Update rules file with new version
@@ -132,6 +110,10 @@ EOF
     if [ "${ENABLE_ULT}" == "0" ]; then
         NEO_SKIP_UNIT_TESTS="TRUE"
     fi
+    if [ "${TARGET_ARCH}" == "aarch64" ]; then
+        NEO_SKIP_UNIT_TESTS="TRUE"
+        export NEO_DISABLE_BUILTINS_COMPILATION="TRUE"
+    fi
     export NEO_SKIP_UNIT_TESTS
 
     dch -v ${PKG_VERSION} -m "build $PKG_VERSION"
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 69921c800a..f9a2ac6123 100755
--- a/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules
+++ b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules
@@ -4,6 +4,7 @@ ver = xxx
 %:
 	dh $@ --builddir build/ --buildsystem=cmake+ninja
 
+NEO_DISABLE_BUILTINS_COMPILATION ?= FALSE
 RELEASE_WITH_REGKEYS ?= FALSE
 IGDRCL_FORCE_USE_LIBVA ?= FALSE
 NEO_SKIP_UNIT_TESTS ?= FALSE
@@ -13,9 +14,10 @@ override_dh_auto_configure:
 		-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
 		-DNEO_VERSION_BUILD=$(ver) \
 		-DNEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS} \
+		-DNEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION} \
+		-DNEO_BUILD_WITH_OCL=FALSE \
 		-DRELEASE_WITH_REGKEYS=${RELEASE_WITH_REGKEYS} \
 		-DIGDRCL_FORCE_USE_LIBVA=${IGDRCL_FORCE_USE_LIBVA} \
-		-DNEO_BUILD_WITH_OCL=FALSE \
 		-DL0_INSTALL_UDEV_RULES=1 \
 		-DUDEV_RULES_DIR=/etc/udev/rules.d/ \
 		-Wno-dev
@@ -25,9 +27,9 @@ override_dh_auto_build:
 
 override_dh_install:
 	rm -rf debian/intel-level-zero-gpu/etc/
-	rm -rf debian/intel-level-zero-gpu/usr/lib/x86_64-linux-gnu/intel-opencl/
+	rm -rf debian/intel-level-zero-gpu/usr/lib/${DEB_TARGET_MULTIARCH}/intel-opencl/
 	rm -rf debian/intel-level-zero-gpu/usr/bin/
 	rm -rf debian/intel-level-zero-gpu/usr/include/ocloc_api.h
-	rm -rf debian/intel-level-zero-gpu/usr/lib/x86_64-linux-gnu/libocloc.so
+	rm -rf debian/intel-level-zero-gpu/usr/lib/${DEB_TARGET_MULTIARCH}/libocloc.so
 	rm -rvf debian/intel-level-zero-gpu/usr/lib/debug
 	dh_install
diff --git a/scripts/packaging/opencl/build_opencl_deb.sh b/scripts/packaging/opencl/build_opencl_deb.sh
index abec44bda5..357bb6ce83 100755
--- a/scripts/packaging/opencl/build_opencl_deb.sh
+++ b/scripts/packaging/opencl/build_opencl_deb.sh
@@ -105,12 +105,10 @@ EOF
     if [ "${ENABLE_ULT}" == "0" ]; then
         NEO_SKIP_UNIT_TESTS="TRUE"
     fi
-
     if [ "${TARGET_ARCH}" == "aarch64" ]; then
         NEO_SKIP_UNIT_TESTS="TRUE"
         export NEO_DISABLE_BUILTINS_COMPILATION="TRUE"
     fi
-
     export NEO_SKIP_UNIT_TESTS
 
     dch -v ${PKG_VERSION} -m "build $PKG_VERSION" -b
diff --git a/scripts/packaging/opencl/ubuntu_20.04/debian/rules b/scripts/packaging/opencl/ubuntu_20.04/debian/rules
index 06c703092b..e1780403e0 100755
--- a/scripts/packaging/opencl/ubuntu_20.04/debian/rules
+++ b/scripts/packaging/opencl/ubuntu_20.04/debian/rules
@@ -6,6 +6,7 @@
 NEO_DISABLE_BUILTINS_COMPILATION ?= FALSE
 RELEASE_WITH_REGKEYS ?= FALSE
 IGDRCL_FORCE_USE_LIBVA ?= FALSE
+NEO_SKIP_UNIT_TESTS ?= FALSE
 
 override_dh_auto_configure:
 	dh_auto_configure -- ${NEO_BUILD_EXTRA_OPTS} \