diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d4a07b00e..927bb80261 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -505,7 +505,10 @@ if(CCACHE_EXE_FOUND AND CCACHE_ALLOWED)
     if(IS_DIRECTORY ${__tmp_dir})
       get_filename_component(NEO_CCACHE_BASEDIR ".." ABSOLUTE)
       list(APPEND NEO_RULE_LAUNCH_LIST "CCACHE_BASEDIR=${NEO_CCACHE_BASEDIR}")
+      message(STATUS "using ccache base dir: ${NEO_CCACHE_BASEDIR}")
     endif()
+  elseif(DEFINED ENV{CCACHE_BASEDIR})
+    message(STATUS "Using ccache base dir: $ENV{CCACHE_BASEDIR}")
   endif()
   list(APPEND NEO_RULE_LAUNCH_LIST "ccache")
   string(REPLACE ";" " " NEO_RULE_LAUNCH_STR "${NEO_RULE_LAUNCH_LIST}")
diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index 86e6d717f5..c90a8b639e 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -27,7 +27,7 @@ components:
     branch: master
     dest_dir: infra
     fetch_tags: true
-    revision: v4205
+    revision: v4207
     type: git
   internal:
     branch: master
diff --git a/scripts/packaging/functions.sh b/scripts/packaging/functions.sh
index 0b385281ea..7f82e218bb 100755
--- a/scripts/packaging/functions.sh
+++ b/scripts/packaging/functions.sh
@@ -15,6 +15,6 @@ get_api_version() {
     API_RPM_MODEL_LINK="1"
     if [ "${COMPONENT_MODEL}" != "ci" ]; then
         API_DEB_MODEL_LINK="~${COMPONENT_MODEL:-unknown}${BUILD_ID:-0}"
-        API_RPM_MODEL_LINK=".${COMPONENT_MODEL:-unknown}${BUILD_ID:-0}"
+        API_RPM_MODEL_LINK="${COMPONENT_MODEL:-unknown}${BUILD_ID:-0}"
     fi
 }
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 d4f26bc926..61a9fb751c 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
@@ -37,7 +37,7 @@ get_l0_gpu_driver_version	# NEO_L0_VERSION_MAJOR.NEO_L0_VERSION_MINOR.NEO_L0_VER
 if [ -z "${BRANCH_SUFFIX}" ]; then
     VERSION="${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_L0_VERSION_PATCH}${API_DEB_MODEL_LINK}"
 else
-    VERSION="${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_L0_VERSION_PATCH}.${API_VERSION}-${NEO_L0_VERSION_HOTFIX}${API_VERSION_SRC}${API_DEB_MODEL_LINK}"
+    VERSION="${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_L0_VERSION_PATCH}${API_VERSION}-${NEO_L0_VERSION_HOTFIX}${API_VERSION_SRC}${API_DEB_MODEL_LINK}"
 fi
 
 PKG_VERSION=${VERSION}
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 f4b88a0947..2f062ac987 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
@@ -49,7 +49,7 @@ if [ "${BUILD_SRPM}" == "1" ]; then
     get_api_version                # API_VERSION-API_VERSION_SRC and API_RPM_MODEL_LINK
     get_l0_gpu_driver_version      # NEO_L0_VERSION_MAJOR.NEO_L0_VERSION_MINOR.NEO_L0_VERSION_PATCH
 
-    VERSION="${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_L0_VERSION_PATCH}.${API_VERSION}"
+    VERSION="${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_L0_VERSION_PATCH}${API_VERSION}"
     RELEASE="${NEO_L0_VERSION_HOTFIX}${API_VERSION_SRC}${API_RPM_MODEL_LINK}"
 
     RELEASE_WITH_REGKEYS="${RELEASE_WITH_REGKEYS:-FALSE}"
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 eaed5d654b..0ab50551c6 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
@@ -58,19 +58,19 @@ cd build
 cd build
 %ninja_install
 
-#Remove OpenCL files before installing
-rm -rf %{buildroot}%{_libdir}/intel-opencl/
-rm -rf %{buildroot}%{_sysconfdir}/OpenCL/
-rm -rf %{buildroot}%{_bindir}/ocloc
-rm -rf %{buildroot}%{_libdir}/libocloc.so
-rm -rf %{buildroot}%{_includedir}/ocloc_api.h
+#Remove OpenCL files
+rm -rvf %{buildroot}%{_libdir}/intel-opencl/
+rm -rvf %{buildroot}%{_sysconfdir}/OpenCL/
+rm -rvf %{buildroot}%{_bindir}/ocloc
+rm -rvf %{buildroot}%{_libdir}/libocloc.so
+rm -rvf %{buildroot}%{_includedir}/ocloc_api.h
 #Remove debug files
