diff --git a/CMakeLists.txt b/CMakeLists.txt
index 348c10080..917703d22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,7 @@ if(NOT ${DISABLE_WALLET})
         ExternalProject_Add(BerkeleyDB
             PREFIX bdb
             SOURCE_DIR ${BerkeleyDB_SOURCE_DIR}
-            PATCH_COMMAND patch -Nd ${BerkeleyDB_SOURCE_DIR}/dbinc -i ${CMAKE_CURRENT_SOURCE_DIR}/depends/patches/db/atomic.patch || true
+            PATCH_COMMAND sed -i "s/__atomic_compare_exchange/__atomic_compare_exchange_db/" ${BerkeleyDB_SOURCE_DIR}/dbinc/atomic.h
             CONFIGURE_COMMAND ${BerkeleyDB_SOURCE_DIR}/dist/configure --enable-cxx --disable-shared --with-pic --prefix=<INSTALL_DIR>
         )
         set(DEPENDS ${DEPENDS} BerkeleyDB)
diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake
index 46fb61c1b..a54b6fe79 100644
--- a/cmake/CPM.cmake
+++ b/cmake/CPM.cmake
@@ -43,7 +43,7 @@ set(CPM_VERSION ${CURRENT_CPM_VERSION} CACHE INTERNAL "")
 set(CPM_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} CACHE INTERNAL "")
 set(CPM_PACKAGES "" CACHE INTERNAL "")
 
-option(CPM_USE_LOCAL_PACKAGES "Use locally installed packages (find_package)" OFF)
+option(CPM_USE_LOCAL_PACKAGES "Use locally installed packages (find_package)" ON)
 option(CPM_LOCAL_PACKAGES_ONLY "Use only locally installed packages" OFF)
 
 include(FetchContent)
diff --git a/depends/patches/db/atomic.patch b/depends/patches/db/atomic.patch
deleted file mode 100644
index 08bcf440e..000000000
--- a/depends/patches/db/atomic.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/dbinc/atomic.h b/dbinc/atomic.h
-index 0034dcc..50b8b74 100644
---- a/dbinc/atomic.h
-+++ b/dbinc/atomic.h
-@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
- #define	atomic_inc(env, p)	__atomic_inc(p)
- #define	atomic_dec(env, p)	__atomic_dec(p)
- #define	atomic_compare_exchange(env, p, o, n)	\
--	__atomic_compare_exchange((p), (o), (n))
-+	__atomic_compare_exchange_db((p), (o), (n))
- static inline int __atomic_inc(db_atomic_t *p)
- {
- 	int	temp;
-@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
-  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
-  * which configure could be changed to use.
-  */
--static inline int __atomic_compare_exchange(
-+static inline int __atomic_compare_exchange_db(
- 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
- {
- 	atomic_value_t was;