diff --git a/cmake/custom/nevpt2.cmake b/cmake/custom/nevpt2.cmake
index fa2ef9940f..ab6ce50eae 100644
--- a/cmake/custom/nevpt2.cmake
+++ b/cmake/custom/nevpt2.cmake
@@ -118,11 +118,8 @@ endif ()
 
 ExternalProject_Add(${EP_PROJECT}
                     PREFIX ${CUSTOM_NEVPT2_LOCATION}
-                    GIT_REPOSITORY ${reference_git_repo}
-                    GIT_TAG ${reference_git_commit}
-                    GIT_PROGRESS 1
-                    UPDATE_DISCONNECTED ${EP_SkipUpdate}
-                    CMAKE_ARGS "${NEVPT2CMakeArgs}"
+                    URL @nevpt2_src_url@
+                    CMAKE_ARGS ${NEVPT2CMakeArgs}
                     INSTALL_DIR "${PROJECT_BINARY_DIR}/qcmaquis"
                    )
 
diff --git a/cmake/custom/qcmaquis.cmake b/cmake/custom/qcmaquis.cmake
index f144fcb4d9..5a7befd4e1 100644
--- a/cmake/custom/qcmaquis.cmake
+++ b/cmake/custom/qcmaquis.cmake
@@ -77,6 +77,8 @@ list (APPEND QCMaquisCMakeArgs
       -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
       -DCMAKE_CXX_FLAGS=${QCM_CMake_CXX_FLAGS}
       -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+      -DCMAKE_SKIP_BUILD_RPATH=ON
+      -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 )
 if (HDF5_ROOT)
   list (APPEND QCMaquisCMakeArgs
@@ -94,47 +96,9 @@ if (NOT MAQUIS_DMRG_FOUND) # Does the opposite work?
     )
   endif (BOOST_ROOT)
 
-  if (LINALG STREQUAL "Manual")
-    target_files (LINALG_LIBRARIES_FILES ${LINALG_LIBRARIES})
-    list (APPEND LINALG_LIBRARIES_FILES ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
-    string (REPLACE ";" '\' LINALG_LIBRARIES_FILES "${LINALG_LIBRARIES_FILES}")
-    list (APPEND QCMaquisCMakeArgs
-          "-DBLAS_LAPACK_SELECTOR=manual"
-          "-DMAQUISLapack_LIBRARIES=${LINALG_LIBRARIES_FILES}"
-    )
-  elseif (LINALG STREQUAL "MKL")
-    list (APPEND QCMaquisCMakeArgs
-          "-DBLAS_LAPACK_SELECTOR=mkl_sequential"
-    )
-  elseif (LINALG STREQUAL "OpenBLAS")
-    list (APPEND QCMaquisCMakeArgs
-          "-DBLAS_LAPACK_SELECTOR=openblas"
-          "-DOPENBLASROOT=${OPENBLASROOT}"
-    )
-  elseif (LINALG STREQUAL "Accelerate")
-    list (APPEND QCMaquisCMakeArgs
-          "-DBLAS_LAPACK_SELECTOR:STRING=veclib"
-    )
-  elseif (LINALG STREQUAL "Internal")
-
-    # To link QCMaquis with Fortran static libraries, we
-    # need to add -lgfortran for gfortran
-    # It seems that ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES}
-    # is not suited for this because it contains also other unnecessary libraries
-
-    # for some reason, the list does not work if the generator expression -lgfortran is not first
-    # but for correct linking it needs to be last AND with a prepended "-l"
-    if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
-      set (Fortran_RUNTIME_LIBRARY "gfortran")
-    endif ()
-
-    list (APPEND QCMaquisCMakeArgs
-          "-DBLAS_LAPACK_SELECTOR=manual"
-          "-DMAQUISLapack_LIBRARIES=$<$<BOOL:Fortran_RUNTIME_LIBRARY>:${Fortran_RUNTIME_LIBRARY}\ >$<TARGET_FILE:blas>\ $<TARGET_FILE:lapack>\ $<TARGET_FILE:blas>\ -l$<$<BOOL:Fortran_RUNTIME_LIBRARY>:${Fortran_RUNTIME_LIBRARY}>"
-    )
-  else ()
-    message (FATAL_ERROR "LINALG=${LINALG} is not supported by QCMaquis")
-  endif ()
+  list (APPEND QCMaquisCMakeArgs
+        "-DBLAS_LAPACK_SELECTOR=auto"
+  )
 
   # Enabling source changes to keep ExternalProject happy
   set (CMAKE_DISABLE_SOURCE_CHANGES OFF)
@@ -278,11 +242,7 @@ if (NOT MAQUIS_DMRG_FOUND) # Does the opposite work?
 
   ExternalProject_Add (${EP_PROJECT}
                        PREFIX ${extprojpath}
-                       GIT_REPOSITORY ${reference_git_repo}
-                       GIT_TAG ${reference_git_commit}
-                       GIT_PROGRESS 1
-                       UPDATE_DISCONNECTED ${EP_SkipUpdate}
-
+                       URL @qcmaquis_src_url@
                        SOURCE_SUBDIR dmrg
                        CMAKE_ARGS ${EP_CMAKE_ARGS}
                        CMAKE_CACHE_ARGS ${EP_CMAKE_CACHE_ARGS}