diff --git a/devops/containers/ubuntu2004_base.Dockerfile b/devops/containers/ubuntu2004_base.Dockerfile
index 6305783e48a43..dc820d9b06d85 100644
--- a/devops/containers/ubuntu2004_base.Dockerfile
+++ b/devops/containers/ubuntu2004_base.Dockerfile
@@ -2,10 +2,20 @@ FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
+USER root
+
 RUN apt update && apt install -yqq \
       build-essential \
       cmake \
       ninja-build \
       ccache \
       git \
-      python3
+      python3 \
+      python3-distutils \
+      python-is-python3
+
+RUN adduser --disabled-password --gecos '' sycl
+
+COPY scripts/docker_entrypoint.sh /docker_entrypoint.sh
+
+ENTRYPOINT ["/docker_entrypoint.sh"]
diff --git a/devops/scripts/docker_entrypoint.sh b/devops/scripts/docker_entrypoint.sh
new file mode 100755
index 0000000000000..f0e89244d013f
--- /dev/null
+++ b/devops/scripts/docker_entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ -d "$GITHUB_WORKSPACE" ]; then
+  chown -R sycl:sycl $GITHUB_WORKSPACE
+  su sycl
+fi
+
+exec "$@"
diff --git a/xptifw/CMakeLists.txt b/xptifw/CMakeLists.txt
index 2d0f32f0dad19..b3dac5f39af40 100644
--- a/xptifw/CMakeLists.txt
+++ b/xptifw/CMakeLists.txt
@@ -15,6 +15,8 @@ option(XPTI_ENABLE_TBB "Enable TBB in the framework" OFF)
 
 option(XPTI_ENABLE_WERROR OFF)
 
+option(XPTI_BUILD_SAMPLES OFF)
+
 if (XPTI_ENABLE_WERROR)
   if(MSVC)
     set(CMAKE_CXX_FLAGS "/WX ${CMAKE_CXX_FLAGS}")
@@ -53,8 +55,10 @@ add_subdirectory(src)
 add_custom_target(check-xptifw)
 
 add_subdirectory(unit_test)
-add_subdirectory(samples/basic_collector)
-add_subdirectory(samples/syclpi_collector)
+if (XPTI_BUILD_SAMPLES)
+  add_subdirectory(samples/basic_collector)
+  add_subdirectory(samples/syclpi_collector)
+endif()
 
 # The tests in basic_test are written using TBB, so these tests are enabled
 # only if TBB has been enabled.