diff --git a/cmake/custom/nevpt2.cmake b/cmake/custom/nevpt2.cmake
index 789739ec8..6c86a7b8c 100644
--- a/cmake/custom/nevpt2.cmake
+++ b/cmake/custom/nevpt2.cmake
@@ -67,6 +67,7 @@ list(APPEND NEVPT2CMakeArgs
   "-DMOLCAS_BUILD_DIR=${PROJECT_BINARY_DIR}"
   "-DCMAKE_Fortran_MODULE_DIRECTORY=${mod_dir}"
   "-DDMRG_INCLUDE=${HDF5_QCM_INCLUDE}"
+  "-DCMAKE_SKIP_BUILD_RPATH=ON"
   )
 
 if(HDF5_ROOT)
@@ -118,9 +119,7 @@ endif ()
 
 ExternalProject_Add(${EP_PROJECT}
                     PREFIX ${CUSTOM_NEVPT2_LOCATION}
-                    GIT_REPOSITORY ${reference_git_repo}
-                    GIT_TAG ${reference_git_commit}
-                    UPDATE_DISCONNECTED ${EP_SkipUpdate}
+                    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 176d02761..e160b7bc8 100644
--- a/cmake/custom/qcmaquis.cmake
+++ b/cmake/custom/qcmaquis.cmake
@@ -78,6 +78,7 @@ 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
   )
 if(HDF5_ROOT)
   list(APPEND QCMaquisCMakeArgs
@@ -278,9 +279,7 @@ set (CMAKE_DISABLE_SOURCE_CHANGES OFF)
 
     ExternalProject_Add(${EP_PROJECT}
         PREFIX ${extprojpath}
-        GIT_REPOSITORY ${reference_git_repo}
-        GIT_TAG ${reference_git_commit}
-        UPDATE_DISCONNECTED ${EP_SkipUpdate}
+        URL @qcmaquis_src_url@
 
         SOURCE_SUBDIR dmrg
         CMAKE_ARGS ${EP_CMAKE_ARGS}