diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index dfc8a973f8..13462cc3ad 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -27,7 +27,7 @@ components:
     branch: master
     dest_dir: infra
     fetch_tags: true
-    revision: v4207
+    revision: v4211
     type: git
   internal:
     branch: master
diff --git a/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_rpm.sh b/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_rpm.sh
index 2f062ac987..ecd4c4aef3 100755
--- a/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_rpm.sh
+++ b/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_rpm.sh
@@ -57,7 +57,7 @@ if [ "${BUILD_SRPM}" == "1" ]; then
     #setup rpm build tree
     rm -rf $BUILD_DIR
     mkdir -p $BUILD_DIR/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
-    tar -c -I 'xz -6 -T0' -f $BUILD_DIR/SOURCES/compute-runtime-$VERSION.tar.xz -C $REPO_DIR --transform "s,${REPO_DIR:1},compute-runtime-$VERSION," --exclude=.git\* $REPO_DIR
+    tar -c -I 'xz -6 -T0' -f $BUILD_DIR/SOURCES/compute-runtime.tar.xz -C $REPO_DIR --transform "s,${REPO_DIR:1},compute-runtime," --exclude=.git\* $REPO_DIR
     cp $COPYRIGHT $BUILD_DIR/SOURCES/
     cp $SPEC_SRC $BUILD_DIR/SPECS/
 
@@ -93,7 +93,7 @@ if [ "${BUILD_RPM}" == "1" ]; then
   if [ "${LOG_CCACHE_STATS}" == "1" ]; then
     ccache -z
   fi
-  export CCACHE_BASEDIR=$(readlink -m $BUILD_DIR/BUILD/compute-runtime-${VERSION}/)
+  export CCACHE_BASEDIR=$(readlink -m $BUILD_DIR/BUILD/compute-runtime/)
   rpmbuild --rebuild ${REPO_DIR}/../output/SRPMS/intel-level-zero-gpu-${VERSION}*.src.rpm "${build_args[@]}"
   if [ "${LOG_CCACHE_STATS}" == "1" ]; then
     ccache -s
diff --git a/scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec b/scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec
index 0ab50551c6..a32a799f34 100644
--- a/scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec
+++ b/scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec
@@ -15,7 +15,7 @@ Summary: Intel(R) GPU Driver for oneAPI Level Zero.
 Group: System Environment/Libraries
 License: MIT
 URL: https://github.com/intel/compute-runtime
-Source0: %{url}/archive/%{version}/compute-runtime-%{version}.tar.xz
+Source0: %{url}/archive/%{version}/compute-runtime.tar.xz
 Source1: copyright
 
 BuildRequires: libva-devel gcc-c++ cmake ninja-build make
@@ -36,7 +36,7 @@ exposing hardware capabilities to applications.
 %define debug_package %{nil}
 
 %prep
-%autosetup -p1 -n compute-runtime-%{ver}
+%autosetup -p1 -n compute-runtime
 
 %build
 mkdir build
diff --git a/scripts/packaging/l0_gpu_driver/sles_15.3/SPECS/l0_gpu_driver.spec b/scripts/packaging/l0_gpu_driver/sles_15.3/SPECS/l0_gpu_driver.spec
index a5d36f62b2..f4986043b6 100644
--- a/scripts/packaging/l0_gpu_driver/sles_15.3/SPECS/l0_gpu_driver.spec
+++ b/scripts/packaging/l0_gpu_driver/sles_15.3/SPECS/l0_gpu_driver.spec
@@ -24,7 +24,7 @@ Summary: Intel(R) GPU Driver for oneAPI Level Zero.
 Group: System Environment/Libraries
 License: MIT
 URL: https://github.com/intel/compute-runtime
-Source0: %{url}/archive/%{version}/compute-runtime-%{version}.tar.xz
+Source0: %{url}/archive/%{version}/compute-runtime.tar.xz
 Source1: copyright
 
 ExclusiveArch:  x86_64
@@ -48,7 +48,7 @@ exposing hardware capabilities to applications.
 %debug_package %{nil}
 
 %prep