-rm -f %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so.debug
-rm -f %{buildroot}/%{_libdir}/libocloc.so.debug
-rm -rf %{buildroot}/usr/lib/debug/
+rm -vf %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so.debug
+rm -vf %{buildroot}/%{_libdir}/libocloc.so.debug
+rm -rvf %{buildroot}/usr/lib/debug/
 #insert license into package
 mkdir -p %{buildroot}/usr/share/doc/intel-level-zero-gpu/
-cp -pR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-level-zero-gpu/.
+cp -pvR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-level-zero-gpu/.
 
 %files
 %defattr(-,root,root)
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 2a713c2ca7..a5d36f62b2 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
@@ -45,7 +45,7 @@ libraries. Level Zero offers fine-grain control over accelerators capabilities,
 delivering a simplified and low-latency interface to hardware, and efficiently
 exposing hardware capabilities to applications.
 
-%debug_package
+%debug_package %{nil}
 
 %prep
 %autosetup -p1 -n compute-runtime-%{version}
@@ -68,19 +68,19 @@ exposing hardware capabilities to applications.
 cd build
 %ninja_install
 
-#Remove OpenCL files before installing
-rm -rf %{buildroot}%{_libdir}/intel-opencl/
-rm -rf %{buildroot}%{_sysconfdir}/OpenCL/
-rm -rf %{buildroot}%{_bindir}/ocloc
-rm -rf %{buildroot}%{_libdir}/libocloc.so
-rm -rf %{buildroot}%{_includedir}/ocloc_api.h
+#Remove OpenCL files
+rm -rvf %{buildroot}%{_libdir}/intel-opencl/
+rm -rvf %{buildroot}%{_sysconfdir}/OpenCL/
+rm -rvf %{buildroot}%{_bindir}/ocloc
+rm -rvf %{buildroot}%{_libdir}/libocloc.so
+rm -rvf %{buildroot}%{_includedir}/ocloc_api.h
 #Remove debug files
-rm -f %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so.debug
-rm -f %{buildroot}/%{_libdir}/libocloc.so.debug
-rm -rf %{buildroot}/usr/lib/debug/
+rm -vf %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so.debug
+rm -vf %{buildroot}/%{_libdir}/libocloc.so.debug
+rm -rvf %{buildroot}/usr/lib/debug/
 #insert license into package
 mkdir -p %{buildroot}/usr/share/doc/intel-level-zero-gpu%{?name_suffix}/
-cp -pR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-level-zero-gpu%{?name_suffix}/.
+cp -pvR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-level-zero-gpu%{?name_suffix}/.
 
 %files -n intel-level-zero-gpu%{?name_suffix}
 %defattr(-,root,root)
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 a1494226c6..6c9d8977b6 100755
--- a/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules
+++ b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules
@@ -38,3 +38,6 @@ override_dh_install:
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
+
+override_dh_auto_test:
+	echo "ULTs already executed"
diff --git a/scripts/packaging/opencl/build_opencl_deb.sh b/scripts/packaging/opencl/build_opencl_deb.sh
index 61be7a0691..b02ede4c78 100755
--- a/scripts/packaging/opencl/build_opencl_deb.sh
+++ b/scripts/packaging/opencl/build_opencl_deb.sh
@@ -42,7 +42,7 @@ export NEO_OCL_VERSION_BUILD
 if [ -z "${BRANCH_SUFFIX}" ]; then
     VERSION="${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCL_VERSION_BUILD}${API_DEB_MODEL_LINK}"
 else
-    VERSION="1:${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCL_VERSION_BUILD}.${API_VERSION}-${NEO_OCL_VERSION_HOTFIX}${API_VERSION_SRC}${API_DEB_MODEL_LINK}"
+    VERSION="1:${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCL_VERSION_BUILD}${API_VERSION}-${NEO_OCL_VERSION_HOTFIX}${API_VERSION_SRC}${API_DEB_MODEL_LINK}"
 fi
 
 PKG_VERSION=${VERSION}
