diff --git a/Cargo.lock b/Cargo.lock
index 3e68b81..e731d91 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -333,7 +333,7 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 [[package]]
 name = "core-protobuf-data-access"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/ibeji#79efe566c252f319f490ffdbe61471e31a495df5"
+source = "git+https://github.com/eclipse-ibeji/ibeji#b90c6f30971218accd1f0f52f656c39955148cbf"
 dependencies = [
  "prost",
  "prost-types",
@@ -549,7 +549,7 @@ dependencies = [
 [[package]]
 name = "freyja"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#901faee50e7323138f3afb8cb94c620e4a14969c"
+source = "git+https://github.com/eclipse-ibeji/freyja#b4fb6034c4733e093a80ddd919b39a5cfd8c08c5"
 dependencies = [
  "crossbeam",
  "env_logger",
@@ -570,12 +570,12 @@ dependencies = [
 [[package]]
 name = "freyja-build-common"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#901faee50e7323138f3afb8cb94c620e4a14969c"
+source = "git+https://github.com/eclipse-ibeji/freyja#b4fb6034c4733e093a80ddd919b39a5cfd8c08c5"
 
 [[package]]
 name = "freyja-common"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#901faee50e7323138f3afb8cb94c620e4a14969c"
+source = "git+https://github.com/eclipse-ibeji/freyja#b4fb6034c4733e093a80ddd919b39a5cfd8c08c5"
 dependencies = [
  "config",
  "freyja-contracts",
@@ -589,7 +589,7 @@ dependencies = [
 [[package]]
 name = "freyja-contracts"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#901faee50e7323138f3afb8cb94c620e4a14969c"
+source = "git+https://github.com/eclipse-ibeji/freyja#b4fb6034c4733e093a80ddd919b39a5cfd8c08c5"
 dependencies = [
  "async-trait",
  "crossbeam",
@@ -757,7 +757,7 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 [[package]]
 name = "grpc-provider-proxy-v1"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#901faee50e7323138f3afb8cb94c620e4a14969c"
+source = "git+https://github.com/eclipse-ibeji/freyja#b4fb6034c4733e093a80ddd919b39a5cfd8c08c5"
 dependencies = [
  "async-trait",
  "crossbeam",
@@ -854,7 +854,7 @@ dependencies = [
 [[package]]
 name = "http-mock-provider-proxy"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#901faee50e7323138f3afb8cb94c620e4a14969c"
+source = "git+https://github.com/eclipse-ibeji/freyja#b4fb6034c4733e093a80ddd919b39a5cfd8c08c5"
 dependencies = [
  "async-trait",
  "axum",
@@ -972,7 +972,7 @@ dependencies = [
 [[package]]
 name = "in-memory-mock-cloud-adapter"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#901faee50e7323138f3afb8cb94c620e4a14969c"
+source = "git+https://github.com/eclipse-ibeji/freyja#b4fb6034c4733e093a80ddd919b39a5cfd8c08c5"
 dependencies = [
  "async-trait",
  "freyja-contracts",
@@ -984,7 +984,7 @@ dependencies = [
 [[package]]
 name = "in-memory-mock-digital-twin-adapter"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#901faee50e7323138f3afb8cb94c620e4a14969c"
+source = "git+https://github.com/eclipse-ibeji/freyja#b4fb6034c4733e093a80ddd919b39a5cfd8c08c5"
 dependencies = [
  "async-trait",
  "freyja-build-common",
@@ -997,7 +997,7 @@ dependencies = [
 [[package]]
 name = "in-memory-mock-mapping-client"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#901faee50e7323138f3afb8cb94c620e4a14969c"
+source = "git+https://github.com/eclipse-ibeji/freyja#b4fb6034c4733e093a80ddd919b39a5cfd8c08c5"
 dependencies = [
  "async-trait",
  "freyja-build-common",
@@ -1010,7 +1010,7 @@ dependencies = [
 [[package]]
 name = "in-memory-mock-provider-proxy"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#901faee50e7323138f3afb8cb94c620e4a14969c"
+source = "git+https://github.com/eclipse-ibeji/freyja#b4fb6034c4733e093a80ddd919b39a5cfd8c08c5"
 dependencies = [
  "async-trait",
  "crossbeam",
@@ -1127,7 +1127,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 [[package]]
 name = "managed-subscribe-provider-proxy"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#901faee50e7323138f3afb8cb94c620e4a14969c"
+source = "git+https://github.com/eclipse-ibeji/freyja#b4fb6034c4733e093a80ddd919b39a5cfd8c08c5"
 dependencies = [
  "async-trait",
  "core-protobuf-data-access",
@@ -1200,7 +1200,7 @@ dependencies = [
 [[package]]
 name = "mqtt-provider-proxy"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#901faee50e7323138f3afb8cb94c620e4a14969c"
+source = "git+https://github.com/eclipse-ibeji/freyja#b4fb6034c4733e093a80ddd919b39a5cfd8c08c5"
 dependencies = [
  "async-trait",
  "crossbeam",
@@ -1492,7 +1492,7 @@ dependencies = [
 [[package]]
 name = "proc-macros"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#901faee50e7323138f3afb8cb94c620e4a14969c"
+source = "git+https://github.com/eclipse-ibeji/freyja#b4fb6034c4733e093a80ddd919b39a5cfd8c08c5"
 dependencies = [
  "convert_case",
  "proc-macro2",
@@ -1557,7 +1557,7 @@ dependencies = [
 [[package]]
 name = "provider-proxy-selector"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#901faee50e7323138f3afb8cb94c620e4a14969c"
+source = "git+https://github.com/eclipse-ibeji/freyja#b4fb6034c4733e093a80ddd919b39a5cfd8c08c5"
 dependencies = [
  "async-trait",
  "crossbeam",
@@ -1736,7 +1736,7 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 [[package]]
 name = "samples-protobuf-data-access"
 version = "1.0.0"
-source = "git+https://github.com/eclipse-ibeji/ibeji#79efe566c252f319f490ffdbe61471e31a495df5"
+source = "git+https://github.com/eclipse-ibeji/ibeji#b90c6f30971218accd1f0f52f656c39955148cbf"
 dependencies = [
  "prost",
  "prost-types",
@@ -1840,7 +1840,7 @@ dependencies = [
 [[package]]
 name = "service_discovery_proto"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-chariott/chariott#81474c771d8092ec7bb5fb7bd48c328a6dc56eba"
+source = "git+https://github.com/eclipse-chariott/chariott#a52c49d07cf8bd8aa317f93649966d10d033b017"
 dependencies = [
  "prost",
  "tokio",