diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index 7f90cdf10d..6cf0c714b6 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -20,7 +20,7 @@ components:
   infra:
     branch: master
     dest_dir: infra
-    revision: 456bd9eb258071bd63194192189b781aee7f381b
+    revision: 415b08dfd579973244dd6eec4d2854e49878aee5
     type: git
   internal:
     branch: master
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 03b4be1b5d..93307e61a9 100755
--- a/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules
+++ b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules
@@ -4,12 +4,14 @@ ver = xxx
 %:
 	dh $@ --builddir build/ --buildsystem=cmake+ninja
 
+RELEASE_WITH_REGKEYS ?= FALSE
+
 override_dh_auto_configure:
 	dh_auto_configure -- ${NEO_BUILD_EXTRA_OPTS} \
 		-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
 		-DNEO_VERSION_BUILD=$(ver) \
 		-DSKIP_UNIT_TESTS=${SKIP_UNIT_TESTS} \
-		-DRELEASE_WITH_REGKEYS=1 \
+		-DRELEASE_WITH_REGKEYS=${RELEASE_WITH_REGKEYS} \
 		-DL0_INSTALL_UDEV_RULES=1 \
 		-DUDEV_RULES_DIR=/etc/udev/rules.d/ \
 		-Wno-dev
diff --git a/scripts/packaging/opencl/ubuntu_20.04/debian/rules b/scripts/packaging/opencl/ubuntu_20.04/debian/rules
index bbbc6b30f5..8e5784b8a5 100755
--- a/scripts/packaging/opencl/ubuntu_20.04/debian/rules
+++ b/scripts/packaging/opencl/ubuntu_20.04/debian/rules
@@ -4,6 +4,7 @@
 	dh $@ --builddir build/ --buildsystem=cmake+ninja
 
 NEO_DISABLE_BUILTINS_COMPILATION ?= FALSE
+RELEASE_WITH_REGKEYS ?= FALSE
 
 override_dh_auto_configure:
 	dh_auto_configure -- ${NEO_BUILD_EXTRA_OPTS} \
@@ -15,7 +16,7 @@ override_dh_auto_configure:
 		-DSKIP_UNIT_TESTS=${SKIP_UNIT_TESTS} \
 		-DNEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION} \
 		-DBUILD_WITH_L0=0 \
-		-DRELEASE_WITH_REGKEYS=1 \
+		-DRELEASE_WITH_REGKEYS=${RELEASE_WITH_REGKEYS} \
 		-Wno-dev
 
 override_dh_auto_build: