diff --git a/.github/workflows/gfx-windows-prexe-public.env b/.github/workflows/gfx-windows-prexe-public.env
new file mode 100644
index 00000000..21f19cb9
--- /dev/null
+++ b/.github/workflows/gfx-windows-prexe-public.env
@@ -0,0 +1 @@
+GFX_DRIVER_VERSION=windows-101.7026
\ No newline at end of file
diff --git a/.github/workflows/gfx-windows-public-bmg.env b/.github/workflows/gfx-windows-public-bmg.env
deleted file mode 100644
index 361a6126..00000000
--- a/.github/workflows/gfx-windows-public-bmg.env
+++ /dev/null
@@ -1 +0,0 @@
-GFX_DRIVER_VERSION=windows-101.6256
\ No newline at end of file
diff --git a/.github/workflows/gfx-windows-public.env b/.github/workflows/gfx-windows-public.env
index 7b7749cf..91a084f6 100644
--- a/.github/workflows/gfx-windows-public.env
+++ b/.github/workflows/gfx-windows-public.env
@@ -1 +1 @@
-GFX_DRIVER_VERSION=windows-101.6449
\ No newline at end of file
+GFX_DRIVER_VERSION=windows-latest
\ No newline at end of file
diff --git a/.github/workflows/internal.ci.yml b/.github/workflows/internal.ci.yml
index bcbdfcaa..58e12757 100644
--- a/.github/workflows/internal.ci.yml
+++ b/.github/workflows/internal.ci.yml
@@ -15,7 +15,7 @@ permissions: read-all
 jobs:
   package-source-tgz:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -35,7 +35,7 @@ jobs:
 
   package-linux:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -72,7 +72,7 @@ jobs:
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/v6.0.1-rk
-      ocloc-version: oneAPI/ocloc/2025.0
+      ocloc-version: oneAPI/ocloc/2025.2
       cmd: |
         echo $env:ROCM_PATH
         where ocloc.exe
@@ -149,7 +149,7 @@ jobs:
 
   build-rockylinux8:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -161,7 +161,7 @@ jobs:
   # FIXME: enable AOT and HIP
   build-rockylinux8-debug:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -172,7 +172,7 @@ jobs:
 
   build-rockylinux8-jit:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -183,7 +183,7 @@ jobs:
 
   build-rockylinux8-static:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -194,7 +194,7 @@ jobs:
 
   build-rockylinux8-namespace:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -205,7 +205,7 @@ jobs:
 
   build-rockylinux8-namespace-nover:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -216,7 +216,7 @@ jobs:
 
   build-rockylinux8-namespace-static:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -228,7 +228,7 @@ jobs:
   # FIXME: enable AOT and HIP
   build-rockylinux8-namespace-debug:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -239,7 +239,7 @@ jobs:
 
   build-rockylinux8-gcc:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -250,7 +250,7 @@ jobs:
 
   build-rockylinux8-gcc-debug:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -261,7 +261,7 @@ jobs:
 
   build-rockylinux8-gcc-minimal:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -272,7 +272,7 @@ jobs:
 
   build-rockylinux8-gcc-onednn:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -283,7 +283,7 @@ jobs:
 
   build-rockylinux8-gta-aotjit:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -298,7 +298,7 @@ jobs:
 
   build-rockylinux8-gta-jit:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -313,7 +313,7 @@ jobs:
 
   build-rockylinux8-oldsyclos:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -324,7 +324,7 @@ jobs:
 
   build-rockylinux8-syclos:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/rockylinux:8.8
@@ -335,7 +335,7 @@ jobs:
 
   build-ubuntu2204-gcc:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/ubuntu:22.04
@@ -345,7 +345,7 @@ jobs:
 
   build-ubuntu2204-gcc-debug:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/ubuntu:22.04
@@ -355,7 +355,7 @@ jobs:
 
   build-ubuntu2204-gcc-namespace:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/ubuntu:22.04
@@ -367,7 +367,7 @@ jobs:
 
   build-ubuntu2204-gcc-namespace-static:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/ubuntu:22.04
@@ -379,7 +379,7 @@ jobs:
 
   build-ubuntu2204-gcc-oiio:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/ubuntu:22.04
@@ -391,7 +391,7 @@ jobs:
 
   build-ubuntu2204-clang-asan:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/ubuntu:22.04
@@ -401,7 +401,7 @@ jobs:
 
   # build-ubuntu2004-gcc-minimal:
   #   secrets: inherit
-  #   uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+  #   uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
   #   with:
   #     project: oidn
   #     image: oidn-build:ubuntu20.04
@@ -409,7 +409,7 @@ jobs:
 
   # build-arch-gcc-oiio:
   #   secrets: inherit
-  #   uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+  #   uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
   #   with:
   #     project: oidn
   #     image: oidn-build:arch
