diff --git a/Cargo.lock b/Cargo.lock
index c9027b5..958417e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3247,7 +3247,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3313,7 +3313,6 @@ dependencies = [
  "tracing",
  "uhlc",
  "zenoh",
- "zenoh-codec",
  "zenoh-plugin-trait",
  "zenoh_backend_traits",
 ]
@@ -3321,7 +3320,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3329,7 +3328,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "serde",
  "tracing",
@@ -3341,12 +3340,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "flume",
  "json5",
@@ -3368,7 +3367,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "async-global-executor",
  "lazy_static",
@@ -3380,7 +3379,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "aes",
  "hmac",
@@ -3393,7 +3392,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "hashbrown",
  "keyed-set",
@@ -3407,7 +3406,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "async-trait",
  "zenoh-config",
@@ -3425,7 +3424,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "async-trait",
  "flume",
@@ -3449,7 +3448,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3480,7 +3479,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "async-trait",
  "tokio",
@@ -3498,7 +3497,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3528,7 +3527,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "async-trait",
  "socket2 0.5.6",
@@ -3549,7 +3548,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "async-trait",
  "futures",
@@ -3569,7 +3568,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3590,7 +3589,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3601,7 +3600,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "libloading",
  "serde",
@@ -3616,7 +3615,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "const_format",
  "rand",
@@ -3631,7 +3630,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "anyhow",
 ]
@@ -3639,7 +3638,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "futures",
  "lazy_static",
@@ -3654,7 +3653,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -3668,7 +3667,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "futures",
  "tokio",
@@ -3681,7 +3680,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "async-trait",
  "flume",
@@ -3713,7 +3712,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3737,7 +3736,7 @@ dependencies = [
 [[package]]
 name = "zenoh_backend_traits"
 version = "0.11.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh?branch=pubsub_query#40906aafd94e22f3cd26b4bf9b4f0e49cb604d10"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#e021d0de69e589e06c4ec8f328097610ce52a44d"
 dependencies = [
  "async-std",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index 87fd452..1b5e6b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,13 +46,13 @@ rocksdb = "0.22.0"
 serde_json = "1.0.114"
 tracing = "0.1"
 uhlc = "0.7.0"
-zenoh = { git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "pubsub_query", features = [
+zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", features = [
  "unstable",
  "internal",
  "plugins"
 ] }
-zenoh_backend_traits = { git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "pubsub_query" }
-zenoh-plugin-trait = { git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "pubsub_query" }
+zenoh_backend_traits = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" }
+zenoh-plugin-trait = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" }
 
 [build-dependencies]
 rustc_version = "0.4.0"