diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake
index 57b6b0365b86a8ba37235ef8f2a438581f69ae5a..3bdc7520d2f6ce6a7c9988bd806398d995f691f4 100644
--- a/cmake/toolchain/heptools-dev-base.cmake
+++ b/cmake/toolchain/heptools-dev-base.cmake
@@ -52,6 +52,7 @@ if(LCG_PYTHON_VERSION EQUAL 3)
   LCG_external_package(numpy             1.18.2                                   )
   LCG_external_package(llvmlite          0.32.0                                   )
   LCG_external_package(numba             0.49.0                                   )
+  LCG_external_package(opt_einsum        3.2.0                                    )
 else()
   LCG_external_package(typing            3.6.6                                    )
   LCG_external_package(prompt_toolkit    1.0.16                                   )
@@ -97,6 +98,7 @@ else()
   LCG_external_package(numpy             1.16.4                                   )
   LCG_external_package(llvmlite          0.29.0                                   )
   LCG_external_package(numba             0.44.0                                   )
+  LCG_external_package(opt_einsum        2.3.2                                    )
 endif()
 
 # Application Area Projects
@@ -384,7 +386,6 @@ LCG_external_package(openmpi           3.1.0
 if(${LCG_OS} MATCHES mac)
   LCG_external_package(openssl         1.1.1                                    )
 endif()
-LCG_external_package(opt_einsum        3.2.0                                    )
 if(NOT ${LCG_OS} STREQUAL mac)
   if(${LCG_OS} STREQUAL centos)
     LCG_external_package(oracle            19.3.0.0.0                               )
diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt
index edc7e8e3cc4cd9bc880908b2ba130d68af44d4ed..e7090d2feeebc9f79fe6476b992ee6adf9f25393 100644
--- a/pyexternals/CMakeLists.txt
+++ b/pyexternals/CMakeLists.txt
@@ -3212,6 +3212,7 @@ if(DEFINED cuda_native_version)
   set(packsuffix _gpu)
   set(libtype gpu)
 else()
+  set(packsuffix _cpu)
   set(libtype cpu)
 endif()