diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index a20457be..2b2e0f2d 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -25,10 +25,10 @@ jobs:
         clangFormatVersion: 14
 
   tests-cpu:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
-        cxx: [ 'g++-9', 'g++-10', 'clang++-10' ]
+        cxx: [ 'g++-12', 'g++-14', 'clang++-16', 'clang++-18' ]
     name: tests-cpu-${{ matrix.cxx }}
     env:
       CMAKE_BUILD_PARALLEL_LEVEL: 8
@@ -67,10 +67,10 @@ jobs:
       run: cmake --build build-tests-${{ matrix.cxx }} -t test
 
   examples-cpu:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
-        cxx: [ 'g++-9', 'g++-10', 'clang++-10' ]
+        cxx: [ 'g++-12', 'g++-14', 'clang++-16', 'clang++-18' ]
     name: examples-cpu-${{ matrix.cxx }}
     env:
       CMAKE_BUILD_PARALLEL_LEVEL: 8
diff --git a/.github/workflows/sycl.yml b/.github/workflows/sycl.yml
index 9e5bca77..7da9a5f2 100644
--- a/.github/workflows/sycl.yml
+++ b/.github/workflows/sycl.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   test-sycl:
     runs-on: ubuntu-latest
-    container: intel/oneapi-basekit:2023.1.0-devel-ubuntu22.04
+    container: intel/oneapi-basekit:2025.3.0-0-devel-ubuntu24.04
     env:
       GTEST_VERSION: 1.12.1
       GTEST_ROOT: ${{ github.workspace }}/googletest
@@ -63,31 +63,3 @@ jobs:
     - name: cmake cpu run mult_table
       run: ./mult_table
       working-directory: ${{ github.workspace }}/build-sycl/examples
-    - name: GNU make setup gtensor subdir
-      run: mkdir -p external/gtensor &&  cp -R ../include external/gtensor/
-      working-directory: ${{ github.workspace }}/examples
-    - name: GNU make build
-      run: make GTENSOR_DEVICE=sycl
-      working-directory: ${{ github.workspace }}/examples
-    - name: GNU make run daxpy
-      run: ./daxpy
-      working-directory: ${{ github.workspace }}/examples
-    - name: GNU make run stencil1d
-      run: ./stencil1d
-      working-directory: ${{ github.workspace }}/examples
-    - name: GNU make run mult_table
-      run: ./mult_table
-      working-directory: ${{ github.workspace }}/examples
-    - name: install umpire
-      run: |
-        mkdir -p ${{ env.UMPIRE_ROOT }}
-        cd ${{ env.UMPIRE_ROOT }}
-        git clone -b feature/oneapi-2023 --recursive https://github.com/bd4/Umpire.git src
-        cmake -S src -B build -DCMAKE_INSTALL_PREFIX=${{ env.UMPIRE_ROOT }}/install -DUMPIRE_ENABLE_SYCL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
-        cmake --build build -t install
-    - name: cmake umpire
-      run: cmake -S . -B build-sycl-umpire -DGTENSOR_DEVICE=sycl -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGTENSOR_BUILD_EXAMPLES=ON -DGTENSOR_USE_THRUST=OFF -DGTEST_ROOT=${{ env.GTEST_ROOT }} -DGTENSOR_ENABLE_CLIB=ON -DGTENSOR_ENABLE_BLAS=ON -DGTENSOR_ENABLE_FFT=ON -DGTENSOR_ENABLE_SOLVER=ON
-      env:
-        CMAKE_PREFIX_PATH: ${{env.CMAKE_PREFIX_PATH}}:${{ env.UMPIRE_ROOT }}/install
-    - name: cmake umpire build
-      run: cmake --build build-sycl-umpire -v