diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb2a9225..9bc9c33e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
 
 # Define project
 project(Monitoring
-  VERSION 3.16.0
+  VERSION 3.16.1
   DESCRIPTION "O2 Monitoring library"
   LANGUAGES CXX
 )
@@ -293,6 +293,7 @@ if(RdKafka_FOUND AND Protobuf_FOUND AND CURL_FOUND)
   endforeach()
   set_target_properties(8-KafkaToHttpServer PROPERTIES OUTPUT_NAME "o2-monitoring-env-webserver")
   set_target_properties(12-KafkaToInfluxDb PROPERTIES OUTPUT_NAME "o2-monitoring-kafka-to-influxdb")
+  set_target_properties(14-OrbitId PROPERTIES OUTPUT_NAME "o2-monitoring-orbitid")
 endif()
 
 ####################################
@@ -345,6 +346,11 @@ if(RdKafka_FOUND)
   install(TARGETS 11-KafkaToWebsocket)
 endif()
 
+
+if(RdKafka_FOUND AND Protobuf_FOUND)
+  install(TARGETS 14-OrbitId)
+endif()
+
 # Create version file
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/cmake/MonitoringConfigVersion.cmake"