diff --git a/Cargo.lock b/Cargo.lock
index 34a711cc0..4a239ba25 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2954,7 +2954,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "async-trait",
  "base64",
@@ -3004,7 +3004,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3035,7 +3035,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "serde",
  "tracing",
@@ -3048,12 +3048,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "flume",
  "json5",
@@ -3073,7 +3073,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "async-global-executor",
  "lazy_static",
@@ -3085,7 +3085,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "aes",
  "hmac",
@@ -3098,7 +3098,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "bincode",
  "flume",
@@ -3119,7 +3119,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "hashbrown 0.14.0",
  "keyed-set",
@@ -3133,7 +3133,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "async-trait",
  "zenoh-config",
@@ -3151,7 +3151,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "async-trait",
  "flume",
@@ -3174,7 +3174,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "async-trait",
  "base64",
@@ -3202,7 +3202,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "async-trait",
  "tokio",
@@ -3220,7 +3220,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "async-trait",
  "base64",
@@ -3248,7 +3248,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "async-trait",
  "socket2 0.5.6",
@@ -3269,7 +3269,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "async-trait",
  "futures",
@@ -3289,7 +3289,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3310,7 +3310,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3321,7 +3321,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "const_format",
  "libloading",
@@ -3337,7 +3337,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "const_format",
  "rand",
@@ -3351,7 +3351,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "anyhow",
 ]
@@ -3359,7 +3359,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "futures",
  "lazy_static",
@@ -3371,7 +3371,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "serde",
  "shared_memory",
@@ -3383,7 +3383,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "event-listener 4.0.0",
  "futures",
@@ -3397,7 +3397,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "futures",
  "tokio",
@@ -3410,7 +3410,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "async-trait",
  "flume",
@@ -3443,7 +3443,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=feat/tracing#050290c15ff42cc76af446b17f158500a09b37bb"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#56a44457aac962ba23fbca2f2f9daa663885c4e6"
 dependencies = [
  "async-std",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index 43400b861..a4e0362b5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,10 +49,10 @@ libc = "0.2.139"
 rand = "0.8.5"
 spin = "0.9.5"
 # shared-memory enabled for zenoh even if zenoh-c "shared-memory" feature is disabled. This is to make "std::mem::transmute" work for `ZSLice`
-zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feat/tracing", features = ["shared-memory", "unstable"], default-features = false }
-zenoh-protocol = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feat/tracing", features = ["shared-memory"] }
-zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feat/tracing" }
-zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feat/tracing", features = ["unstable"] }
+zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["shared-memory", "unstable"], default-features = false }
+zenoh-protocol = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["shared-memory"] }
+zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
+zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["unstable"] }
 tracing = "0.1"
 
 [build-dependencies]
diff --git a/Cargo.toml.in b/Cargo.toml.in
index 3f6973a6c..34984b875 100644
--- a/Cargo.toml.in
+++ b/Cargo.toml.in
@@ -49,10 +49,10 @@ libc = "0.2.139"
 rand = "0.8.5"
 spin = "0.9.5"
 # shared-memory enabled for zenoh even if zenoh-c "shared-memory" feature is disabled. This is to make "std::mem::transmute" work for `ZSLice`
-zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feat/tracing", features = ["shared-memory", "unstable"], default-features = false }
-zenoh-protocol = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feat/tracing", features = ["shared-memory"] }
-zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feat/tracing" }
-zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feat/tracing", features = ["unstable"] }
+zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["shared-memory", "unstable"], default-features = false }
+zenoh-protocol = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["shared-memory"] }
+zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
+zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["unstable"] }
 tracing = "0.1"
 
 [build-dependencies]
diff --git a/src/lib.rs b/src/lib.rs
index 380b9ba14..1d9f01dab 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -149,7 +149,7 @@ pub(crate) const LOG_INVALID_SESSION: &str = "Invalid session";
 /// this will be performed automatically by `z_open` and `z_scout`.
 #[no_mangle]
 pub extern "C" fn zc_init_logger() {
-    zenoh_util::init_log();
+    zenoh_util::init_log_from_env();
 }
 
 // Test should be runned with `cargo test --no-default-features`