diff --git a/devops/containers/ubuntu2404_base.Dockerfile b/devops/containers/ubuntu2404_base.Dockerfile
index 7af9ccfec1e5f..3cdad5b74366e 100644
--- a/devops/containers/ubuntu2404_base.Dockerfile
+++ b/devops/containers/ubuntu2404_base.Dockerfile
@@ -8,6 +8,13 @@ USER root
 COPY scripts/install_build_tools.sh /install.sh
 RUN /install.sh
 
+# libzstd-dev installed by default on Ubuntu 24.04 is not compiled with -fPIC flag.
+# This causes linking errors when building SYCL runtime.
+# Bug: https://github.com/intel/llvm/issues/15935
+# Workaround: build zstd from sources with -fPIC flag.
+COPY scripts/build_zstd_1_5_6_ub24.sh /build_zstd_1_5_6_ub24.sh
+RUN /build_zstd_1_5_6_ub24.sh
+
 COPY scripts/create-sycl-user.sh /user-setup.sh
 RUN /user-setup.sh
 
diff --git a/devops/containers/ubuntu2404_build.Dockerfile b/devops/containers/ubuntu2404_build.Dockerfile
index 5391030df006a..c659eabbced51 100644
--- a/devops/containers/ubuntu2404_build.Dockerfile
+++ b/devops/containers/ubuntu2404_build.Dockerfile
@@ -8,6 +8,13 @@ USER root
 COPY scripts/install_build_tools.sh /install.sh
 RUN /install.sh
 
+# libzstd-dev installed by default on Ubuntu 24.04 is not compiled with -fPIC flag.
+# This causes linking errors when building SYCL runtime.
+# Bug: https://github.com/intel/llvm/issues/15935
+# Workaround: build zstd from sources with -fPIC flag.
+COPY scripts/build_zstd_1_5_6_ub24.sh /build_zstd_1_5_6_ub24.sh
+RUN /build_zstd_1_5_6_ub24.sh
+
 SHELL ["/bin/bash", "-ec"]
 
 # Make the directory if it doesn't exist yet.
diff --git a/devops/scripts/build_zstd_1_5_6_ub24.sh b/devops/scripts/build_zstd_1_5_6_ub24.sh
new file mode 100755
index 0000000000000..68a947dfb43a0
--- /dev/null
+++ b/devops/scripts/build_zstd_1_5_6_ub24.sh
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# Script to build and install zstd 1.5.6 on Ubuntu 24, with -fPIC flag.
+# The default installation of zstd on Ubuntu 24 does not have -fPIC flag
+# enabled, which is required for building DPC++ in shared libraries mode.
+
+# Function to check if the OS is Ubuntu 24
+check_os() {
+    . /etc/os-release
+    if [[ "$NAME" != "Ubuntu" || "$VERSION_ID" != "24.04" ]]; then
+        echo "Warning: This script has only been tested with Ubuntu 24."
+    fi
+}
+
+# Function to install packages with or without sudo
+install_packages() {
+    if [ "$USE_SUDO" = true ]; then
+        sudo apt-get update
+        sudo apt-get install -y build-essential wget
+    else
+        apt-get update
+        apt-get install -y build-essential wget
+    fi
+}
+
+# Function to uninstall libzstd-dev if installed
+uninstall_libzstd_dev() {
+    if dpkg -l | grep -q libzstd-dev; then
+        if [ "$USE_SUDO" = true ]; then
+            sudo apt-get remove -y libzstd-dev
+        else
+            apt-get remove -y libzstd-dev
+        fi
+    fi
+}
+
+# Function to build a shared library by linking zstd static lib.
+# This is used to verify that zstd is built correctly, with -fPIC flag.
+build_test_program() {
+    cat <<EOF > test_zstd.c
+      #include <zstd.h>
+      int main() {
+        ZSTD_CCtx* cctx = ZSTD_createCCtx();
+        ZSTD_freeCCtx(cctx);
+        return 0;
+      }
+EOF
+
+    # Try to use zstd's static library with -fPIC
+    gcc test_zstd.c -lzstd -fPIC -shared
+    if [ $? -ne 0 ]; then
+        echo "zstd installation verification failed."
+    else
+        echo "zstd installation verification passed."
+    fi
+
+    # There won't be a.out file if verification failed.
+    rm test_zstd.c a.out || true
+}
+
+# Check the OS
+check_os
+
+# Set USE_SUDO to true or false based on your preference
+USE_SUDO=true
+
+# Install necessary build tools
+install_packages
+
+# Uninstall libzstd-dev package if installed
+uninstall_libzstd_dev
+
+# Define the version and URL for zstd
+ZSTD_VERSION="1.5.6"
+ZSTD_URL="https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-$ZSTD_VERSION.tar.gz"
+
+# Create a directory for the source code
+mkdir -p zstd_build
+cd zstd_build
+
+# Download and extract zstd source code
+wget $ZSTD_URL
+tar -xzf zstd-$ZSTD_VERSION.tar.gz
+cd zstd-$ZSTD_VERSION
+
+# Build zstd with -fPIC flag.
+CFLAGS="-fPIC" CXXFLAGS="-fPIC" make
+if [ $? -ne 0 ]; then
+    echo "Error: make failed."
+    exit 1
+fi
+
+# Install zstd.
+if [ "$USE_SUDO" = true ]; then
+    sudo make install
+else
+    make install
+fi
+if [ $? -ne 0 ]; then
+    echo "Error: make install failed."
+    exit 1
+fi
+
+# Verify zstd installation.
+build_test_program
+
+# Clean up
+rm -rf zstd_build