diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml
index 025cbd0051..018fe235c3 100644
--- a/.github/workflows/continuous.yml
+++ b/.github/workflows/continuous.yml
@@ -200,92 +200,63 @@ jobs:
 #   # Linux
 #   ########################################
 
-  linux-fedora29-CLANG4:
+  linux-fedora42-CLANG:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       runs-on: '[ "Linux", "docker", "avx512" ]'
       cmd: |
-        module load cmake/3.25.3
-        cmake --preset linux-fedora29-CLANG4 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2
+        cmake --preset linux-fedora42-CLANG -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2
         cmake --build build --config RelWithDebInfo --target build
         cmake --build build --config RelWithDebInfo --target test_package
 
-  linux-fedora29-CLANG5-INT-ADDRSANITIZER:
+  linux-fedora42-CLANG-INT-ADDRSANITIZER:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       runs-on: '[ "Linux", "docker", "build" ]'
       cmd: |
-        module load cmake/3.25.3
-        cmake --preset linux-fedora29-CLANG5-INT-ADDRSANITIZER -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
+        cmake --preset linux-fedora42-CLANG-INT-ADDRSANITIZER -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --config RelWithDebInfo --target build
         cmake --build build --config RelWithDebInfo --target test_package
 
-  linux-fedora29-ICX:
+  linux-fedora42-ICX:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       runs-on: '[ "Linux", "docker", "avx512" ]'
       dpcpp-version: intel/2025.2
       cmd: |
-        module load cmake/3.25.3
-        cmake --preset linux-fedora29-ICX -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2
+        cmake --preset linux-fedora42-ICX -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2
         cmake --build build --config RelWithDebInfo --target build
         cmake --build build --config RelWithDebInfo --target test_package
 
-  linux-fedora32-ICX:
+  linux-ubuntu24_04-GCC:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:32
+      image: embree/ubuntu:24.04
       runs-on: '[ "Linux", "docker", "avx512" ]'
-      dpcpp-version: intel/2025.2
-      cmd: |
-        module load cmake/3.25.3
-        cmake --preset linux-fedora32-ICX -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2
-        cmake --build build --config RelWithDebInfo --target build
-        cmake --build build --config RelWithDebInfo --target test_package
-
-  linux-ubuntu20_04-GCC-NAMESPACE:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/ubuntu:20.04
-      runs-on: '[ "Linux", "docker", "build" ]'
       cmd: |
-        module load cmake/3.25.3
-        cmake --preset linux-ubuntu20_04-GCC-NAMESPACE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
-        cmake --build build --config RelWithDebInfo --target build
-        cmake --build build --config RelWithDebInfo --target test_package
+        cmake -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DEMBREE_TESTING_INSTALL_TESTS=ON -DCMAKE_INSTALL_TESTDIR="testing" -DEMBREE_TESTING_INTENSITY=3
+        cmake --build build --config Release --target build
+        cmake --build build --config Release --target test_package
 
-  linux-ubuntu20_04-ICX:
+  linux-ubuntu24_04-ICX:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/ubuntu:20.04
+      image: embree/ubuntu:24.04
       runs-on: '[ "Linux", "docker", "avx512" ]'
       dpcpp-version: intel/2025.2
       cmd: |
-        module load cmake/3.25.3
-        cmake --preset linux-ubuntu20_04-ICX -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2
+        cmake --preset linux-ubuntu24_04-ICX -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2
         cmake --build build --config RelWithDebInfo --target build
         cmake --build build --config RelWithDebInfo --target test_package
 
-  linux-ubuntu24_04-GCC:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/ubuntu:24.04
-      runs-on: '[ "Linux", "docker", "avx512" ]'
-      cmd: |
-        cmake -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DEMBREE_TESTING_INSTALL_TESTS=ON -DCMAKE_INSTALL_TESTDIR="testing" -DEMBREE_TESTING_INTENSITY=3
-        cmake --build build --config Release --target build
-        cmake --build build --config Release --target test_package
-
   ########################################
   # Windows
   ########################################
diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
index be24dcb8f9..f2d260224b 100644
--- a/.github/workflows/integrate.yml
+++ b/.github/workflows/integrate.yml
@@ -194,7 +194,6 @@ jobs:
       artifact-out: integrate-linux-GCC
       artifact-path: ./build/*.tar.gz
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-linux-gcc -DCMAKE_BUILD_TYPE=Release
         cmake --build build --config Release --target build
 
@@ -207,7 +206,6 @@ jobs:
       runs-on: '[ "Linux", "docker", "avx512" ]'
       artifact-in: integrate-linux-GCC
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-linux-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-gcc
         cmake --build build --config Release --target test_integration
 
@@ -220,7 +218,6 @@ jobs:
       runs-on: '[ "Linux", "docker", "avx512" ]'
       artifact-in: integrate-linux-GCC
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-linux-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-clang
         cmake --build build --config Release --target test_integration
 
@@ -234,7 +231,6 @@ jobs:
       dpcpp-version: intel/2025.2
       artifact-in: integrate-linux-GCC
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-linux-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx
         cmake --build build --config Release --target test_integration
 
@@ -248,7 +244,6 @@ jobs:
       artifact-out: integrate-linux-ICX
       artifact-path: ./build/*.tar.gz
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-linux-icx -DCMAKE_BUILD_TYPE=Release
         cmake --build build --config Release --target build
 
@@ -261,7 +256,6 @@ jobs:
       runs-on: '[ "Linux", "docker", "avx512" ]'
       artifact-in: integrate-linux-ICX
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-linux-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-gcc
         cmake --build build --config Release --target test_integration
 
@@ -275,7 +269,6 @@ jobs:
       dpcpp-version: intel/2025.2
       artifact-in: integrate-linux-ICX
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-linux-icx -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-clang
         cmake --build build --config Release --target test_integration
 
@@ -289,7 +282,6 @@ jobs:
       dpcpp-version: intel/2025.2
       artifact-in: integrate-linux-ICX
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-linux-icx -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx
         cmake --build build --config Release --target test_integration
         
@@ -306,7 +298,6 @@ jobs:
       artifact-out: integrate-static-linux-CLANG
       artifact-path: ./build/*.tar.gz
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-static-linux-clang -DCMAKE_BUILD_TYPE=Release
         cmake --build build --config Release --target build
 
@@ -319,7 +310,6 @@ jobs:
       runs-on: '[ "Linux", "docker", "avx512" ]'
       artifact-in: integrate-static-linux-CLANG
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-static-linux-clang -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-gcc
         cmake --build build --config Release --target test_integration
 
@@ -332,7 +322,6 @@ jobs:
       runs-on: '[ "Linux", "docker", "avx512" ]'
       artifact-in: integrate-static-linux-CLANG
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-static-linux-clang -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-clang
         cmake --build build --config Release --target test_integration
 
@@ -346,7 +335,6 @@ jobs:
       dpcpp-version: intel/2025.2
       artifact-in: integrate-static-linux-CLANG
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-static-linux-clang -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx
         cmake --build build --config Release --target test_integration
         
@@ -364,7 +352,6 @@ jobs:
       artifact-out: integrate-static-linux-GCC
       artifact-path: ./build/*.tar.gz
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-static-linux-gcc -DCMAKE_BUILD_TYPE=Release
         cmake --build build --config Release --target build
 
@@ -377,7 +364,6 @@ jobs:
       runs-on: '[ "Linux", "docker", "avx512" ]'
       artifact-in: integrate-static-linux-GCC
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-static-linux-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-gcc
         cmake --build build --config Release --target test_integration
 
@@ -390,7 +376,6 @@ jobs:
       runs-on: '[ "Linux", "docker", "avx512" ]'
       artifact-in: integrate-static-linux-GCC
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-static-linux-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-clang
         cmake --build build --config Release --target test_integration
 
@@ -404,7 +389,6 @@ jobs:
       dpcpp-version: intel/2025.2
       artifact-in: integrate-static-linux-GCC
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-static-linux-gcc -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx
         cmake --build build --config Release --target test_integration
 
@@ -419,7 +403,6 @@ jobs:
       artifact-out: integrate-static-linux-ICX
       artifact-path: ./build/*.tar.gz
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-static-linux-icx -DCMAKE_BUILD_TYPE=Release
         cmake --build build --config Release --target build
 
@@ -433,7 +416,6 @@ jobs:
       dpcpp-version: intel/2025.2
       artifact-in: integrate-static-linux-ICX
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-static-linux-icx -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-gcc
         cmake --build build --config Release --target test_integration
 
@@ -447,7 +429,6 @@ jobs:
       dpcpp-version: intel/2025.2
       artifact-in: integrate-static-linux-ICX
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-static-linux-icx -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-clang
         cmake --build build --config Release --target test_integration
 
@@ -461,7 +442,6 @@ jobs:
       dpcpp-version: intel/2025.2
       artifact-in: integrate-static-linux-ICX
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-static-linux-icx -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx
         cmake --build build --config Release --target test_integration
         
@@ -474,7 +454,6 @@ jobs:
       artifact-out: integrate-linux-CLANG
       artifact-path: ./build/*.tar.gz
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-linux-clang -DCMAKE_BUILD_TYPE=Release
         cmake --build build --config Release --target build
 
@@ -487,7 +466,6 @@ jobs:
       runs-on: '[ "Linux", "docker", "avx512" ]'
       artifact-in: integrate-linux-CLANG
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-linux-clang -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-gcc
         cmake --build build --config Release --target test_integration
 
@@ -500,7 +478,6 @@ jobs:
       runs-on: '[ "Linux", "docker", "avx512" ]'
       artifact-in: integrate-linux-CLANG
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-linux-clang -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-clang
         cmake --build build --config Release --target test_integration
 
@@ -514,7 +491,6 @@ jobs:
       dpcpp-version: intel/2025.2
       artifact-in: integrate-linux-CLANG
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-linux-clang -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx
         cmake --build build --config Release --target test_integration
 
@@ -535,7 +511,6 @@ jobs:
       artifact-out: integrate-sycl-linux-ICX
       artifact-path: ./build/*.tar.gz
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-sycl-linux-icx -DCMAKE_BUILD_TYPE=Release
         cmake --build build --config Release --target build
 
@@ -551,7 +526,6 @@ jobs:
       dpcpp-version: intel/2025.2
       artifact-in: integrate-sycl-linux-ICX
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-sycl-linux-icx -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx
         cmake --build build --config Release --target test_integration
         
@@ -565,7 +539,6 @@ jobs:
       artifact-out: integrate-sycl-linux-DPCPP
       artifact-path: ./build/*.tar.gz
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-sycl-linux-dpcpp -DCMAKE_BUILD_TYPE=Release
         cmake --build build --config Release --target build
 
@@ -580,7 +553,6 @@ jobs:
       env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env
       artifact-in: integrate-sycl-linux-DPCPP
       cmd: |
-        module load cmake/3.25.3
         cmake --preset integrate-sycl-linux-dpcpp -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-clang
         cmake --build build --config Release --target test_integration
         
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 5a53a519e7..f54ca6bc9c 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -31,7 +31,6 @@ jobs:
       artifact-out: nightly-linux-DG2-JIT-MULTILEVEL-build
       artifact-path: ./build/*.tar.gz
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-DG2-JIT-MULTILEVEL -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
         cmake --build build --config Release --target build
 
@@ -47,7 +46,6 @@ jobs:
       env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env
       artifact-in: nightly-linux-DG2-JIT-MULTILEVEL-build
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-DG2-JIT-MULTILEVEL -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
         cmake --build build --config Release --target test_package
 
@@ -62,7 +60,6 @@ jobs:
       artifact-out: nightly-linux-DG2-JIT-PUBLIC-build
       artifact-path: ./build/*.tar.gz
       cmd: |
-        module load cmake/3.25.3
         cmake --preset linux-DG2-JIT-PUBLIC -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
         cmake --build build --config Release --target build
 
@@ -78,7 +75,6 @@ jobs:
       env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env
       artifact-in: nightly-linux-DG2-JIT-PUBLIC-build
       cmd: |
-        module load cmake/3.25.3
         cmake --preset linux-DG2-JIT-PUBLIC -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
         cmake --build build --config Release --target test_package
 
@@ -268,50 +264,46 @@ jobs:
 
   # CLANG
 
-  nightly-linux-DEBUG-CLANG4-SSE2-NAMESPACE:
+  nightly-linux-DEBUG-CLANG-SSE2-NAMESPACE:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
-        cmake --preset nightly-linux-DEBUG-CLANG4-SSE2-NAMESPACE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4
+        cmake --preset nightly-linux-DEBUG-CLANG-SSE2-NAMESPACE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4
         cmake --build build --target build
         cmake --build build --target test_package
 
-  nightly-linux-DEBUG-CLANG5-ISPC1_14_1-AVX2-INT-ADDRSANITIZER:
+  nightly-linux-DEBUG-CLANG-ISPC1_14_1-AVX2-INT-ADDRSANITIZER:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
-        cmake --preset nightly-linux-DEBUG-CLANG5-ISPC1_14_1-AVX2-INT-ADDRSANITIZER -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4
+        cmake --preset nightly-linux-DEBUG-CLANG-ISPC1_14_1-AVX2-INT-ADDRSANITIZER -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4
         cmake --build build --target build
         cmake --build build --target test_package
 
-  nightly-linux-DEBUG-CLANG4-ISPC1_16_1-AVX2-TBB2021_9_0-STATIC:
+  nightly-linux-DEBUG-CLANG-ISPC1_16_1-AVX2-TBB2021_9_0-STATIC:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
-        cmake --preset nightly-linux-DEBUG-CLANG4-ISPC1_16_1-AVX2-TBB2021_9_0-STATIC -DCMAKE_BUILD_TYPE=RelWithDebInfo  -DEMBREE_TESTING_INTENSITY=4
+        cmake --preset nightly-linux-DEBUG-CLANG-ISPC1_16_1-AVX2-TBB2021_9_0-STATIC -DCMAKE_BUILD_TYPE=RelWithDebInfo  -DEMBREE_TESTING_INTENSITY=4
         cmake --build build --target build
         cmake --build build --target test_package
 
-  # GCC
+  # CLANG
 
-  nightly-linux-DEBUG-CLANG4-ISPC1_16_1-AVX512VL-TBB2020_2:
+  nightly-linux-DEBUG-CLANG-ISPC1_16_1-AVX512VL-TBB2020_2:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       runs-on: '[ "Linux", "docker", "avx512" ]'
       cmd: |
-        module load cmake/3.25.3
-        cmake --preset nightly-linux-DEBUG-CLANG4-ISPC1_16_1-AVX512VL-TBB2020_2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=3
+        cmake --preset nightly-linux-DEBUG-CLANG-ISPC1_16_1-AVX512VL-TBB2020_2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=3
         cmake --build build --target build
         cmake --build build --target test_package
 
@@ -319,9 +311,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-DEBUG-GCC-ISPC1_16_1-SSE2-TBB2021_2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4
         cmake --build build --target build
         cmake --build build --target test_package
@@ -330,9 +321,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-DEBUG-GCC-ISPC1_16_1-AVX-TBB2019_9 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4
         cmake --build build --target build
         cmake --build build --target test_package
@@ -341,9 +331,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-DEBUG-GCC-ISPC1_17_0-AVX2-TBB2021_2_0 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4
         cmake --build build --target build
         cmake --build build --target test_package
@@ -356,7 +345,6 @@ jobs:
       image: embree/rockylinux:8.7
       dpcpp-version: intel/2025.2
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-DEBUG-ICX-ISPC1_16_1-AVX-TBB2019_2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4
         cmake --build build --target build
         cmake --build build --target test_package
@@ -369,7 +357,6 @@ jobs:
       runs-on: '[ "Linux", "docker", "avx512" ]'
       dpcpp-version: intel/2025.2
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-DEBUG-ICX-ISPC1_16_1-AVX512VL-TBB2019_2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4
         cmake --build build --target build
         cmake --build build --target test_package
@@ -378,11 +365,10 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       runs-on: '[ "Linux", "docker", "avx512" ]'
       dpcpp-version: intel/2025.2
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-DEBUG-ICX-ISPC1_16_1-AVX512-TBB2019_9 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4
         cmake --build build --target build
         cmake --build build --target test_package
@@ -391,10 +377,9 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       dpcpp-version: intel/2025.2
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-DEBUG-ICX-ISPC1_16_1-AVX2-TBB2021_2_0 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4
         cmake --build build --target build
         cmake --build build --target test_package
@@ -406,7 +391,6 @@ jobs:
       image: embree/rockylinux:8.7
       dpcpp-version: intel/2025.2
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-DEBUG-ICX-ISPC1_17_0-AVX2-TBB2019_9 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=4
         cmake --build build --target build
         cmake --build build --target test_package
@@ -419,146 +403,112 @@ jobs:
       runs-on: '[ "Linux", "docker", "avx512" ]'
       dpcpp-version: intel/2025.2
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-DEBUG-ICX-ISPC1_17_0-AVX512VL-TBB2021_5_0 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2
         cmake --build build --target build
         cmake --build build --target test_package
 
   # Testing different distros
 
-  nightly-ubuntu20_04-DEBUG:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/ubuntu:20.04
-      cmd: |
-        module load cmake/3.25.3
-        cmake --preset nightly-distrotest-ISPC1_14_1-TBB2021_2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2
-        cmake --build build --target build
-        cmake --build build --target test_package
-
-  nightly-ubuntu20_04-RELEASE-ISPC1_14_1-TBB2021_2_0:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/ubuntu:20.04
-      cmd: |
-        module load cmake/3.25.3
-        cmake --preset nightly-distrotest-ISPC1_14_1-TBB2021_2 -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=2
-        cmake --build build --target build
-        cmake --build build --target test_package
-
-
-  nightly-fedora32-DEBUG-AVX512:
+  nightly-fedora42-DEBUG-AVX512:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:32
+      image: embree/fedora:42
       runs-on: '[ "Linux", "docker", "avx512" ]'
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-distrotest-AVX512 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=2
         cmake --build build --target build
         cmake --build build --target test_package
  
 
-  # Testing single primiteve types
+  # Testing single primitive types
 
-  nightly-linux-DEBUG-CLANG4-TRI:
+  nightly-linux-DEBUG-CLANG-TRI:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-singleprimitive-TRI -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
 
-  nightly-linux-DEBUG-CLANG4-QUAD:
+  nightly-linux-DEBUG-CLANG-QUAD:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-singleprimitive-QUAD -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
 
-  nightly-linux-DEBUG-CLANG4-GRID:
+  nightly-linux-DEBUG-CLANG-GRID:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-singleprimitive-GRID -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
 
-  nightly-linux-DEBUG-CLANG4-CURVE:
+  nightly-linux-DEBUG-CLANG-CURVE:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-singleprimitive-CURVE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
 
-  nightly-linux-DEBUG-CLANG4-SUBDIV:
+  nightly-linux-DEBUG-CLANG-SUBDIV:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-singleprimitive-SUBDIV -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
 
-  nightly-linux-DEBUG-CLANG4-USERGEOM:
+  nightly-linux-DEBUG-CLANG-USERGEOM:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-singleprimitive-USERGEOM -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
 
-  nightly-linux-DEBUG-CLANG4-INSTANCE:
+  nightly-linux-DEBUG-CLANG-INSTANCE:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-singleprimitive-INSTANCE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
 
-  nightly-linux-Debug-CLANG4-INSTANCE_ARRAY:
+  nightly-linux-Debug-CLANG-INSTANCE_ARRAY:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-singleprimitive-INSTANCE_ARRAY -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
 
-  nightly-linux-DEBUG-CLANG4-INSTANCE-INSTANCE_ARRAY:
+  nightly-linux-DEBUG-CLANG-INSTANCE-INSTANCE_ARRAY:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-singleprimitive-INSTANCE-INSTANCE_ARRAY -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
@@ -569,9 +519,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-feature-NO_ISPC -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
@@ -580,9 +529,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-feature-NO_TUTORIALS -DCMAKE_BUILD_TYPE=RelWithDebInfo
         cmake --build build --target build
 
@@ -590,9 +538,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-feature-BACKFACECULLING -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
 
@@ -600,9 +547,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-feature-IGNORE-INVALID-RAYS -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
 
@@ -610,9 +556,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-feature-NO-FILTER-FUNCTION -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
 
@@ -620,9 +565,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-feature-RAYMASKS -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
@@ -631,9 +575,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-feature-NO-PACKETS -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
 
@@ -641,9 +584,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-feature-STATCOUNTER -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
@@ -654,9 +596,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-individualisa-SSE2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
@@ -665,9 +606,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-individualisa-SSE42 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
@@ -676,9 +616,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-individualisa-AVX -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
@@ -687,9 +626,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-individualisa-AVX2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
@@ -698,9 +636,8 @@ jobs:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
-      image: embree/fedora:29
+      image: embree/fedora:42
       cmd: |
-        module load cmake/3.25.3
         cmake --preset nightly-linux-individualisa-AVX512 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEMBREE_TESTING_INTENSITY=1
         cmake --build build --target build
         cmake --build build --target test_package
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index 54ee0c143a..8b49e7a1e7 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -24,7 +24,6 @@ jobs:
       artifact-out: perf-linux-SYCL-DPCPP
       artifact-path: ./build/*.tar.gz
       cmd: |
-        module load cmake/3.25.3
         cmake --preset perf-linux-icx-sycl -DCMAKE_BUILD_TYPE=Release
         cmake --build build --config Release --target build
 
@@ -82,7 +81,6 @@ jobs:
       artifact-out: perf-linux-x86-ICX-ISPC-build
       artifact-path: ./build/*.tar.gz
       cmd: |
-        module load cmake/3.25.3
         cmake --preset perf-linux-icx -DCMAKE_BUILD_TYPE=Release
         cmake --build build --config Release --target build
 
diff --git a/README.md b/README.md
index 3c73ce4414..371cd35894 100644
--- a/README.md
+++ b/README.md
@@ -285,12 +285,10 @@ C++11. Embree is tested with the following compilers:
 
 Linux
 
-  - Intel® oneAPI DPC++/C++ Compiler 2024.0.2
-  - oneAPI DPC++/C++ Compiler 2023-10-26
-  - Clang 5.0.0
-  - Clang 4.0.0
-  - GCC 10.0.1 (Fedora 32) AVX512 support
-  - GCC  8.3.1 (Fedora 29) AVX512 support
+  - Intel® oneAPI DPC++/C++ Compiler 2025.2
+  - oneAPI DPC++/C++ Compiler 6.2.0
+  - Clang 20
+  - GCC 15 (Fedora 42) AVX512 support
   - Intel® Implicit SPMD Program Compiler 1.22.0
 
 macOS x86_64
@@ -399,7 +397,7 @@ The "oneAPI DPC++ Compiler" is more up-to-date than the "Intel(R) oneAPI
 DPC++/C++ Compiler" but less stable. The current tested version of the "oneAPI
 DPC++ compiler is
 
-  - [oneAPI DPC++ Compiler 2023-10-26](https://github.com/intel/llvm/releases/tag/nightly-2023-10-26)
+  - [oneAPI DPC++ Compiler 6.2.0](https://github.com/intel/llvm/releases/tag/v6.2.0)
   
 The compiler can be downloaded and simply extracted. The oneAPI DPC++ compiler
 can be set up executing the following commands in a Linux (bash) shell:
@@ -482,8 +480,8 @@ Windows
 
 Embree is tested using the following compilers under Windows:
 
-  - Intel® oneAPI DPC++/C++ Compiler 2024.0.2
-  - oneAPI DPC++/C++ Compiler 2023-10-26
+  - Intel® oneAPI DPC++/C++ Compiler 2024.2
+  - oneAPI DPC++/C++ Compiler 6.2.0
   - Visual Studio 2022
   - Visual Studio 2019
   - Visual Studio 2017
@@ -604,7 +602,7 @@ The "oneAPI DPC++ Compiler" is more up-to-date than the "Intel(R) oneAPI
 DPC++/C++ Compiler" but less stable. The current tested version of the oneAPI
 DPC++ compiler is
 
-  - [oneAPI DPC++ Compiler 2023-10-26](https://github.com/intel/llvm/releases/tag/nightly-2023-10-26)
+  - [oneAPI DPC++ Compiler 6.2.0](https://github.com/intel/llvm/releases/tag/v6.2.0)
 
 Download and unpack the archive and open the "x64 Native Tools Command Prompt"
 of Visual Studio and execute the following lines to properly configure the
diff --git a/doc/src/compilation.md b/doc/src/compilation.md
index c8fc8b2899..0e883c2a60 100644
--- a/doc/src/compilation.md
+++ b/doc/src/compilation.md
@@ -17,12 +17,10 @@ C++11. Embree is tested with the following compilers:
 
 Linux
 
-  - Intel® oneAPI DPC++/C++ Compiler 2024.0.2
-  - oneAPI DPC++/C++ Compiler 2023-10-26
-  - Clang 5.0.0
-  - Clang 4.0.0
-  - GCC 10.0.1 (Fedora 32) AVX512 support
-  - GCC  8.3.1 (Fedora 29) AVX512 support
+  - Intel® oneAPI DPC++/C++ Compiler 2025.2
+  - oneAPI DPC++/C++ Compiler 6.2.0
+  - Clang 20
+  - GCC 15 (Fedora 42) AVX512 support
   - Intel® Implicit SPMD Program Compiler 1.22.0
 
 macOS x86_64
@@ -131,7 +129,7 @@ The "oneAPI DPC++ Compiler" is more up-to-date than the "Intel(R) oneAPI
 DPC++/C++ Compiler" but less stable. The current tested version of the "oneAPI
 DPC++ compiler is
 
-  - [oneAPI DPC++ Compiler 2023-10-26](https://github.com/intel/llvm/releases/tag/nightly-2023-10-26)
+  - [oneAPI DPC++ Compiler 6.2.0](https://github.com/intel/llvm/releases/tag/v6.2.0)
   
 The compiler can be downloaded and simply extracted. The oneAPI DPC++ compiler
 can be set up executing the following commands in a Linux (bash) shell:
@@ -214,8 +212,8 @@ Windows
 
 Embree is tested using the following compilers under Windows:
 
-  - Intel® oneAPI DPC++/C++ Compiler 2024.0.2
-  - oneAPI DPC++/C++ Compiler 2023-10-26
+  - Intel® oneAPI DPC++/C++ Compiler 2025.2
+  - oneAPI DPC++/C++ Compiler 6.2.0
   - Visual Studio 2022
   - Visual Studio 2019
   - Visual Studio 2017
@@ -336,7 +334,7 @@ The "oneAPI DPC++ Compiler" is more up-to-date than the "Intel(R) oneAPI
 DPC++/C++ Compiler" but less stable. The current tested version of the oneAPI
 DPC++ compiler is
 
-  - [oneAPI DPC++ Compiler 2023-10-26](https://github.com/intel/llvm/releases/tag/nightly-2023-10-26)
+  - [oneAPI DPC++ Compiler 6.2.0](https://github.com/intel/llvm/releases/tag/v6.2.0)
 
 Download and unpack the archive and open the "x64 Native Tools Command Prompt"
 of Visual Studio and execute the following lines to properly configure the
diff --git a/scripts/cmake-presets/continuous.json b/scripts/cmake-presets/continuous.json
index f717e22f80..adae841b59 100644
--- a/scripts/cmake-presets/continuous.json
+++ b/scripts/cmake-presets/continuous.json
@@ -128,8 +128,8 @@
       }
     },
     {
-      "name": "linux-fedora29-CLANG4",
-      "inherits": ["package-linux", "env", "clang4", "ispc_NEWEST", "tbb_NEWEST"],
+      "name": "linux-fedora42-CLANG",
+      "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
         "EMBREE_CONFIG": "frequency_level=simd128",
@@ -138,8 +138,8 @@
       }
     },
     {
-      "name": "linux-fedora29-CLANG5-INT-ADDRSANITIZER",
-      "inherits": ["package-linux", "env", "clang5", "ispc_NEWEST", "tasking_internal"],
+      "name": "linux-fedora42-CLANG-INT-ADDRSANITIZER",
+      "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tasking_internal"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
         "EMBREE_MAX_ISA": "SSE2",
@@ -148,7 +148,7 @@
       }
     },
     {
-      "name": "linux-fedora29-ICX",
+      "name": "linux-fedora42-ICX",
       "inherits": ["package-linux", "env", "dpcpp", "ispc_NEWEST", "tbb_NEWEST"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
@@ -159,11 +159,7 @@
       }
     },
     {
-      "name": "linux-fedora32-ICX",
-      "inherits": "linux-fedora29-ICX"
-    },
-    {
-      "name": "linux-fedora32-GCC",
+      "name": "linux-fedora42-GCC",
       "inherits": ["package-linux", "env", "gcc", "ispc_NEWEST", "tbb_NEWEST"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
@@ -174,18 +170,7 @@
       }
     },
     {
-      "name": "linux-ubuntu20_04-GCC-NAMESPACE",
-      "inherits": ["package-linux", "env", "gcc", "tbb_NEWEST"],
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "EMBREE_CONFIG": "frequency_level=simd256",
-        "EMBREE_MAX_ISA": "AVX2",
-        "EMBREE_API_NAMESPACE": "myembree",
-        "EMBREE_LIBRARY_NAME": "myembree"
-      }
-    },
-    {
-      "name": "linux-ubuntu20_04-ICX",
+      "name": "linux-ubuntu24_04-ICX",
       "inherits": ["package-linux", "env", "icx", "ispc_NEWEST", "tbb_SYSTEM"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
@@ -194,8 +179,8 @@
       }
     },
     {
-      "name": "linux-ubuntu20_04-ICX-RC",
-      "inherits": "linux-ubuntu20_04-ICX"
+      "name": "linux-ubuntu24_04-ICX-RC",
+      "inherits": "linux-ubuntu24_04-ICX"
     },
     {
       "name": "linux-centos7_4-GCC",
diff --git a/scripts/cmake-presets/nightly.json b/scripts/cmake-presets/nightly.json
index e74ca3f896..d2f76fc1c9 100644
--- a/scripts/cmake-presets/nightly.json
+++ b/scripts/cmake-presets/nightly.json
@@ -76,8 +76,8 @@
     },
 
     {
-      "name": "nightly-linux-DEBUG-CLANG4-SSE2-NAMESPACE",
-      "inherits": ["package-linux", "env", "clang4", "tbb_NEWEST"],
+      "name": "nightly-linux-DEBUG-CLANG-SSE2-NAMESPACE",
+      "inherits": ["package-linux", "env", "clang", "tbb_NEWEST"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "EMBREE_MAX_ISA": "SSE2",
@@ -88,8 +88,8 @@
       }
     },
     {
-      "name": "nightly-linux-DEBUG-CLANG5-ISPC1_14_1-AVX2-INT-ADDRSANITIZER",
-      "inherits": ["package-linux", "env", "clang5", "ispc1_14_1", "tasking_internal"],
+      "name": "nightly-linux-DEBUG-CLANG-ISPC1_14_1-AVX2-INT-ADDRSANITIZER",
+      "inherits": ["package-linux", "env", "clang", "ispc1_14_1", "tasking_internal"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "EMBREE_MAX_ISA": "AVX2",
@@ -98,8 +98,8 @@
       }
     },
     {
-      "name": "nightly-linux-DEBUG-CLANG4-ISPC1_16_1-AVX2-TBB2021_9_0-STATIC",
-      "inherits": ["package-static-linux", "env", "clang4", "ispc1_16_1", "tbb2021_9_0"],
+      "name": "nightly-linux-DEBUG-CLANG-ISPC1_16_1-AVX2-TBB2021_9_0-STATIC",
+      "inherits": ["package-static-linux", "env", "clang", "ispc1_16_1", "tbb2021_9_0"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "EMBREE_CONFIG": "frequency_level=simd128",
@@ -108,8 +108,8 @@
       }
     },
     {
-      "name": "nightly-linux-DEBUG-CLANG4-ISPC1_16_1-AVX512VL-TBB2020_2",
-      "inherits": ["package-linux", "env", "clang4", "ispc1_16_1", "tbb2020_2_0"],
+      "name": "nightly-linux-DEBUG-CLANG-ISPC1_16_1-AVX512VL-TBB2020_2",
+      "inherits": ["package-linux", "env", "clang", "ispc1_16_1", "tbb2020_2_0"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "EMBREE_CONFIG": "frequency_level=simd256",
@@ -230,7 +230,7 @@
     },
     {
       "name": "nightly-singleprimitive",
-      "inherits": ["package-linux", "env", "clang4", "ispc_NEWEST", "tbb_NEWEST"],
+      "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "EMBREE_MAX_ISA": "AVX2",
@@ -320,7 +320,7 @@
     },
     {
       "name": "nightly-linux-feature-NO_ISPC",
-      "inherits": ["package-linux", "env", "clang4", "tbb_NEWEST"],
+      "inherits": ["package-linux", "env", "clang", "tbb_NEWEST"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "EMBREE_MAX_ISA": "AVX2",
@@ -329,7 +329,7 @@
     },
     {
       "name": "nightly-linux-feature-NO_TUTORIALS",
-      "inherits": ["package-linux", "env", "clang4", "ispc_NEWEST", "tbb_NEWEST"],
+      "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "EMBREE_MAX_ISA": "AVX2",
@@ -339,7 +339,7 @@
     },
     {
       "name": "nightly-linux-feature-BACKFACECULLING",
-      "inherits": ["package-linux", "env", "clang4", "ispc_NEWEST", "tbb_NEWEST"],
+      "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "EMBREE_MAX_ISA": "AVX2",
@@ -349,7 +349,7 @@
     },
     {
       "name": "nightly-linux-feature-IGNORE-INVALID-RAYS",
-      "inherits": ["package-linux", "env", "clang4", "ispc_NEWEST", "tbb_NEWEST"],
+      "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "EMBREE_MAX_ISA": "AVX2",
@@ -359,7 +359,7 @@
     },
     {
       "name": "nightly-linux-feature-NO-FILTER-FUNCTION",
-      "inherits": ["package-linux", "env", "clang4", "ispc_NEWEST", "tbb_NEWEST"],
+      "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "EMBREE_MAX_ISA": "AVX2",
@@ -369,7 +369,7 @@
     },
     {
       "name": "nightly-linux-feature-RAYMASKS",
-      "inherits": ["package-linux", "env", "clang4", "ispc_NEWEST", "tbb_NEWEST"],
+      "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "EMBREE_MAX_ISA": "AVX2",
@@ -379,7 +379,7 @@
     },
     {
       "name": "nightly-linux-feature-NO-PACKETS",
-      "inherits": ["package-linux", "env", "clang4", "ispc_NEWEST", "tbb_NEWEST"],
+      "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "EMBREE_MAX_ISA": "AVX2",
@@ -389,7 +389,7 @@
     },
     {
       "name": "nightly-linux-feature-STATCOUNTER",
-      "inherits": ["package-linux", "env", "clang4", "ispc_NEWEST", "tbb_NEWEST"],
+      "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "EMBREE_MAX_ISA": "AVX2",
@@ -399,7 +399,7 @@
     },
     {
       "name": "nightly-linux-individualisa",
-      "inherits": ["package-linux", "env", "clang4", "ispc_NEWEST", "tbb_NEWEST"],
+      "inherits": ["package-linux", "env", "clang", "ispc_NEWEST", "tbb_NEWEST"],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "EMBREE_TUTORIALS_GLFW": "OFF",
diff --git a/scripts/cmake-presets/os.json b/scripts/cmake-presets/os.json
index 9260efa47a..b595c58cd5 100644
--- a/scripts/cmake-presets/os.json
+++ b/scripts/cmake-presets/os.json
@@ -58,8 +58,6 @@
       "name": "env",
       "hidden": true,
       "environment": {
-        "EMBREE_CLANG_3_0_0_PP": "$env{APPS_PATH}/clang/v3.0.0/bin/clang++",
-        "EMBREE_CLANG_3_0_0": "$env{APPS_PATH}/clang/v3.0.0/bin/clang",
         "EMBREE_CLANG_4_0_0_PP": "$env{APPS_PATH}/clang/v4.0.0/bin/clang++",
         "EMBREE_CLANG_4_0_0": "$env{APPS_PATH}/clang/v4.0.0/bin/clang",
         "EMBREE_CLANG_5_0_0_PP": "$env{APPS_PATH}/clang/v5.0.0/bin/clang++",
diff --git a/scripts/coverity.sh b/scripts/coverity.sh
index 980862bb8f..0c6864c1fe 100644
--- a/scripts/coverity.sh
+++ b/scripts/coverity.sh
@@ -2,6 +2,6 @@
 
 # needed, because coverity build command must be single call from workflow
 
-module load cmake/3.25.3 &&
+# module load cmake/3.25.3
 export NAS_LINUX=$STORAGE_PATH/packages/apps
 cmake --build build --config Release --target build
\ No newline at end of file