diff --git a/Cargo.lock b/Cargo.lock
index 1ea0ab8..b53a97d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.76"
+version = "0.1.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531b97fb4cd3dfdce92c35dedbfdc1f0b9d8091c8ca943d6dae340ef5012d514"
+checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -333,7 +333,7 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 [[package]]
 name = "core-protobuf-data-access"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/ibeji#07d63930f7f5f48e64a5c5d366840af1a634d42b"
+source = "git+https://github.com/eclipse-ibeji/ibeji#2026d99e2212017acc6adf1fb447e260e7c0de86"
 dependencies = [
  "prost",
  "prost-types",
@@ -549,7 +549,7 @@ dependencies = [
 [[package]]
 name = "freyja"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#83b1f9c19f7b2c17c6d278a03870e002dce0f7dc"
+source = "git+https://github.com/eclipse-ibeji/freyja#426d30349d0bb7c45a26546ff6c5fd3f93bf3b1a"
 dependencies = [
  "crossbeam",
  "env_logger",
@@ -570,17 +570,18 @@ dependencies = [
 [[package]]
 name = "freyja-build-common"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#83b1f9c19f7b2c17c6d278a03870e002dce0f7dc"
+source = "git+https://github.com/eclipse-ibeji/freyja#426d30349d0bb7c45a26546ff6c5fd3f93bf3b1a"
 
 [[package]]
 name = "freyja-common"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#83b1f9c19f7b2c17c6d278a03870e002dce0f7dc"
+source = "git+https://github.com/eclipse-ibeji/freyja#426d30349d0bb7c45a26546ff6c5fd3f93bf3b1a"
 dependencies = [
  "config",
  "freyja-contracts",
  "home",
  "log",
+ "proc-macros",
  "serde",
  "serde_json",
  "tokio",
@@ -589,7 +590,7 @@ dependencies = [
 [[package]]
 name = "freyja-contracts"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#83b1f9c19f7b2c17c6d278a03870e002dce0f7dc"
+source = "git+https://github.com/eclipse-ibeji/freyja#426d30349d0bb7c45a26546ff6c5fd3f93bf3b1a"
 dependencies = [
  "async-trait",
  "crossbeam",
@@ -759,7 +760,7 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 [[package]]
 name = "grpc-provider-proxy-v1"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#83b1f9c19f7b2c17c6d278a03870e002dce0f7dc"
+source = "git+https://github.com/eclipse-ibeji/freyja#426d30349d0bb7c45a26546ff6c5fd3f93bf3b1a"
 dependencies = [
  "async-trait",
  "crossbeam",
@@ -856,7 +857,7 @@ dependencies = [
 [[package]]
 name = "http-mock-provider-proxy"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#83b1f9c19f7b2c17c6d278a03870e002dce0f7dc"
+source = "git+https://github.com/eclipse-ibeji/freyja#426d30349d0bb7c45a26546ff6c5fd3f93bf3b1a"
 dependencies = [
  "async-trait",
  "axum",
@@ -974,7 +975,7 @@ dependencies = [
 [[package]]
 name = "in-memory-mock-cloud-adapter"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#83b1f9c19f7b2c17c6d278a03870e002dce0f7dc"
+source = "git+https://github.com/eclipse-ibeji/freyja#426d30349d0bb7c45a26546ff6c5fd3f93bf3b1a"
 dependencies = [
  "async-trait",
  "freyja-contracts",
@@ -986,7 +987,7 @@ dependencies = [
 [[package]]
 name = "in-memory-mock-digital-twin-adapter"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#83b1f9c19f7b2c17c6d278a03870e002dce0f7dc"
+source = "git+https://github.com/eclipse-ibeji/freyja#426d30349d0bb7c45a26546ff6c5fd3f93bf3b1a"
 dependencies = [
  "async-trait",
  "freyja-build-common",
@@ -999,7 +1000,7 @@ dependencies = [
 [[package]]
 name = "in-memory-mock-mapping-client"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#83b1f9c19f7b2c17c6d278a03870e002dce0f7dc"
+source = "git+https://github.com/eclipse-ibeji/freyja#426d30349d0bb7c45a26546ff6c5fd3f93bf3b1a"
 dependencies = [
  "async-trait",
  "freyja-build-common",
@@ -1012,7 +1013,7 @@ dependencies = [
 [[package]]
 name = "in-memory-mock-provider-proxy"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#83b1f9c19f7b2c17c6d278a03870e002dce0f7dc"
+source = "git+https://github.com/eclipse-ibeji/freyja#426d30349d0bb7c45a26546ff6c5fd3f93bf3b1a"
 dependencies = [
  "async-trait",
  "crossbeam",
@@ -1129,7 +1130,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 [[package]]
 name = "managed-subscribe-provider-proxy"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#83b1f9c19f7b2c17c6d278a03870e002dce0f7dc"
+source = "git+https://github.com/eclipse-ibeji/freyja#426d30349d0bb7c45a26546ff6c5fd3f93bf3b1a"
 dependencies = [
  "async-trait",
  "core-protobuf-data-access",
@@ -1202,7 +1203,7 @@ dependencies = [
 [[package]]
 name = "mqtt-provider-proxy"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#83b1f9c19f7b2c17c6d278a03870e002dce0f7dc"
+source = "git+https://github.com/eclipse-ibeji/freyja#426d30349d0bb7c45a26546ff6c5fd3f93bf3b1a"
 dependencies = [
  "async-trait",
  "crossbeam",
@@ -1494,9 +1495,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
 dependencies = [
  "unicode-ident",
 ]
@@ -1504,7 +1505,7 @@ dependencies = [
 [[package]]
 name = "proc-macros"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#83b1f9c19f7b2c17c6d278a03870e002dce0f7dc"
+source = "git+https://github.com/eclipse-ibeji/freyja#426d30349d0bb7c45a26546ff6c5fd3f93bf3b1a"
 dependencies = [
  "convert_case",
  "proc-macro2",
@@ -1569,7 +1570,7 @@ dependencies = [
 [[package]]
 name = "provider-proxy-selector"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-ibeji/freyja#83b1f9c19f7b2c17c6d278a03870e002dce0f7dc"
+source = "git+https://github.com/eclipse-ibeji/freyja#426d30349d0bb7c45a26546ff6c5fd3f93bf3b1a"
 dependencies = [
  "async-trait",
  "crossbeam",
@@ -1580,9 +1581,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -1748,7 +1749,7 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 [[package]]
 name = "samples-protobuf-data-access"
 version = "1.0.0"
-source = "git+https://github.com/eclipse-ibeji/ibeji#07d63930f7f5f48e64a5c5d366840af1a634d42b"
+source = "git+https://github.com/eclipse-ibeji/ibeji#2026d99e2212017acc6adf1fb447e260e7c0de86"
 dependencies = [
  "prost",
  "prost-types",
@@ -1798,18 +1799,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1818,9 +1819,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.109"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9"
+checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
 dependencies = [
  "itoa",
  "ryu",
@@ -1852,7 +1853,7 @@ dependencies = [
 [[package]]
 name = "service_discovery_proto"
 version = "0.1.0"
-source = "git+https://github.com/eclipse-chariott/chariott#944bf88860f64dd1e1cc94c17fdd270d9291de58"
+source = "git+https://github.com/eclipse-chariott/chariott#82e87edfaa7cb488ccff2e371493989192f302bf"
 dependencies = [
  "prost",
  "tokio",
@@ -1921,9 +1922,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.43"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 5540521..46c1802 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,14 +41,14 @@ proc-macros = { git = "https://github.com/eclipse-ibeji/freyja" }
 service_discovery_proto = { git = "https://github.com/eclipse-chariott/chariott" }
 
 # Cargo dependencies
-async-trait = "0.1.76"
+async-trait = "0.1.77"
 env_logger = "0.10.0"
 futures = "0.3.30"
 log = "0.4.20"
 paho-mqtt = "0.12.1"
 prost = "0.12.3"
-serde = "1.0.193"
-serde_json = "1.0.109"
+serde = "1.0.195"
+serde_json = "1.0.111"
 strum = "0.25.0"
 strum_macros = "0.25.2"
 tempfile = "3.9.0"