-%autosetup -p1 -n compute-runtime-%{version}
+%autosetup -p1 -n compute-runtime
 
 %build
 %cmake .. \
diff --git a/scripts/packaging/opencl/build_opencl_rpm.sh b/scripts/packaging/opencl/build_opencl_rpm.sh
index 0464994ece..3095c37e8a 100755
--- a/scripts/packaging/opencl/build_opencl_rpm.sh
+++ b/scripts/packaging/opencl/build_opencl_rpm.sh
@@ -57,7 +57,7 @@ if [ "${BUILD_SRPM}" == "1" ]; then
     #setup rpm build tree
     rm -rf $BUILD_DIR
     mkdir -p $BUILD_DIR/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
-    tar -c -I 'xz -6 -T0' -f $BUILD_DIR/SOURCES/compute-runtime-$VERSION.tar.xz -C $REPO_DIR --transform "s,${REPO_DIR:1},compute-runtime-$VERSION," --exclude=.git\* $REPO_DIR
+    tar -c -I 'xz -6 -T0' -f $BUILD_DIR/SOURCES/compute-runtime.tar.xz -C $REPO_DIR --transform "s,${REPO_DIR:1},compute-runtime," --exclude=.git\* $REPO_DIR
     cp $COPYRIGHT $BUILD_DIR/SOURCES/
     cp $SPEC_SRC $BUILD_DIR/SPECS/
 
@@ -98,7 +98,7 @@ if [ "${BUILD_RPM}" == "1" ]; then
   if [ "${LOG_CCACHE_STATS}" == "1" ]; then
     ccache -z
   fi
-  export CCACHE_BASEDIR=$(readlink -m $BUILD_DIR/BUILD/compute-runtime-${VERSION}/)
+  export CCACHE_BASEDIR=$(readlink -m $BUILD_DIR/BUILD/compute-runtime/)
   rpmbuild --rebuild ${REPO_DIR}/../output/SRPMS/intel-opencl-${VERSION}*.src.rpm "${build_args[@]}"
   if [ "${LOG_CCACHE_STATS}" == "1" ]; then
     ccache -s
diff --git a/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec b/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec
index f1dc187251..9b0910c48b 100644
--- a/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec
+++ b/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec
@@ -18,7 +18,7 @@ Summary: Intel(R) Graphics Compute Runtime for OpenCL(TM)
 Group: System Environment/Libraries
 License: MIT
 URL: https://github.com/intel/compute-runtime
-Source0: %{url}/archive/%{version}/compute-runtime-%{version}.tar.xz
+Source0: %{url}/archive/%{version}/compute-runtime.tar.xz
 Source1: copyright
 
 Requires:      intel-gmmlib
@@ -40,7 +40,7 @@ Intel(R) Graphics Compute Runtime for OpenCL(TM) is a open source project to con
 %define debug_package %{nil}
 
 %prep
-%autosetup -p1 -n compute-runtime-%{ver}
+%autosetup -p1 -n compute-runtime
 
 %build
 mkdir build
diff --git a/scripts/packaging/opencl/sles_15.3/SPECS/opencl.spec b/scripts/packaging/opencl/sles_15.3/SPECS/opencl.spec
index ad44358b66..ebfefff69e 100644
--- a/scripts/packaging/opencl/sles_15.3/SPECS/opencl.spec
+++ b/scripts/packaging/opencl/sles_15.3/SPECS/opencl.spec
@@ -26,7 +26,7 @@ Summary:        Intel(R) Graphics Compute Runtime for OpenCL(TM)
 License:        MIT
 Group:          System Environment/Libraries
 Url:            https://github.com/intel/compute-runtime
-Source0:        %{url}/archive/%{version}/compute-runtime-%{version}.tar.xz
+Source0:        %{url}/archive/%{version}/compute-runtime.tar.xz
 Source1:        copyright
 
 ExclusiveArch:  x86_64
@@ -50,7 +50,7 @@ Summary:        ocloc package for opencl
 %debug_package %{nil}
 
 %prep
-%autosetup -p1 -n compute-runtime-%{version}
+%autosetup -p1 -n compute-runtime
 
 %build
 %cmake .. \