diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 86152401..8f87ba7a 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -56,7 +56,7 @@ function(fetch_dependencies)
         GITHUB_REPOSITORY nanomsg/nng
         GIT_TAG v1.8.0
         OPTIONS
-            "BUILD_SHARED_LIBS ON"
+            "BUILD_SHARED_LIBS OFF"
             "NNG_TESTS OFF"
             "NNG_TOOLS OFF"
     )
@@ -97,7 +97,14 @@ function(fetch_dependencies)
     ###################################################################################################################
     # libuv (for process management)
     ###################################################################################################################
-    CPMAddPackage(NAME libuv GITHUB_REPOSITORY libuv/libuv GIT_TAG v1.48.0 OPTIONS "LIBUV_BUILD_TESTS OFF")
+    CPMAddPackage(
+        NAME libuv
+        GITHUB_REPOSITORY libuv/libuv
+        GIT_TAG v1.48.0
+        OPTIONS
+            "LIBUV_BUILD_TESTS OFF"
+            "LIBUV_BUILD_SHARED OFF"
+    )
 
     ###################################################################################################################
     # fmt : https://github.com/fmtlib/fmt
diff --git a/device/CMakeLists.txt b/device/CMakeLists.txt
index 592de0e4..30231543 100644
--- a/device/CMakeLists.txt
+++ b/device/CMakeLists.txt
@@ -41,18 +41,17 @@ target_include_directories(
 )
 
 # flatbuffers is public - exposed to tt_metal by tt_simulation_device_generated.h
-# nng is public - exposed to tt_metal by tt_simulation_host.hpp
 target_link_libraries(
     device
     PUBLIC
-        nng
         flatbuffers
-        uv
     PRIVATE
         umd::Common
         umd::Firmware
         hwloc
+        nng
         rt
+        uv_a
         Boost::interprocess
         spdlog::spdlog_header_only
         fmt::fmt-header-only
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index bfb6057f..060d64d7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -13,6 +13,7 @@ target_link_libraries(
         gtest
         pthread
         fmt::fmt-header-only
+        nng
 )
 target_include_directories(
     test_common