diff --git a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
index dd290fd1d..950d6d79f 100644
--- a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
+++ b/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
@@ -32,6 +32,4 @@ add_library(
 
 target_include_directories(libcockatrice_models_database PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-target_link_libraries(
-  libcockatrice_models_database PUBLIC libcockatrice_card libcockatrice_filters ${COCKATRICE_QT_MODULES}
-)
+target_link_libraries(libcockatrice_models_database PUBLIC libcockatrice_card libcockatrice_filters ${QT_CORE_MODULE})
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
index ef66feaf2..851636a35 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
+++ b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
@@ -17,5 +17,5 @@ add_library(
 target_include_directories(libcockatrice_models_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(
-  libcockatrice_models_deck_list PUBLIC libcockatrice_card libcockatrice_deck_list ${COCKATRICE_QT_MODULES}
+  libcockatrice_models_deck_list PUBLIC libcockatrice_card libcockatrice_deck_list ${QT_CORE_MODULE}
 )
diff --git a/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt
index d86210edd..bcf62463c 100644
--- a/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt
@@ -11,6 +11,8 @@ add_library(libcockatrice_network_client INTERFACE)
 target_include_directories(libcockatrice_network_client INTERFACE .)
 
 target_link_libraries(
-  libcockatrice_network_client INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract
-                                         libcockatrice_network_client_local libcockatrice_network_client_remote
+  libcockatrice_network_client
+  INTERFACE ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets
+            libcockatrice_network_client_abstract libcockatrice_network_client_local
+            libcockatrice_network_client_remote
 )
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
index 54e4d83e0..2753246de 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
@@ -19,6 +19,7 @@ add_dependencies(libcockatrice_network_client_abstract libcockatrice_protocol li
 target_include_directories(libcockatrice_network_client_abstract PUBLIC .)
 
 target_link_libraries(
-  libcockatrice_network_client_abstract PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol
-                                               libcockatrice_network_server_remote
+  libcockatrice_network_client_abstract
+  PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets libcockatrice_protocol
+         libcockatrice_network_server_remote
 )
diff --git a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
index 3c202904d..d12a324dc 100644
--- a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
@@ -19,5 +19,7 @@ add_dependencies(libcockatrice_network_client_local libcockatrice_network_client
 target_include_directories(libcockatrice_network_client_local PUBLIC .)
 
 target_link_libraries(
-  libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract
+  libcockatrice_network_client_local
+  PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets
+         libcockatrice_network_client_abstract
 )
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
index d70065330..0548700e4 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
@@ -19,6 +19,7 @@ add_dependencies(libcockatrice_network_client_remote libcockatrice_network_clien
 target_include_directories(libcockatrice_network_client_remote PUBLIC .)
 
 target_link_libraries(
-  libcockatrice_network_client_remote PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract
-                                             libcockatrice_interfaces libcockatrice_utility libcockatrice_protocol
+  libcockatrice_network_client_remote
+  PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets
+         libcockatrice_network_client_abstract libcockatrice_interfaces libcockatrice_utility libcockatrice_protocol
 )