diff --git a/cmake/SetupRdKafka.cmake b/cmake/SetupRdKafka.cmake
index 33c53f621dba..4414188c06fe 100644
--- a/cmake/SetupRdKafka.cmake
+++ b/cmake/SetupRdKafka.cmake
@@ -31,7 +31,7 @@ if(NOT USERVER_FORCE_DOWNLOAD_PACKAGES)
                       OpenSSL::SSL
                       OpenSSL::Crypto
                       SASL2::SASL2
-                      zstd::zstd
+                      zstd::libzstd
         )
         return()
     endif()
diff --git a/cmake/modules/Findyaml-cpp.cmake b/cmake/modules/Findyaml-cpp.cmake
index 28dcfb72d0ad..ecce59fbc34c 100644
--- a/cmake/modules/Findyaml-cpp.cmake
+++ b/cmake/modules/Findyaml-cpp.cmake
@@ -13,3 +13,7 @@ _userver_module_find_include(NAMES yaml-cpp/yaml.h yaml-cpp/node.h PATH_SUFFIXES
 _userver_module_find_library(NAMES yaml-cpp PATH_SUFFIXES lib)
 
 _userver_module_end()
+
+if(NOT TARGET yaml-cpp::yaml-cpp)
+    add_library(yaml-cpp::yaml-cpp ALIAS yaml-cpp)
+endif()
diff --git a/cmake/modules/Findzstd.cmake b/cmake/modules/Findzstd.cmake
index 8a970445c6b1..74a7171ae63a 100644
--- a/cmake/modules/Findzstd.cmake
+++ b/cmake/modules/Findzstd.cmake
@@ -13,11 +13,11 @@ _userver_module_find_library(NAMES zstd PATH_SUFFIXES lib)
 
 _userver_module_end()
 
-if(NOT TARGET zstd::zstd)
+if(NOT TARGET zstd::libzstd)
     if(TARGET libzstd_static)
-        add_library(zstd::zstd ALIAS libzstd_static)
+        add_library(zstd::libzstd ALIAS libzstd_static)
     else()
-        add_library(zstd::zstd ALIAS zstd)
+        add_library(zstd::libzstd ALIAS zstd)
     endif()
 endif()
 if(NOT TARGET ZSTD::ZSTD)
diff --git a/universal/CMakeLists.txt b/universal/CMakeLists.txt
index e8b6e73a3a8f..7b9a60c48e6b 100644
--- a/universal/CMakeLists.txt
+++ b/universal/CMakeLists.txt
@@ -247,7 +247,7 @@ else()
     target_link_libraries(
         ${PROJECT_NAME}
         PUBLIC fmt cctz userver-stacktrace
-        PRIVATE yaml-cpp zstd::zstd cryptopp::cryptopp
+        PRIVATE yaml-cpp::yaml-cpp zstd::libzstd cryptopp::cryptopp
     )
 
     if(CMAKE_SYSTEM_NAME MATCHES "Darwin"