diff --git a/.github/workflows/sycl_linux_build_and_test.yml b/.github/workflows/sycl_linux_build_and_test.yml
index 62557fe6ac2c..8615e23f3a7e 100644
--- a/.github/workflows/sycl_linux_build_and_test.yml
+++ b/.github/workflows/sycl_linux_build_and_test.yml
@@ -89,7 +89,7 @@ jobs:
         path: src
     - name: Setup Cache
       uses: actions/cache@v2
-      if: ${{ steps.parameters.build_github_cache }}
+      if: ${{ fromJSON(needs.configure.outputs.params).build_github_cache }}
       id: cache
       with:
         path: ${{ fromJSON(needs.configure.outputs.params).build_cache_root }}/build_cache_${{ fromJSON(needs.configure.outputs.params).build_cache_suffix }}
diff --git a/.github/workflows/sycl_post_commit.yml b/.github/workflows/sycl_post_commit.yml
index c105ee34665a..e5572243b134 100644
--- a/.github/workflows/sycl_post_commit.yml
+++ b/.github/workflows/sycl_post_commit.yml
@@ -4,16 +4,25 @@ on:
   push:
     branches:
       - sycl
+  pull_request:
+    branches:
+      - sycl
+    paths:
+      - .github/workflows/sycl_post_commit.yml
+
 jobs:
   linux_default:
     name: Linux Default
+    if: github.repository == 'intel/llvm'
     uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl
     with:
-      build_cache_root: "/__w/llvm"
-      build_github_cache: true
+      build_runs_on: sycl-precommit-linux
+      build_cache_root: "/__w/"
+      build_cache_size: "8G"
       build_artifact_suffix: default
   linux_no_assert:
     name: Linux (no assert)
+    if: github.repository == 'intel/llvm'
     uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl
     with:
       build_cache_root: "/__w/llvm"
@@ -22,72 +31,13 @@ jobs:
       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
+    name: Linux (clang + shared libs)
     if: github.repository == 'intel/llvm'
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        path: src
-    - name: Install Ubuntu deps
-      run: sudo apt install -y ninja-build ccache
-    - name: Setup Cache
-      uses: actions/cache@v2
-      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-13 main"
-        sudo apt-get update
-        sudo apt-get install -y clang-13
-        export CC="clang-13"
-        export CXX="clang++-13"
-        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@v1
-      with:
-        name: sycl_linux_${{ matrix.config }}
-        path: llvm_sycl.tar.gz
+    uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl
+    with:
+      build_image: "ghcr.io/intel/llvm/sycl_ubuntu2004_nightly:no-drivers"
+      build_cache_root: "/__w/llvm"
+      build_github_cache: true
+      build_cache_suffix: clang_shared_libs
+      build_artifact_suffix: clang_shared_libs
+      build_configure_extra_args: --shared-libs