diff --git a/.github/workflows/sycl_post_commit.yml b/.github/workflows/sycl_post_commit.yml
index d4676209e0409..1b7f4b94675bb 100644
--- a/.github/workflows/sycl_post_commit.yml
+++ b/.github/workflows/sycl_post_commit.yml
@@ -47,76 +47,19 @@ jobs:
       build_cache_suffix: gcc_no_assertions
       build_artifact_suffix: gcc_no_assertions
       build_configure_extra_args: --no-assertions
-  linux_clang_shared_libs:
-    # TODO use nightly images when Docker containers are available
-    name: Linux + Clang + Shared libs
-    runs-on: ubuntu-20.04
+  linux_self_prod:
+    name: Linux (Self build + shared libraries)
     if: github.repository == 'intel/llvm'
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        path: src
-    - name: Install Ubuntu deps
-      run: sudo apt install -y ninja-build ccache
-    - name: Setup Cache
-      uses: actions/cache@v3
-      id: cache
-      with:
-        path: ${{ github.workspace }}/cache
-        key: build-linux-shared-libs-${{ github.sha }}
-        restore-keys: |
-          build-linux-shared-libs-
-    - name: Configure
-      run: |
-        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        sudo add-apt-repository "deb http://apt.llvm.org/focal/   llvm-toolchain-focal-15 main"
-        sudo apt-get update
-        sudo apt-get install -y clang-15
-        export CC="clang-15"
-        export CXX="clang++-15"
-        mkdir -p $GITHUB_WORKSPACE/build
-        cd $GITHUB_WORKSPACE/build
-        python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
-         -s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
-         --ci-defaults --shared-libs --cmake-opt="-DLLVM_CCACHE_BUILD=ON" \
-         --cmake-opt="-DLLVM_CCACHE_DIR=$GITHUB_WORKSPACE/cache" \
-         --cmake-opt="-DLLVM_CCACHE_MAXSIZE=2G"
-    - name: Compile
-      run: |
-        python3 $GITHUB_WORKSPACE/src/buildbot/compile.py -w  $GITHUB_WORKSPACE \
-         -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build
-    - name: check-llvm
-      if: always()
-      run: |
-        python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w  $GITHUB_WORKSPACE \
-         -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-llvm
-    - name: check-clang
-      if: always()
-      run: |
-        python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w  $GITHUB_WORKSPACE \
-         -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-clang
-    - name: check-sycl
-      if: always()
-      run: |
-        python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w  $GITHUB_WORKSPACE \
-         -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-sycl
-    - name: check-llvm-spirv
-      if: always()
-      run: |
-        python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w  $GITHUB_WORKSPACE \
-         -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-llvm-spirv
-    - name: check-xptifw
-      if: always()
-      run: |
-        python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w  $GITHUB_WORKSPACE \
-         -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-xptifw
-    - name: Pack
-      run: tar -czvf llvm_sycl.tar.gz -C $GITHUB_WORKSPACE/build/install .
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: sycl_linux_${{ matrix.config }}
-        path: llvm_sycl.tar.gz
+    uses: ./.github/workflows/sycl_linux_build_and_test.yml
+    with:
+      build_cache_root: "/__w/llvm"
+      build_cache_suffix: sprod_shared
+      build_artifact_suffix: sprod_shared
+      build_configure_extra_args: --shared-libs
+      # Docker image has last nightly pre-installed and added to the PATH
+      build_image: "ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:no-drivers"
+      cc: clang
+      cxx: clang++
 
   windows_default:
     name: Windows