diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d8ff11..228b21f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,10 +66,7 @@ target_include_directories(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTER
                            ${Boost_INCLUDE_DIRS})
 
 target_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
-                      ${CMAKE_WORKSPACE_NAME}::algebra
-                      ${CMAKE_WORKSPACE_NAME}::multiprecision
-                      ${CMAKE_WORKSPACE_NAME}::zk
-
+                      crypto3::all
                       ${Boost_LIBRARIES})
 
 cm_deploy(TARGETS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3a8a939..b54660e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,16 +14,7 @@ endif()
 
 cm_test_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
 
-                       ${CMAKE_WORKSPACE_NAME}::algebra
-                       ${CMAKE_WORKSPACE_NAME}::math
-                       ${CMAKE_WORKSPACE_NAME}::multiprecision
-                       ${CMAKE_WORKSPACE_NAME}::zk
-                       ${CMAKE_WORKSPACE_NAME}::random
-
-                       marshalling::core
-                       marshalling::crypto3_multiprecision
-                       marshalling::crypto3_algebra
-                       marshalling::crypto3_zk
+                      crypto3::all
                       ${Boost_LIBRARIES})
 
 add_custom_target(compile_and_run_transpiler_tests)