diff --git a/overlay.nix b/overlay.nix
index 00fe8971..079dcbf5 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -51,7 +51,6 @@ let
     nix-wrap = callPackage ./pkgs/nix-wrap/default.nix { };
     nodes = callPackage ./pkgs/nodes/default.nix { };
     nosv = callPackage ./pkgs/nosv/default.nix { };
-    oneapiStdenv = final.overrideCC final.stdenv final.llvm-intel;
     oneMath = callPackage ./pkgs/onemath/default.nix { };
     openmp = callPackage ./pkgs/llvm-ompss2/openmp.nix { monorepoSrc = final.clangOmpss2Unwrapped.src; version = final.clangOmpss2Unwrapped.version; };
     openmpv = final.openmp.override { enableNosv = true; enableOvni = true; };
@@ -106,9 +105,10 @@ let
     # intel2023-sycl    = hello-sycl.override { intelPackages = final.intelPackages_2023; }; # broken
     intel2024-sycl    = hello-sycl.override { intelPackages = final.intelPackages_2024; };
     intel2025-sycl    = hello-sycl.override { intelPackages = final.intelPackages_2025; };
-    oneapi-c          = hello-c.override    { stdenv = final.oneapiStdenv; };
-    oneapi-cpp        = hello-cpp.override  { stdenv = final.oneapiStdenv; };
-    oneapi-sycl       = hello-sycl.override { intelPackages = { stdenv = final.oneapiStdenv; }; };
+    oneapi-c          = hello-c.override    { inherit (final.llvm-intel) stdenv; };
+    oneapi-cpp        = hello-cpp.override  { inherit (final.llvm-intel) stdenv; };
+    oneapi-sycl       = hello-sycl.override { intelPackages = final.llvm-intel; };
+    oneapi-syclompss  = hello-syclompss.override { intelPackages = final.llvm-intel; };
     clangOmpss2-lto   = lto.override       { stdenv = final.stdenvClangOmpss2Nanos6; };
     clangOmpss2-asan  = asan.override      { stdenv = final.stdenvClangOmpss2Nanos6; };
     clangOmpss2-task  = callPackage ./test/compilers/ompss2.nix {
diff --git a/pkgs/intel-oneapi/common/wrapper.nix b/pkgs/intel-oneapi/common/wrapper.nix
index a5619033..430c4b77 100644
--- a/pkgs/intel-oneapi/common/wrapper.nix
+++ b/pkgs/intel-oneapi/common/wrapper.nix
@@ -3,6 +3,7 @@
   lib,
   gcc,
   libgcc,
+  overrideCC,
   wrapCCWith,
 }:
 
@@ -66,6 +67,7 @@ in
   ''
   + extraBuildCommands;
 }).overrideAttrs
-  (old: {
-    installPhase = old.installPhase + extraInstallCommands;
+  (finalAttrs: prevAttrs: {
+    installPhase = prevAttrs.installPhase + extraInstallCommands;
+    passthru.stdenv = overrideCC stdenv finalAttrs.finalPackage;
   })