diff --git a/overlay.nix b/overlay.nix
index 77e5ab8..f92befc 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -150,8 +150,12 @@ let
     # Our custom version that lacks the binaries. Disabled by default.
     #rdma-core = callPackage ./bsc/rdma-core/default.nix { };
 
+    # Last llvm release by default
+    llvmPackages = self.llvmPackages_11;
+    lld = bsc.llvmPackages.lld;
+
     clangOmpss2Unwrapped = callPackage ./bsc/llvm-ompss2/clang.nix {
-      stdenv = self.llvmPackages_10.stdenv;
+      stdenv = bsc.llvmPackages.stdenv;
       enableDebug = false;
     };