diff --git a/scripts/packaging/opencl/build_opencl_rpm.sh b/scripts/packaging/opencl/build_opencl_rpm.sh
index 552ce8ddf5..0464994ece 100755
--- a/scripts/packaging/opencl/build_opencl_rpm.sh
+++ b/scripts/packaging/opencl/build_opencl_rpm.sh
@@ -49,7 +49,7 @@ if [ "${BUILD_SRPM}" == "1" ]; then
     get_opencl_version  # NEO_OCL_VERSION_MAJOR.NEO_OCL_VERSION_MINOR.NEO_OCL_VERSION_BUILD
     get_api_version     # API_VERSION-API_VERSION_SRC and API_RPM_MODEL_LINK
 
-    VERSION="${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCL_VERSION_BUILD}.${API_VERSION}"
+    VERSION="${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCL_VERSION_BUILD}${API_VERSION}"
     RELEASE="${NEO_OCL_VERSION_HOTFIX}${API_VERSION_SRC}${API_RPM_MODEL_LINK}"
 
     RELEASE_WITH_REGKEYS="${RELEASE_WITH_REGKEYS:-FALSE}"
diff --git a/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec b/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec
index f561f1dbf0..f1dc187251 100644
--- a/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec
+++ b/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec
@@ -61,16 +61,17 @@ cd build
 %install
 cd build
 %ninja_install
+
 chmod +x %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so
 chmod +x %{buildroot}/%{_libdir}/libocloc.so
-rm -f %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so.debug
-rm -f %{buildroot}/%{_libdir}/libocloc.so.debug
-rm -rf %{buildroot}/usr/lib/debug/
+rm -vf %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so.debug
+rm -vf %{buildroot}/%{_libdir}/libocloc.so.debug
+rm -rvf %{buildroot}/usr/lib/debug/
 #insert license into package
 mkdir -p %{buildroot}/usr/share/doc/intel-opencl/
-cp -pR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-opencl/.
+cp -pvR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-opencl/.
 mkdir -p %{buildroot}/usr/share/doc/intel-ocloc/
-cp -pR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-ocloc/.
+cp -pvR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-ocloc/.
 
 %files
 %defattr(-,root,root)
diff --git a/scripts/packaging/opencl/sles_15.3/SPECS/opencl.spec b/scripts/packaging/opencl/sles_15.3/SPECS/opencl.spec
index 559c42337f..ad44358b66 100644
--- a/scripts/packaging/opencl/sles_15.3/SPECS/opencl.spec
+++ b/scripts/packaging/opencl/sles_15.3/SPECS/opencl.spec
@@ -47,7 +47,7 @@ the GEN graphics hardware architecture.
 Summary:        ocloc package for opencl
 %description -n intel-ocloc%{?name_suffix}
 
-%debug_package
+%debug_package %{nil}
 
 %prep
 %autosetup -p1 -n compute-runtime-%{version}
@@ -69,16 +69,17 @@ Summary:        ocloc package for opencl
 %install
 cd build
 %ninja_install
+
 chmod +x %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so
-rm -f %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so.debug
-rm -f %{buildroot}/%{_libdir}/libocloc.so.debug
-rm -rf %{buildroot}/usr/lib/debug/
+rm -vf %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so.debug
+rm -vf %{buildroot}/%{_libdir}/libocloc.so.debug
+rm -rvf %{buildroot}/usr/lib/debug/
 
 #insert license into package
 mkdir -p %{buildroot}/usr/share/doc/intel-opencl%{?name_suffix}/
-cp -pR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-opencl%{?name_suffix}/.
+cp -pvR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-opencl%{?name_suffix}/.
 mkdir -p %{buildroot}/usr/share/doc/intel-ocloc%{?name_suffix}/
-cp -pR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-ocloc%{?name_suffix}/.
+cp -pvR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-ocloc%{?name_suffix}/.
 
 %files -n intel-opencl%{?name_suffix}
 %defattr(-,root,root)
diff --git a/scripts/packaging/opencl/ubuntu_20.04/debian/rules b/scripts/packaging/opencl/ubuntu_20.04/debian/rules
index c09a284d3a..5b298e6365 100755
--- a/scripts/packaging/opencl/ubuntu_20.04/debian/rules
+++ b/scripts/packaging/opencl/ubuntu_20.04/debian/rules
@@ -33,3 +33,6 @@ override_dh_install:
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
+
+override_dh_auto_test:
+	echo "ULTs already executed"