diff --git a/src/lib/drivers/mod.rs b/src/lib/drivers/mod.rs
index 776fbb26..67448885 100644
--- a/src/lib/drivers/mod.rs
+++ b/src/lib/drivers/mod.rs
@@ -5,6 +5,7 @@ pub mod serial;
 pub mod tcp;
 pub mod tlog;
 pub mod udp;
+pub mod zenoh;
 
 use std::sync::Arc;
 
@@ -27,6 +28,7 @@ pub enum Type {
     TcpServer,
     UdpClient,
     UdpServer,
+    Zenoh,
 }
 
 // This legacy description is based on others tools like mavp2p, mavproxy and mavlink-router
@@ -223,6 +225,10 @@ pub fn endpoints() -> Vec<ExtInfo> {
             driver_ext: Box::new(fake::FakeSourceInfo),
             typ: Type::FakeSource,
         },
+        ExtInfo {
+            driver_ext: Box::new(zenoh::ZenohInfo),
+            typ: Type::Zenoh,
+        },
     ]
 }
 
diff --git a/src/lib/drivers/zenoh/mod.rs b/src/lib/drivers/zenoh/mod.rs
new file mode 100644
index 00000000..6a3de7cf
--- /dev/null
+++ b/src/lib/drivers/zenoh/mod.rs
@@ -0,0 +1,303 @@
+use std::sync::Arc;
+
+use anyhow::Result;
+use mavlink::{self, Message};
+use mavlink_codec::Packet;
+use serde::{Deserialize, Serialize};
+use tokio::sync::{broadcast, RwLock};
+use tokio_util::codec::Framed;
+use tracing::*;
+use zenoh;
+
+use crate::{
+    callbacks::{Callbacks, MessageCallback},
+    drivers::{generic_tasks::SendReceiveContext, Driver, DriverInfo},
+    protocol::Protocol,
+    stats::{
+        accumulated::driver::{AccumulatedDriverStats, AccumulatedDriverStatsProvider},
+        driver::DriverUuid,
+    },
+};
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct MAVLinkMessage<T> {
+    pub header: mavlink::MavHeader,
+    pub message: T,
+}
+
+#[derive(Debug)]
+pub struct Zenoh {
+    name: arc_swap::ArcSwap<String>,
+    uuid: DriverUuid,
+    on_message_input: Callbacks<Arc<Protocol>>,
+    on_message_output: Callbacks<Arc<Protocol>>,
+    stats: Arc<RwLock<AccumulatedDriverStats>>,
+}
+
+pub struct ZenohBuilder(Zenoh);
+
+impl ZenohBuilder {
+    pub fn build(self) -> Zenoh {
+        self.0
+    }
+
+    pub fn on_message_input<C>(self, callback: C) -> Self
+    where
+        C: MessageCallback<Arc<Protocol>>,
+    {
+        self.0.on_message_input.add_callback(callback.into_boxed());
+        self
+    }
+
+    pub fn on_message_output<C>(self, callback: C) -> Self
+    where
+        C: MessageCallback<Arc<Protocol>>,
+    {
+        self.0.on_message_output.add_callback(callback.into_boxed());
+        self
+    }
+}
+
+impl Zenoh {
+    #[instrument(level = "debug")]
+    pub fn builder(name: &str) -> ZenohBuilder {
+        let name = Arc::new(name.to_string());
+
+        ZenohBuilder(Self {
+            name: arc_swap::ArcSwap::new(name.clone()),
+            uuid: Self::generate_uuid(&name),
+            on_message_input: Callbacks::default(),
+            on_message_output: Callbacks::default(),
+            stats: Arc::new(RwLock::new(AccumulatedDriverStats::new(name, &ZenohInfo))),
+        })
+    }
+
+    #[instrument(level = "debug", skip_all)]
+    async fn receive_task(
+        context: &SendReceiveContext,
+        session: Arc<zenoh::Session>,
+    ) -> Result<()> {
+        let subscriber = match session
+            .declare_subscriber(format!("{}/in", "mavlink"))
+            .await
+        {
+            Ok(subscriber) => subscriber,
+            Err(error) => {
+                return Err(anyhow::anyhow!(
+                    "Failed to create subscriber for mavlink data: {error:?}"
+                ));
+            }
+        };
+
+        while let Ok(sample) = subscriber.recv_async().await {
+            let Ok(content) = json5::from_str::<MAVLinkMessage<mavlink::ardupilotmega::MavMessage>>(
+                std::str::from_utf8(&sample.payload().to_bytes()).unwrap(),
+            ) else {
+                debug!("Failed to parse message, not a valid MAVLinkMessage: {sample:?}");
+                continue;
+            };
+
+            let bus_message = {
+                let mut message_raw = mavlink::MAVLinkV2MessageRaw::new();
+                message_raw.serialize_message(content.header, &content.message);
+
+                Arc::new(Protocol::new("zenoh", Packet::from(message_raw)))
+            };
+
+            trace!("Received message: {bus_message:?}");
+
+            context.stats.write().await.stats.update_input(&bus_message);
+
+            for future in context.on_message_input.call_all(bus_message.clone()) {
+                if let Err(error) = future.await {
+                    debug!("Dropping message: on_message_input callback returned error: {error:?}");
+                    continue;
+                }
+            }
+
+            if let Err(error) = context.hub_sender.send(bus_message) {
+                error!("Failed to send message to hub: {error:?}");
+                continue;
+            }
+
+            trace!("Message sent to hub");
+        }
+
+        debug!("Driver receiver task stopped!");
+
+        Ok(())
+    }
+
+    #[instrument(level = "debug", skip_all)]
+    async fn send_task(context: &SendReceiveContext, session: Arc<zenoh::Session>) -> Result<()> {
+        let mut hub_receiver = context.hub_sender.subscribe();
+
+        loop {
+            let message = match hub_receiver.recv().await {
+                Ok(message) => message,
+                Err(broadcast::error::RecvError::Closed) => {
+                    error!("Hub channel closed!");
+                    break;
+                }
+                Err(broadcast::error::RecvError::Lagged(count)) => {
+                    warn!("Channel lagged by {count} messages.");
+                    continue;
+                }
+            };
+            
+            if message.origin.eq("zenoh") {
+                continue; // Don't do loopback
+            }
+
+            context.stats.write().await.stats.update_output(&message);
+
+            for future in context.on_message_output.call_all(message.clone()) {
+                if let Err(error) = future.await {
+                    debug!(
+                        "Dropping message: on_message_output callback returned error: {error:?}"
+                    );
+                    continue;
+                }
+            }
+
+            let mut bytes = mavlink::async_peek_reader::AsyncPeekReader::new(message.as_slice());
+            let Ok((header, message)) =
+                mavlink::read_v2_msg_async::<mavlink::ardupilotmega::MavMessage, _>(&mut bytes)
+                    .await
+            else {
+                continue;
+            };
+
+            let message_name = message.message_name();
+            let mavlink_message = MAVLinkMessage { header, message };
+            let json_string = &match json5::to_string(&mavlink_message) {
+                Ok(json) => json,
+                Err(error) => {
+                    error!("Failed to transform mavlink message {message_name} to json: {error:?}");
+                    continue;
+                }
+            };
+
+            let topic_name = "mavlink/out";
+            if let Err(error) = session.put(topic_name, json_string).await {
+                error!("Failed to send message to {topic_name}: {error:?}");
+            } else {
+                trace!("Message sent to {topic_name}: {json_string:?}");
+            }
+
+            let topic_name = &format!(
+                "mavlink/{}/{}/{}",
+                header.system_id, header.component_id, message_name
+            );
+            if let Err(error) = session.put(topic_name, json_string).await {
+                error!("Failed to send message to {topic_name}: {error:?}");
+            } else {
+                trace!("Message sent to {topic_name}: {json_string:?}");
+            }
+        }
+
+        debug!("Driver sender task stopped!");
+
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+impl Driver for Zenoh {
+    #[instrument(level = "debug", skip(self, hub_sender))]
+    async fn run(&self, hub_sender: broadcast::Sender<Arc<Protocol>>) -> Result<()> {
+        let context = SendReceiveContext {
+            hub_sender,
+            on_message_output: self.on_message_output.clone(),
+            on_message_input: self.on_message_input.clone(),
+            stats: self.stats.clone(),
+        };
+
+        // Change this based on the endpoint configuration
+        let config = zenoh::Config::default();
+
+        let mut first = true;
+        loop {
+            if first {
+                first = false;
+            } else {
+                tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
+            }
+
+            let session = match zenoh::open(config.clone()).await {
+                Ok(session) => Arc::new(session),
+                Err(error) => {
+                    error!("Failed to start zenoh session: {error:?}");
+                    continue;
+                }
+            };
+
+            tokio::select! {
+                result = Zenoh::send_task(&context, session.clone()) => {
+                    if let Err(error) = result {
+                        error!("Error in send task: {error:?}");
+                    }
+                }
+                result = Zenoh::receive_task(&context, session) => {
+                    if let Err(error) = result {
+                        error!("Error in receive task: {error:?}");
+                    }
+                }
+            }
+        }
+    }
+
+    #[instrument(level = "debug", skip(self))]
+    fn info(&self) -> Box<dyn DriverInfo> {
+        Box::new(ZenohInfo)
+    }
+
+    fn name(&self) -> Arc<String> {
+        self.name.load_full()
+    }
+
+    fn uuid(&self) -> &DriverUuid {
+        &self.uuid
+    }
+}
+
+#[async_trait::async_trait]
+impl AccumulatedDriverStatsProvider for Zenoh {
+    async fn stats(&self) -> AccumulatedDriverStats {
+        self.stats.read().await.clone()
+    }
+
+    async fn reset_stats(&self) {
+        let mut stats = self.stats.write().await;
+        stats.stats.input = None;
+        stats.stats.output = None
+    }
+}
+
+pub struct ZenohInfo;
+impl DriverInfo for ZenohInfo {
+    fn name(&self) -> &'static str {
+        "Zenoh"
+    }
+    fn valid_schemes(&self) -> &'static [&'static str] {
+        &["zenoh"]
+    }
+
+    fn cli_example_legacy(&self) -> Vec<String> {
+        let first_schema = self.valid_schemes()[0];
+
+        vec![format!("{first_schema}:<IP>:<PORT>")]
+    }
+
+    fn cli_example_url(&self) -> Vec<String> {
+        let first_schema = &self.valid_schemes()[0];
+        vec![format!("{first_schema}://<IP>:<PORT>").to_string()]
+    }
+
+    fn create_endpoint_from_url(&self, url: &url::Url) -> Option<Arc<dyn Driver>> {
+        println!("{}", &url);
+        let _host = url.host_str().unwrap();
+        let _port = url.port().unwrap();
+        Some(Arc::new(Zenoh::builder("Zenoh").build()))
+    }
+}