diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index db6fce4..4d57c53 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -39,8 +39,6 @@ jobs:
             version: 19
           - toolchain: clang
             version: 20
-          - toolchain: oneapi
-            version: 2024.2.0
           - toolchain: oneapi
             version: 2024.2.0-rhel-ubi9
           - toolchain: oneapi
diff --git a/oneapi/2024.2.0-rhel-ubi9/Dockerfile b/oneapi/2024.2.0-rhel-ubi9/Dockerfile
index 94c1d42..9b8b2eb 100644
--- a/oneapi/2024.2.0-rhel-ubi9/Dockerfile
+++ b/oneapi/2024.2.0-rhel-ubi9/Dockerfile
@@ -24,10 +24,10 @@ RUN dnf -y install   \
  && ./bootstrap.sh --with-toolset=intel-linux --with-libraries=graph,program_options --prefix=/opt/rh/gcc-toolset-14/root/usr \
  && ./b2 cxxstd=17 toolset=intel-linux link=static --with-graph --with-program_options stage \
  && ./b2 cxxstd=17 toolset=intel-linux link=static --with-graph --with-program_options install \
- # CUDA 12.8
+ # CUDA 12.1
  && dnf config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel9/x86_64/cuda-rhel9.repo \
  && dnf clean all \
- && dnf install -y cuda-minimal-build-12-8 \
+ && dnf install -y cuda-minimal-build-12-1 \
  # OneAPI CodePlay plugin for NVIDIA GPUs
  && curl -LJ "https://developer.codeplay.com/api/v1/products/download?product=oneapi&variant=nvidia&version=2024.2.0&filters[]=12.0&filters[]=linux" -o /tmp/codeplay.sh \
  && echo "0622df0054364b01e91e7ed72a33cb3281e281db5b0e86579f516b1cc5336b0f /tmp/codeplay.sh" >> /tmp/codeplay_checksum.txt \
diff --git a/oneapi/2024.2.0/Dockerfile b/oneapi/2024.2.0/Dockerfile
deleted file mode 100644
index de2b106..0000000
--- a/oneapi/2024.2.0/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-FROM gcc:13
-LABEL org.opencontainers.image.source="https://github.com/nazavode/docker-toolchain"
-
-RUN apt-get update -y \
- && apt-get install -y --no-install-recommends \
-    git \
-    wget \
-    libblas-dev \
- # cmake
- && wget -O /tmp/install-cmake -q https://github.com/Kitware/CMake/releases/download/v3.31.6/cmake-3.31.6-linux-x86_64.sh \
- && chmod +x /tmp/install-cmake \
- && /tmp/install-cmake --prefix=/usr --skip-license \
- # Download and install Intel OneAPI standalone compiler
- && wget --no-verbose --no-check-certificate -O /tmp/intel_dpcpp.sh https://registrationcenter-download.intel.com/akdlm/IRC_NAS/6780ac84-6256-4b59-a647-330eb65f32b6/l_dpcpp-cpp-compiler_p_2024.2.0.495_offline.sh \
- && echo "9463aa979314d2acc51472d414ffcee032e9869ca85ac6ff4c71d39500e5173d /tmp/intel_dpcpp.sh" > /tmp/checksum.txt \
- && sha256sum --check /tmp/checksum.txt \
- && sh /tmp/intel_dpcpp.sh -a --action install --components intel.oneapi.lin.dpcpp-cpp-compiler --silent --eula accept \
- # Needed just to allow boost to find OneAPI
- && . /opt/intel/oneapi/setvars.sh \
- # boost
- && mkdir -p /tmp/boost \
- && wget -q -O - https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.gz | tar xzf - -C /tmp/boost --strip-components 1 \
- && cd /tmp/boost \
- && ./bootstrap.sh --with-toolset=intel-linux --with-libraries=graph,program_options --prefix=/usr \
- && ./b2 cxxstd=17 toolset=intel-linux --with-graph --with-program_options stage \
- && ./b2 cxxstd=17 toolset=intel-linux --with-graph --with-program_options install \
- # Remove unneeded stuff
- && apt-get remove wget -y \
- && apt-get clean autoclean \
- && apt-get autoremove -y \
- # cleanup
- && rm -rf /tmp/* /var/lib/apt/lists/*
-
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/oneapi/2024.2.0/entrypoint.sh b/oneapi/2024.2.0/entrypoint.sh
deleted file mode 100755
index 1d3d6f1..0000000
--- a/oneapi/2024.2.0/entrypoint.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-. /opt/intel/oneapi/setvars.sh
-export CC=icx
-export CXX=icpx
-
-exec "$@"
diff --git a/oneapi/2025.1.1-rhel-ubi9/Dockerfile b/oneapi/2025.1.1-rhel-ubi9/Dockerfile
index e42de86..8297e48 100644
--- a/oneapi/2025.1.1-rhel-ubi9/Dockerfile
+++ b/oneapi/2025.1.1-rhel-ubi9/Dockerfile
@@ -24,10 +24,10 @@ RUN dnf -y install   \
  && ./bootstrap.sh --with-toolset=intel-linux --with-libraries=graph,program_options --prefix=/opt/rh/gcc-toolset-14/root/usr \
  && ./b2 cxxstd=17 toolset=intel-linux link=static --with-graph --with-program_options stage \
  && ./b2 cxxstd=17 toolset=intel-linux link=static --with-graph --with-program_options install \
- # CUDA 12.8
+ # CUDA 12.1
  && dnf config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel9/x86_64/cuda-rhel9.repo \
  && dnf clean all \
- && dnf install -y cuda-minimal-build-12-8 \
+ && dnf install -y cuda-minimal-build-12-1 \
  # OneAPI CodePlay plugin for NVIDIA GPUs
  && curl -LJ "https://developer.codeplay.com/api/v1/products/download?product=oneapi&variant=nvidia&filters[]=linux" -o /tmp/codeplay.sh \
  && echo "45e1d7c42c1915904daf9f3291b2f01622e897c7b661aebd28d6b293ce14fb9d /tmp/codeplay.sh" >> /tmp/codeplay_checksum.txt \