@@ -421,7 +421,7 @@ jobs:
 
   build-ubuntu2204-icx:
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       image: oidn/ubuntu:22.04
@@ -477,7 +477,7 @@ jobs:
   test-rockylinux8-sse4:
     needs: build-rockylinux8
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "avx512" ]'
@@ -493,7 +493,7 @@ jobs:
   test-rockylinux8-avx2:
     needs: build-rockylinux8
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "avx2" ]'
@@ -507,7 +507,7 @@ jobs:
   test-rockylinux8-avx512:
     needs: build-rockylinux8
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "avx512" ]'
@@ -521,7 +521,7 @@ jobs:
   test-rockylinux8-namespace-nover-avx512:
     needs: build-rockylinux8-namespace-nover
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "avx512" ]'
@@ -535,7 +535,7 @@ jobs:
   test-rockylinux8-static-avx512:
     needs: build-rockylinux8-static
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "avx512" ]'
@@ -549,7 +549,7 @@ jobs:
   test-rockylinux8-adl:
     needs: build-rockylinux8
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "gpu_amd" ]' # FIXME: igpu, adl
@@ -564,7 +564,7 @@ jobs:
   test-rockylinux8-dg2:
     needs: build-rockylinux8
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "dg2" ]'
@@ -579,7 +579,7 @@ jobs:
   test-rockylinux8-bmg:
     needs: build-rockylinux8
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "bmg" ]'
@@ -594,7 +594,7 @@ jobs:
   test-rockylinux8-pvc:
     needs: build-rockylinux8
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "pvc" ]'
@@ -611,7 +611,7 @@ jobs:
   test-rockylinux8-cuda:
     needs: build-rockylinux8
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "gpu_nvidia" ]'
@@ -626,7 +626,7 @@ jobs:
   test-rockylinux8-namespace-nover-cuda:
     needs: build-rockylinux8-namespace-nover
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "gpu_nvidia" ]'
@@ -641,7 +641,7 @@ jobs:
   test-rockylinux8-hip:
     needs: build-rockylinux8
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "gpu_amd" ]'
@@ -656,7 +656,7 @@ jobs:
   test-rockylinux8-namespace-static-dg2:
     needs: build-rockylinux8-namespace-static
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "dg2" ]'
@@ -671,7 +671,7 @@ jobs:
   test-rockylinux8-oldsyclos-avx2:
     needs: build-rockylinux8-oldsyclos
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "avx2" ]'
@@ -685,7 +685,7 @@ jobs:
   test-rockylinux8-oldsyclos-dg2:
     needs: build-rockylinux8-oldsyclos
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "dg2" ]'
@@ -700,7 +700,7 @@ jobs:
   test-rockylinux8-syclos-avx2:
     needs: build-rockylinux8-syclos
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "avx2" ]'
@@ -714,7 +714,7 @@ jobs:
   test-rockylinux8-syclos-dg2:
     needs: build-rockylinux8-syclos
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "dg2" ]'
@@ -729,7 +729,7 @@ jobs:
   test-rockylinux8-debug-avx2:
     needs: build-rockylinux8-debug
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "avx2" ]'
@@ -743,7 +743,7 @@ jobs:
   test-rockylinux8-namespace-avx2:
     needs: build-rockylinux8-namespace
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "avx2" ]'
@@ -757,7 +757,7 @@ jobs:
   test-rockylinux8-gcc-onednn-avx2:
     needs: build-rockylinux8-gcc-onednn
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "avx2" ]'
@@ -771,7 +771,7 @@ jobs:
   test-ubuntu2204-clang-asan:
     needs: build-ubuntu2204-clang-asan
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "gpu_nvidia" ]'
@@ -787,7 +787,7 @@ jobs:
   test-ubuntu2204-clang-asan-cuda:
     needs: build-ubuntu2204-clang-asan
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "gpu_nvidia" ]'
@@ -805,7 +805,7 @@ jobs:
   test-ubuntu2204-icx-avx2:
     needs: build-ubuntu2204-icx
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "avx2" ]'
@@ -820,7 +820,7 @@ jobs:
   test-ubuntu2204-icx-dg2:
     needs: build-ubuntu2204-icx
     secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker_gpu.yml@main
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       project: oidn
       runs-on: '[ "Linux", "dg2" ]'
@@ -1237,7 +1237,7 @@ jobs:
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/v6.0.1-rk
-      ocloc-version: oneAPI/ocloc/2025.0
+      ocloc-version: oneAPI/ocloc/2025.2
       artifact-out: build-windows
       artifact-path: build install
       cmd: python scripts/build.py install --full
@@ -1250,7 +1250,7 @@ jobs:
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/v6.0.1-rk
-      ocloc-version: oneAPI/ocloc/2025.0
+      ocloc-version: oneAPI/ocloc/2025.2
       artifact-out: build-windows-static
       artifact-path: build install
       cmd: python scripts/build.py install --full -D OIDN_STATIC_LIB=ON
@@ -1264,7 +1264,7 @@ jobs:
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/v6.0.1-rk
-      ocloc-version: oneAPI/ocloc/2025.0
+      ocloc-version: oneAPI/ocloc/2025.2
       artifact-out: build-windows-debug
       artifact-path: build install
       cmd: >
