diff --git a/CMakeLists.txt b/CMakeLists.txt
index f85fda0f..976bc6ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -367,9 +367,7 @@ if(EIVE_ADD_LINUX_FILES)
   add_subdirectory(${LINUX_PATH})
 endif()
 add_subdirectory(${BSP_PATH})
-if(ADD_GOMSPACE_CSP OR ADD_GOMSPACE_CLIENTS)
-  add_subdirectory(${LIB_GOMSPACE_PATH})
-endif()
+add_subdirectory(${LIB_GOMSPACE_PATH})
 add_subdirectory(${COMMON_PATH})
 add_subdirectory(${DUMMY_PATH})
 
@@ -454,21 +452,15 @@ if(TGT_BSP MATCHES "arm/q7s")
 endif()
 
 target_link_libraries(${UNITTEST_NAME} PRIVATE Catch2 ${LIB_EIVE_MISSION}
-                                               rapidcsv ${LIB_DUMMIES})
+                                               rapidcsv ${LIB_DUMMIES} ${LIB_GOMSPACE_CLIENTS})
 
 if(TGT_BSP MATCHES "arm/egse")
   target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_ARCSEC})
 endif()
 
-if(ADD_GOMSPACE_CSP)
-  target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_GOMSPACE_CSP})
-endif()
-
-if(ADD_GOMSPACE_CLIENTS)
-  target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_GOMSPACE_CLIENTS})
-  target_link_libraries(${LIB_EIVE_MISSION} PRIVATE ${LIB_GOMSPACE_CLIENTS})
-  target_link_libraries(${LIB_DUMMIES} PRIVATE ${LIB_GOMSPACE_CLIENTS})
-endif()
+target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_GOMSPACE_CLIENTS})
+target_link_libraries(${LIB_EIVE_MISSION} PRIVATE ${LIB_GOMSPACE_CLIENTS})
+target_link_libraries(${LIB_DUMMIES} PRIVATE ${LIB_GOMSPACE_CLIENTS})
 
 if(EIVE_ADD_ETL_LIB)
   target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_ETL_TARGET})
diff --git a/thirdparty/gomspace-sw b/thirdparty/gomspace-sw
index d24a574f..15d489b8 160000
--- a/thirdparty/gomspace-sw
+++ b/thirdparty/gomspace-sw
@@ -1 +1 @@
-Subproject commit d24a574ffd32bd4da8aa69e768180ccae76d6c85
+Subproject commit 15d489b884f46d232ec7d8879e7355d83873f06f