diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ddd286..d93d3b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,11 +51,11 @@ include_directories(./)
 
 # Include shared act libraries
 # We need this mostly for file elaboration ahead of cluster deployment
-#add_library(ActLib SHARED IMPORTED)
-#set_target_properties(ActLib PROPERTIES IMPORTED_LOCATION $ENV{ACT_HOME}/lib/libact.a)
+add_library(act-lib SHARED IMPORTED)
+set_target_properties(act-lib PROPERTIES IMPORTED_LOCATION $ENV{ACT_HOME}/lib/libact.a)
 
-#add_library(ActCommon SHARED IMPORTED)
-#set_target_properties(ActCommon PROPERTIES IMPORTED_LOCATION $ENV{ACT_HOME}/lib/libvlsilib.a)
+add_library(act-common-lib SHARED IMPORTED)
+set_target_properties(act-common-lib PROPERTIES IMPORTED_LOCATION $ENV{ACT_HOME}/lib/libvlsilib.a)
 
 # Add pqxx
 add_subdirectory(deps/libpqxx build-pqxx EXCLUDE_FROM_ALL)
@@ -69,11 +69,12 @@ add_subdirectory(deps/libpqxx build-pqxx EXCLUDE_FROM_ALL)
 
 # Set the output directory of executables
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 
 set(CMAKE_INSTALL_PREFIX $ENV{ACT_HOME} CACHE PATH "installation path" FORCE)
 
 add_subdirectory(src)
-        
+
 # We don't provide a library
 #install(
 #        TARGETS dflowchp
diff --git a/src/cluster/CMakeLists.txt b/src/cluster/CMakeLists.txt
index 6b2038b..345101d 100644
--- a/src/cluster/CMakeLists.txt
+++ b/src/cluster/CMakeLists.txt
@@ -12,4 +12,22 @@ add_library(
     act-cluster-lib
     STATIC
     ${act_cluster_lib_SRC}
+)
+
+target_link_libraries(
+    act-cluster-lib
+    act-lib
+    act-common-lib
+    pqxx
+)
+
+install(
+        DIRECTORY ${CMAKE_SOURCE_DIR}/include/cluster
+        DESTINATION include/cluster
+        FILES_MATCHING PATTERN "*.h*"
+)
+
+install(
+        TARGETS act-cluster-lib
+        LIBRARY DESTINATION lib
 )
\ No newline at end of file