diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b762b03880..5aad75b461 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target(generate_build_info
   COMMENT "Generating bitcoin-build-info.h"
   VERBATIM
 )
-add_library(bitcoin_clientversion OBJECT EXCLUDE_FROM_ALL
+add_library(bitcoin_clientversion STATIC EXCLUDE_FROM_ALL
   clientversion.cpp
 )
 target_link_libraries(bitcoin_clientversion
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 9ca26a9e27..4999dbf13f 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -36,9 +36,6 @@ add_library(bitcoin_util STATIC EXCLUDE_FROM_ALL
   ../sync.cpp
 )
 
-# Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/24058
-set_target_properties(bitcoin_util PROPERTIES OPTIMIZE_DEPENDENCIES OFF)
-
 target_link_libraries(bitcoin_util
   PRIVATE
     core_interface