diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe90ab2ea..06d1e4da1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,6 +104,7 @@ pkg_check_modules(RABBITMQ_C IMPORTED_TARGET librabbitmq>=0.8.0)
 pkg_check_modules(COMEDILIB IMPORTED_TARGET comedilib>=0.11.0)
 pkg_check_modules(LIBZMQ IMPORTED_TARGET libzmq>=2.2.0)
 pkg_check_modules(LIBULDAQ IMPORTED_TARGET libuldaq>=1.0.0)
+pkg_check_modules(UUID IMPORTED_TARGET uuid)
 pkg_check_modules(NANOMSG IMPORTED_TARGET nanomsg)
 if(NOT NANOMSG_FOUND)
     pkg_check_modules(NANOMSG IMPORTED_TARGET libnanomsg>=1.0.0)
diff --git a/cmake/VILLASnodePackaging.cmake b/cmake/VILLASnodePackaging.cmake
index bf682cab9..169a86d63 100644
--- a/cmake/VILLASnodePackaging.cmake
+++ b/cmake/VILLASnodePackaging.cmake
@@ -61,8 +61,8 @@ set(CPACK_RPM_PLUGINS_FILE_NAME "${CPACK_RPM_PLUGINS_PACKAGE_NAME}-${SUFFIX}")
 set(CPACK_RPM_TOOLS_FILE_NAME   "${CPACK_RPM_TOOLS_PACKAGE_NAME}-${SUFFIX}")
 set(CPACK_RPM_DOC_FILE_NAME     "${CPACK_RPM_DOC_PACKAGE_NAME}-${SUFFIX}")
 
-set(CPACK_RPM_DEVEL_PACKAGE_REQUIRES   "${CPACK_RPM_LIB_PACKAGE_NAME} openssl-devel >= 1.0.0, protobuf-devel >= 2.6.0, protobuf-c-devel >= 1.1.0, libconfig-devel >= 1.4.9, libnl3-devel >= 3.2.27, libcurl-devel >= 7.29.0, jansson-devel >= 2.7, libwebsockets-devel >= 2.3.0, zeromq-devel >= 2.2.0, nanomsg >= 1.0.0, libiec61850 >= 1.3.1, librabbitmq-devel >= 0.8.0, mosquitto-devel >= 1.4.15, comedilib-devel >= 0.11.0, libibverbs-devel >= 16.2, librdmacm-devel >= 16.2, re-devel >= 0.6.0, uldaq-devel >= 1.0.0")
-set(CPACK_RPM_LIB_PACKAGE_REQUIRES     "                              openssl-libs >= 1.0.0,  protobuf >= 2.6.0,       protobuf-c >= 1.1.0,       libconfig >= 1.4.9,       libnl3 >= 3.2.27,       libcurl >= 7.29.0,       jansson >= 2.7,       libwebsockets >= 2.3.0,       zeromq >= 2.2.0,       nanomsg >= 1.0.0, libiec61850 >= 1.3.1, librabbitmq >= 0.8.0,       mosquitto >= 1.4.15,       comedilib >= 0.11.0,       libibverbs >= 16.2,       librdmacm >= 16.2,       re >= 0.6.0,       uldaq >= 1.0.0")
+set(CPACK_RPM_DEVEL_PACKAGE_REQUIRES   "${CPACK_RPM_LIB_PACKAGE_NAME} openssl-devel >= 1.0.0, libuuid-devel, protobuf-devel >= 2.6.0, protobuf-c-devel >= 1.1.0, libconfig-devel >= 1.4.9, libnl3-devel >= 3.2.27, libcurl-devel >= 7.29.0, jansson-devel >= 2.7, libwebsockets-devel >= 2.3.0, zeromq-devel >= 2.2.0, nanomsg >= 1.0.0, libiec61850 >= 1.3.1, librabbitmq-devel >= 0.8.0, mosquitto-devel >= 1.4.15, comedilib-devel >= 0.11.0, libibverbs-devel >= 16.2, librdmacm-devel >= 16.2, re-devel >= 0.6.0, uldaq-devel >= 1.0.0")
+set(CPACK_RPM_LIB_PACKAGE_REQUIRES     "                              openssl-libs >= 1.0.0,  libuuid,       protobuf >= 2.6.0,       protobuf-c >= 1.1.0,       libconfig >= 1.4.9,       libnl3 >= 3.2.27,       libcurl >= 7.29.0,       jansson >= 2.7,       libwebsockets >= 2.3.0,       zeromq >= 2.2.0,       nanomsg >= 1.0.0, libiec61850 >= 1.3.1, librabbitmq >= 0.8.0,       mosquitto >= 1.4.15,       comedilib >= 0.11.0,       libibverbs >= 16.2,       librdmacm >= 16.2,       re >= 0.6.0,       uldaq >= 1.0.0")
 set(CPACK_RPM_BIN_PACKAGE_REQUIRES     ${CPACK_RPM_LIB_PACKAGE_NAME})
 set(CPACK_RPM_PLUGINS_PACKAGE_REQUIRES ${CPACK_RPM_LIB_PACKAGE_NAME})
 set(CPACK_RPM_TOOLS_PACKAGE_REQUIRES   ${CPACK_RPM_LIB_PACKAGE_NAME})
diff --git a/packaging/docker/Dockerfile.dev b/packaging/docker/Dockerfile.dev
index ba3c4a09c..2e506d4c3 100644
--- a/packaging/docker/Dockerfile.dev
+++ b/packaging/docker/Dockerfile.dev
@@ -68,6 +68,7 @@ RUN dnf -y install \
 	openssl-devel \
 	protobuf-devel \
 	protobuf-c-devel \
+	libuuid-devel \
 	libconfig-devel \
 	libnl3-devel \
 	libcurl-devel \
diff --git a/packaging/docker/Dockerfile.dev-centos b/packaging/docker/Dockerfile.dev-centos
index db68704c0..da6393d70 100644
--- a/packaging/docker/Dockerfile.dev-centos
+++ b/packaging/docker/Dockerfile.dev-centos
@@ -76,6 +76,7 @@ RUN yum -y install \
 	openssl-devel \
 	protobuf-devel \
 	protobuf-c-devel \
+	libuuid-devel \
 	libconfig-devel \
 	libnl3-devel \
 	libcurl-devel \
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0ef0678dc..11e6a8a9d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,7 +35,7 @@ install(
 if(WITH_WEB)
     add_executable(villas-relay villas-relay.cpp)
     target_include_directories(villas-relay PRIVATE ${LIBWEBSOCKETS_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/common/include)
-    target_link_libraries(villas-relay PRIVATE PkgConfig::LIBWEBSOCKETS villas-common spdlog)
+    target_link_libraries(villas-relay PRIVATE PkgConfig::LIBWEBSOCKETS PkgConfig::UUID villas-common spdlog)
 
     install(
         TARGETS villas-relay