diff --git a/nodes/mixnode/Cargo.toml b/nodes/mixnode/Cargo.toml
index e6e5b1cb..a5b4b068 100644
--- a/nodes/mixnode/Cargo.toml
+++ b/nodes/mixnode/Cargo.toml
@@ -9,8 +9,8 @@ mixnet-node = { path = "../../mixnet/node" }
 nomos-log = { path = "../../nomos-services/log" }
 clap = { version = "4", features = ["derive"] }
 color-eyre = "0.6.0"
-overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
-overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" }
+overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
+overwatch-derive = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
 serde = "1"
 serde_yaml = "0.9"
 tracing = "0.1"
diff --git a/nodes/nomos-node-api/Cargo.toml b/nodes/nomos-node-api/Cargo.toml
index b04db982..82d95f8a 100644
--- a/nodes/nomos-node-api/Cargo.toml
+++ b/nodes/nomos-node-api/Cargo.toml
@@ -9,8 +9,8 @@ axum = ["dep:axum", "dep:hyper", "utoipa-swagger-ui/axum"]
 
 [dependencies]
 async-trait = "0.1"
-overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
-overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" }
+overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
+overwatch-derive = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
 tracing = "0.1"
 
 
@@ -19,7 +19,11 @@ nomos-core = { path = "../../nomos-core" }
 nomos-consensus = { path = "../../nomos-services/consensus" }
 nomos-network = { path = "../../nomos-services/network" }
 nomos-da = { path = "../../nomos-services/data-availability" }
-nomos-mempool = { path = "../../nomos-services/mempool", features = ["mock", "libp2p", "openapi"] }
+nomos-mempool = { path = "../../nomos-services/mempool", features = [
+  "mock",
+  "libp2p",
+  "openapi",
+] }
 nomos-storage = { path = "../../nomos-services/storage", features = ["sled"] }
 nomos-libp2p = { path = "../../nomos-libp2p" }
 full-replication = { path = "../../nomos-da/full-replication" }
diff --git a/nodes/nomos-node/Cargo.toml b/nodes/nomos-node/Cargo.toml
index 293b6536..68973954 100644
--- a/nodes/nomos-node/Cargo.toml
+++ b/nodes/nomos-node/Cargo.toml
@@ -14,19 +14,26 @@ chrono = "0.4"
 futures = "0.3"
 http = "0.2.9"
 hex = "0.4.3"
-overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
-overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" }
+overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
+overwatch-derive = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
 tracing = "0.1"
 multiaddr = "0.18"
 nomos-core = { path = "../../nomos-core" }
 nomos-network = { path = "../../nomos-services/network", features = ["libp2p"] }
 nomos-log = { path = "../../nomos-services/log" }
-nomos-mempool = { path = "../../nomos-services/mempool", features = ["mock", "libp2p"] }
+nomos-mempool = { path = "../../nomos-services/mempool", features = [
+  "mock",
+  "libp2p",
+] }
 nomos-http = { path = "../../nomos-services/http", features = ["http"] }
-nomos-consensus = { path = "../../nomos-services/consensus", features = ["libp2p"] }
+nomos-consensus = { path = "../../nomos-services/consensus", features = [
+  "libp2p",
+] }
 nomos-storage = { path = "../../nomos-services/storage", features = ["sled"] }
 nomos-libp2p = { path = "../../nomos-libp2p" }
-nomos-da = { path = "../../nomos-services/data-availability", features = ["libp2p"] }
+nomos-da = { path = "../../nomos-services/data-availability", features = [
+  "libp2p",
+] }
 nomos-system-sig = { path = "../../nomos-services/system-sig" }
 metrics = { path = "../../nomos-services/metrics", optional = true }
 tracing-subscriber = "0.3"
diff --git a/nomos-cli/Cargo.toml b/nomos-cli/Cargo.toml
index a183d8ad..2d356fe9 100644
--- a/nomos-cli/Cargo.toml
+++ b/nomos-cli/Cargo.toml
@@ -11,17 +11,19 @@ fraction = "0.13"
 tracing = "0.1"
 tracing-subscriber = "0.3"
 async-trait = "0.1"
-clap = {version = "4", features = ["derive"] }
+clap = { version = "4", features = ["derive"] }
 consensus-engine = { path = "../consensus-engine" }
 serde_yaml = "0.9"
 futures = "0.3"
 tokio = { version = "1", features = ["sync"] }
-overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
-overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" }
+overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
+overwatch-derive = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
 nomos-network = { path = "../nomos-services/network", features = ["libp2p"] }
-nomos-da = { path = "../nomos-services/data-availability", features = ["libp2p"] }
+nomos-da = { path = "../nomos-services/data-availability", features = [
+  "libp2p",
+] }
 nomos-consensus = { path = "../nomos-services/consensus" }
-nomos-libp2p = { path = "../nomos-libp2p"}
+nomos-libp2p = { path = "../nomos-libp2p" }
 nomos-core = { path = "../nomos-core" }
 nomos-node = { path = "../nodes/nomos-node" }
 full-replication = { path = "../nomos-da/full-replication" }
@@ -30,4 +32,4 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
 hex = "0.4.3"
-once_cell = "1"
\ No newline at end of file
+once_cell = "1"
diff --git a/nomos-services/consensus/Cargo.toml b/nomos-services/consensus/Cargo.toml
index 7424dffc..08cf810e 100644
--- a/nomos-services/consensus/Cargo.toml
+++ b/nomos-services/consensus/Cargo.toml
@@ -14,7 +14,7 @@ futures = "0.3"
 nomos-network = { path = "../network" }
 nomos-mempool = { path = "../mempool" }
 nomos-core = { path = "../../nomos-core" }
-overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
+overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
 nomos-storage = { path = "../storage" }
 rand_chacha = "0.3"
 rand = "0.8"
diff --git a/nomos-services/data-availability/Cargo.toml b/nomos-services/data-availability/Cargo.toml
index d1cfcadd..05b6da47 100644
--- a/nomos-services/data-availability/Cargo.toml
+++ b/nomos-services/data-availability/Cargo.toml
@@ -11,11 +11,11 @@ futures = "0.3"
 moka = { version = "0.11", features = ["future"] }
 nomos-core = { path = "../../nomos-core" }
 nomos-network = { path = "../network" }
-overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
+overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
 serde = "1.0"
 tracing = "0.1"
 tokio = { version = "1", features = ["sync", "macros"] }
 tokio-stream = "0.1"
 
 [features]
-libp2p = ["nomos-network/libp2p"]
\ No newline at end of file
+libp2p = ["nomos-network/libp2p"]
diff --git a/nomos-services/http/Cargo.toml b/nomos-services/http/Cargo.toml
index fc1dec05..d3cadb5f 100644
--- a/nomos-services/http/Cargo.toml
+++ b/nomos-services/http/Cargo.toml
@@ -25,14 +25,14 @@ clap = { version = "4", features = ["derive", "env"], optional = true }
 futures = "0.3"
 http = "0.2.9"
 hyper = { version = "0.14", optional = true }
-overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
-overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" }
+overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
+overwatch-derive = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
 parking_lot = { version = "0.12", optional = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", optional = true }
 thiserror = "1"
 tracing = "0.1"
-tracing-subscriber =  { version = "0.3", features = ["json"] }
+tracing-subscriber = { version = "0.3", features = ["json"] }
 tower = { version = "0.4", optional = true }
 tower-http = { version = "0.3", features = ["cors", "trace"] }
 tokio = { version = "1", features = ["sync", "macros"] }
diff --git a/nomos-services/log/Cargo.toml b/nomos-services/log/Cargo.toml
index a7c8cde5..0cf6e358 100644
--- a/nomos-services/log/Cargo.toml
+++ b/nomos-services/log/Cargo.toml
@@ -7,10 +7,10 @@ edition = "2021"
 
 [dependencies]
 async-trait = "0.1"
-overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
+overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
 serde = { version = "1.0", features = ["derive"] }
 tracing = "0.1"
 tracing-appender = "0.2"
-tracing-subscriber =  { version = "0.3", features = ["json"] }
+tracing-subscriber = { version = "0.3", features = ["json"] }
 tracing-gelf = "0.7"
 futures = "0.3"
diff --git a/nomos-services/mempool/Cargo.toml b/nomos-services/mempool/Cargo.toml
index 30834d8a..4172bce3 100644
--- a/nomos-services/mempool/Cargo.toml
+++ b/nomos-services/mempool/Cargo.toml
@@ -12,7 +12,7 @@ futures = "0.3"
 linked-hash-map = { version = "0.5.6", optional = true }
 nomos-network = { path = "../network" }
 nomos-core = { path = "../../nomos-core" }
-overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
+overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
 rand = { version = "0.8", optional = true }
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
@@ -26,7 +26,7 @@ serde_json = { version = "1", optional = true }
 
 [dev-dependencies]
 nomos-log = { path = "../log" }
-overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" }
+overwatch-derive = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
 tokio = { version = "1", features = ["full"] }
 blake2 = "0.10"
 
diff --git a/nomos-services/metrics/Cargo.toml b/nomos-services/metrics/Cargo.toml
index 0d4cb5ed..ef2e6644 100644
--- a/nomos-services/metrics/Cargo.toml
+++ b/nomos-services/metrics/Cargo.toml
@@ -16,8 +16,8 @@ bytes = "1.3"
 clap = { version = "4", features = ["derive", "env"], optional = true }
 futures = "0.3"
 nomos-http = { path = "../http", optional = true }
-overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
-overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" }
+overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
+overwatch-derive = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
 once_cell = "1.16"
 parking_lot = "0.12"
 prometheus = "0.13"
@@ -25,7 +25,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 tokio = { version = "1", features = ["sync", "macros", "time"] }
 tracing = "0.1"
-tracing-subscriber =  { version = "0.3", features = ["json", "env-filter"] }
+tracing-subscriber = { version = "0.3", features = ["json", "env-filter"] }
 tower-http = { version = "0.3", features = ["cors", "trace"], optional = true }
 thiserror = "1"
 
diff --git a/nomos-services/network/Cargo.toml b/nomos-services/network/Cargo.toml
index 1d14aabc..44e6d8d8 100644
--- a/nomos-services/network/Cargo.toml
+++ b/nomos-services/network/Cargo.toml
@@ -8,7 +8,7 @@ async-trait = "0.1"
 bytes = "1.2"
 chrono = { version = "0.4", optional = true }
 humantime-serde = { version = "1", optional = true }
-overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
+overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
 multiaddr = "0.15"
 serde = { version = "1.0", features = ["derive"] }
 sscanf = { version = "0.4", optional = true }
@@ -34,4 +34,4 @@ tokio = { version = "1", features = ["full"] }
 default = []
 libp2p = ["nomos-libp2p", "rand", "humantime-serde"]
 mock = ["rand", "chrono"]
-openapi = ["dep:utoipa", "serde_json",]
+openapi = ["dep:utoipa", "serde_json"]
diff --git a/nomos-services/storage/Cargo.toml b/nomos-services/storage/Cargo.toml
index b2a92743..e9febc77 100644
--- a/nomos-services/storage/Cargo.toml
+++ b/nomos-services/storage/Cargo.toml
@@ -10,7 +10,7 @@ async-trait = "0.1"
 futures = "0.3"
 tokio = { version = "1", features = ["sync"] }
 bytes = "1.2"
-overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
+overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
 serde = "1.0"
 sled = { version = "0.34", optional = true }
 thiserror = "1.0"
diff --git a/nomos-services/system-sig/Cargo.toml b/nomos-services/system-sig/Cargo.toml
index 98e01c0b..62fbdfa9 100644
--- a/nomos-services/system-sig/Cargo.toml
+++ b/nomos-services/system-sig/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 async-trait = "0.1"
 async-ctrlc = "1.2"
-overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
+overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
 tokio = "1.33.0"
 log = "0.4.20"
 futures = "0.3.28"
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index 6e1e5061..b7d88826 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -7,13 +7,16 @@ publish = false
 [dependencies]
 nomos-node = { path = "../nodes/nomos-node", default-features = false }
 nomos-consensus = { path = "../nomos-services/consensus" }
-nomos-network = { path = "../nomos-services/network", features = ["libp2p"]}
+nomos-network = { path = "../nomos-services/network", features = ["libp2p"] }
 nomos-log = { path = "../nomos-services/log" }
 nomos-http = { path = "../nomos-services/http", features = ["http"] }
-overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
+overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
 nomos-core = { path = "../nomos-core" }
 consensus-engine = { path = "../consensus-engine", features = ["serde"] }
-nomos-mempool = { path = "../nomos-services/mempool", features = ["mock", "libp2p"] }
+nomos-mempool = { path = "../nomos-services/mempool", features = [
+  "mock",
+  "libp2p",
+] }
 nomos-da = { path = "../nomos-services/data-availability" }
 full-replication = { path = "../nomos-da/full-replication" }
 mixnode = { path = "../nodes/mixnode" }