@@ -1279,7 +1279,7 @@ jobs:
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/v6.0.1-rk
-      ocloc-version: oneAPI/ocloc/2025.0
+      ocloc-version: oneAPI/ocloc/2025.2
       artifact-out: build-windows-namespace
       artifact-path: build install
       cmd: python scripts/build.py install --full -D OIDN_LIBRARY_NAME=OIDN -D OIDN_API_NAMESPACE=myoidn
@@ -1292,7 +1292,7 @@ jobs:
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/v6.0.1-rk
-      ocloc-version: oneAPI/ocloc/2025.0
+      ocloc-version: oneAPI/ocloc/2025.2
       artifact-out: build-windows-namespace-nover
       artifact-path: build install
       cmd: python scripts/build.py install --full -D OIDN_LIBRARY_NAME=OIDN -D OIDN_API_NAMESPACE=myoidn -D OIDN_LIBRARY_VERSIONED=OFF
@@ -1305,7 +1305,7 @@ jobs:
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/v6.0.1-rk
-      ocloc-version: oneAPI/ocloc/2025.0
+      ocloc-version: oneAPI/ocloc/2025.2
       artifact-out: build-windows-namespace-static
       artifact-path: build install
       cmd: python scripts/build.py install --full -D OIDN_LIBRARY_NAME=OIDN -D OIDN_API_NAMESPACE=myoidn -D OIDN_STATIC_LIB=ON
@@ -1318,7 +1318,7 @@ jobs:
       runs-on: '[ "Windows", "build" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/v6.0.1-rk
-      ocloc-version: oneAPI/ocloc/2025.0
+      ocloc-version: oneAPI/ocloc/2025.2
       artifact-out: build-windows-gta-aotjit
       artifact-path: oidn-gta-aotjit-win
       cmd: >
@@ -1335,7 +1335,7 @@ jobs:
       runs-on: '[ "Windows", "build" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/v6.0.1-rk
-      ocloc-version: oneAPI/ocloc/2025.0
+      ocloc-version: oneAPI/ocloc/2025.2
       artifact-out: build-windows-gta-jit
       artifact-path: oidn-gta-jit-win
       cmd: >
@@ -1352,7 +1352,7 @@ jobs:
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/v6.0.1-rk
-      ocloc-version: oneAPI/ocloc/2025.0
+      ocloc-version: oneAPI/ocloc/2025.2
       artifact-out: build-windows-cudart
       artifact-path: build install
       cmd: python scripts/build.py install --full -D OIDN_DEVICE_CUDA_API=RuntimeStatic
@@ -1365,7 +1365,7 @@ jobs:
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/sycl-rel_5_2_0-rk
-      ocloc-version: oneAPI/ocloc/2025.0
+      ocloc-version: oneAPI/ocloc/2025.2
       artifact-out: build-windows-syclos
       artifact-path: build install
       cmd: python scripts/build.py install --full -D OIDN_DEVICE_SYCL_AOT=OFF
@@ -1377,8 +1377,8 @@ jobs:
       project: oidn
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
-      dpcpp-version: oneAPI/compiler/2025.0
-      ocloc-version: oneAPI/ocloc/2025.0
+      dpcpp-version: intel/2025.2
+      ocloc-version: oneAPI/ocloc/2025.2
       artifact-out: build-windows-icx
       artifact-path: build install
       cmd: python scripts/build.py install --compiler icx --full
@@ -1629,7 +1629,7 @@ jobs:
     with:
       project: oidn
       runs-on: '[ "Windows", "igpu", "adl" ]'
-      env-from-files: ./.github/workflows/gfx-windows-public.env
+      env-from-files: ./.github/workflows/gfx-windows-prexe-public.env
       artifact-in: build-windows
       artifact-out: test-windows-adl
       artifact-path: test.log
@@ -1657,7 +1657,7 @@ jobs:
     with:
       project: oidn
       runs-on: '[ "Windows", "bmg", "NAS" ]'
-      env-from-files: ./.github/workflows/gfx-windows-public-bmg.env
+      env-from-files: ./.github/workflows/gfx-windows-public.env
       artifact-in: build-windows
       artifact-out: test-windows-bmg
       artifact-path: test.log
diff --git a/devices/sycl/sycl_engine.h b/devices/sycl/sycl_engine.h
index 48648649..36a2ee1d 100644
--- a/devices/sycl/sycl_engine.h
+++ b/devices/sycl/sycl_engine.h
@@ -90,7 +90,11 @@ OIDN_NAMESPACE_BEGIN
       lastEvent = syclQueue.parallel_for<Kernel>(
         sycl::nd_range<N>(numGroups * groupSize, groupSize),
         getDepEvents(),
+      #if defined(SYCL_LANGUAGE_VERSION) && (SYCL_LANGUAGE_VERSION >= 202001)
+        [=](sycl::nd_item<N> it) [[sycl::reqd_sub_group_size(subgroupSize)]] { kernel(it); });
+      #else
         [=](sycl::nd_item<N> it) [[intel::reqd_sub_group_size(subgroupSize)]] { kernel(it); });
+      #endif
     }
 
     // Enqueues a basic ESIMD kernel