diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml
index 13583e7a44142..d7789e91f3f7e 100644
--- a/.github/workflows/sycl-linux-build.yml
+++ b/.github/workflows/sycl-linux-build.yml
@@ -328,43 +328,32 @@ jobs:
         comm -13 env_before env_after >> $GITHUB_ENV
         rm env_before env_after
 
-    - name: Build E2E tests
-      if: ${{ inputs.e2e_binaries_artifact && !cancelled() && steps.build.conclusion == 'success' }}
-      uses: ./devops/actions/run-tests/e2e
-      with:
-        ref: ${{ inputs.ref || github.sha }}
-        testing_mode: build-only
-        target_devices: all
-        binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
-        sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++
-        extra_lit_opts: --param sycl_build_targets="spir;nvidia;amd"
-
-    - name: Remove E2E tests before spirv-backend run
-      if: ${{ inputs.e2e_binaries_spirv_backend_artifact && !cancelled() && steps.build.conclusion == 'success' }}
-      run: rm -rf build-e2e
-
-    - name: Build E2E tests with SPIR-V Backend
-      if: ${{ inputs.e2e_binaries_spirv_backend_artifact && !cancelled() && steps.build.conclusion == 'success' }}
-      uses: ./devops/actions/run-tests/e2e
-      with:
-        ref: ${{ inputs.ref || github.sha }}
-        testing_mode: build-only
-        target_devices: all
-        binaries_artifact: ${{ inputs.e2e_binaries_spirv_backend_artifact }}
-        sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++
-        extra_lit_opts: --param spirv-backend=True
-
-    - name: Remove E2E tests before preview-mode run
-      if: ${{ inputs.e2e_binaries_preview_artifact && !cancelled() && steps.build.conclusion == 'success' }}
-      run: rm -rf build-e2e
+  build-e2e:
+    name: Build E2E tests
+    needs: [build]
+    if: ${{ !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
+    permissions:
+      contents: write
+      packages: read
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Build E2E tests
+            binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
+            extra_lit_opts: --param sycl_build_targets="spir;nvidia;amd"
+          - name: Build E2E tests with SPIR-V Backend
+            binaries_artifact: ${{ inputs.e2e_binaries_spirv_backend_artifact }}
+            extra_lit_opts: --param spirv-backend=True
+          - name: Build E2E tests in Preview Mode
+            binaries_artifact: ${{ inputs.e2e_binaries_preview_artifact }}
+            extra_lit_opts: --param test-preview-mode=True
 
-    - name: Build E2E tests in Preview Mode
-      if: ${{ inputs.e2e_binaries_preview_artifact && !cancelled() && steps.build.conclusion == 'success' }}
-      uses: ./devops/actions/run-tests/e2e
-      with:
-        ref: ${{ inputs.ref || github.sha }}
-        testing_mode: build-only
-        target_devices: all
-        binaries_artifact: ${{ inputs.e2e_binaries_preview_artifact }}
-        sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++
-        extra_lit_opts: --param test-preview-mode=True
+    uses: ./devops/actions/run-tests/e2e
+    with:
+      ref: ${{ inputs.ref || github.sha }}
+      testing_mode: build-only
+      target_devices: all
+      binaries_artifact: ${{ matrix.binaries_artifact }}
+      sycl_compiler: $GITBUN_WORKSPACE/toolchain/bin/clang++
+      extra_lit_opts: ${{ matrix.extra_lit_opts }}
diff --git a/devops/actions/run-tests/e2e/action.yml b/devops/actions/run-tests/e2e/action.yml
index 2b0564bd1bc2e..74625f3d942ea 100644
--- a/devops/actions/run-tests/e2e/action.yml
+++ b/devops/actions/run-tests/e2e/action.yml
@@ -106,3 +106,6 @@ runs:
       name: ${{ inputs.binaries_artifact }}
       path: e2e_binaries.tar.zst
       retention-days: ${{ inputs.retention-days }}
+  - name: Cleanup E2E tests
+    if: ${{ !cancelled() }}
+    run: rm -rf build-e2e
diff --git a/devops/actions/run-tests/windows/e2e/action.yml b/devops/actions/run-tests/windows/e2e/action.yml
index 3564361601d91..c77cf41f52e14 100644
--- a/devops/actions/run-tests/windows/e2e/action.yml
+++ b/devops/actions/run-tests/windows/e2e/action.yml
@@ -121,3 +121,7 @@ runs:
       name: ${{ inputs.binaries_artifact }}
       path: e2e_bin.tar.gz
       retention-days: ${{ inputs.retention-days }}
+  - name: Cleanup E2E tests
+    if: ${{ !cancelled() }}
+    shell: bash
+    run: rm -rf build-e2e