diff --git a/include/zenoh-pico/transport/multicast/lease.h b/include/zenoh-pico/transport/multicast/lease.h
index fdb5dea15..aef7701ed 100644
--- a/include/zenoh-pico/transport/multicast/lease.h
+++ b/include/zenoh-pico/transport/multicast/lease.h
@@ -18,8 +18,8 @@
 #include "zenoh-pico/transport/transport.h"
 
 int8_t _zp_multicast_send_keep_alive(_z_transport_multicast_t *ztm);
-int _zp_multicast_start_lease_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task);
-int _zp_multicast_stop_lease_task(_z_transport_t *zt);
+int8_t _zp_multicast_start_lease_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task);
+int8_t _zp_multicast_stop_lease_task(_z_transport_t *zt);
 void *_zp_multicast_lease_task(void *ztm_arg);  // The argument is void* to avoid incompatible pointer types in tasks
 
 #endif /* ZENOH_PICO_MULTICAST_LEASE_H */
diff --git a/include/zenoh-pico/transport/multicast/read.h b/include/zenoh-pico/transport/multicast/read.h
index 9403133fb..b2d53f770 100644
--- a/include/zenoh-pico/transport/multicast/read.h
+++ b/include/zenoh-pico/transport/multicast/read.h
@@ -18,8 +18,8 @@
 #include "zenoh-pico/transport/transport.h"
 
 int8_t _zp_multicast_read(_z_transport_multicast_t *ztm);
-int _zp_multicast_start_read_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task);
-int _zp_multicast_stop_read_task(_z_transport_t *zt);
+int8_t _zp_multicast_start_read_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task);
+int8_t _zp_multicast_stop_read_task(_z_transport_t *zt);
 void *_zp_multicast_read_task(void *ztm_arg);  // The argument is void* to avoid incompatible pointer types in tasks
 
 #endif /* ZENOH_PICO_TRANSPORT_LINK_TASK_READ_H */
diff --git a/include/zenoh-pico/transport/unicast/lease.h b/include/zenoh-pico/transport/unicast/lease.h
index 1ac65820a..fbe97e5f7 100644
--- a/include/zenoh-pico/transport/unicast/lease.h
+++ b/include/zenoh-pico/transport/unicast/lease.h
@@ -18,8 +18,8 @@
 #include "zenoh-pico/transport/transport.h"
 
 int8_t _zp_unicast_send_keep_alive(_z_transport_unicast_t *ztu);
-int _zp_unicast_start_lease_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task);
-int _zp_unicast_stop_lease_task(_z_transport_t *zt);
+int8_t _zp_unicast_start_lease_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task);
+int8_t _zp_unicast_stop_lease_task(_z_transport_t *zt);
 void *_zp_unicast_lease_task(void *ztu_arg);  // The argument is void* to avoid incompatible pointer types in tasks
 
 #endif /* ZENOH_PICO_TRANSPORT_LINK_TASK_LEASE_H */
diff --git a/include/zenoh-pico/transport/unicast/read.h b/include/zenoh-pico/transport/unicast/read.h
index 78769423a..e5d4db852 100644
--- a/include/zenoh-pico/transport/unicast/read.h
+++ b/include/zenoh-pico/transport/unicast/read.h
@@ -18,8 +18,8 @@
 #include "zenoh-pico/transport/transport.h"
 
 int8_t _zp_unicast_read(_z_transport_unicast_t *ztu);
-int _zp_unicast_start_read_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task);
-int _zp_unicast_stop_read_task(_z_transport_t *zt);
+int8_t _zp_unicast_start_read_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task);
+int8_t _zp_unicast_stop_read_task(_z_transport_t *zt);
 void *_zp_unicast_read_task(void *ztu_arg);  // The argument is void* to avoid incompatible pointer types in tasks
 
 #endif /* ZENOH_PICO_UNICAST_READ_H */
diff --git a/src/transport/multicast/lease.c b/src/transport/multicast/lease.c
index dd861644b..6cef94c57 100644
--- a/src/transport/multicast/lease.c
+++ b/src/transport/multicast/lease.c
@@ -69,7 +69,7 @@ int8_t _zp_multicast_send_keep_alive(_z_transport_multicast_t *ztm) {
     return ret;
 }
 
-int _zp_multicast_start_lease_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task) {
+int8_t _zp_multicast_start_lease_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task) {
     // Init memory
     (void)memset(task, 0, sizeof(_z_task_t));
     // Attach task
@@ -83,7 +83,7 @@ int _zp_multicast_start_lease_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_
     return _Z_RES_OK;
 }
 
-int _zp_multicast_stop_lease_task(_z_transport_t *zt) {
+int8_t _zp_multicast_stop_lease_task(_z_transport_t *zt) {
     zt->_transport._multicast._lease_task_running = false;
     return _Z_RES_OK;
 }
diff --git a/src/transport/multicast/read.c b/src/transport/multicast/read.c
index 896f07081..7e946c7da 100644
--- a/src/transport/multicast/read.c
+++ b/src/transport/multicast/read.c
@@ -39,7 +39,7 @@ int8_t _zp_multicast_read(_z_transport_multicast_t *ztm) {
     return ret;
 }
 
-int _zp_multicast_start_read_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task) {
+int8_t _zp_multicast_start_read_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task) {
     // Init memory
     (void)memset(task, 0, sizeof(_z_task_t));
     // Attach task
@@ -53,7 +53,7 @@ int _zp_multicast_start_read_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_t
     return _Z_RES_OK;
 }
 
-int _zp_multicast_stop_read_task(_z_transport_t *zt) {
+int8_t _zp_multicast_stop_read_task(_z_transport_t *zt) {
     zt->_transport._multicast._read_task_running = false;
     return _Z_RES_OK;
 }
diff --git a/src/transport/unicast/lease.c b/src/transport/unicast/lease.c
index b54ffe139..9869814bd 100644
--- a/src/transport/unicast/lease.c
+++ b/src/transport/unicast/lease.c
@@ -29,7 +29,7 @@ int8_t _zp_unicast_send_keep_alive(_z_transport_unicast_t *ztu) {
     return ret;
 }
 
-int _zp_unicast_start_lease_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task) {
+int8_t _zp_unicast_start_lease_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task) {
     // Init memory
     (void)memset(task, 0, sizeof(_z_task_t));
     // Attach task
@@ -43,7 +43,7 @@ int _zp_unicast_start_lease_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_ta
     return _Z_RES_OK;
 }
 
-int _zp_unicast_stop_lease_task(_z_transport_t *zt) {
+int8_t _zp_unicast_stop_lease_task(_z_transport_t *zt) {
     zt->_transport._unicast._lease_task_running = false;
     return _Z_RES_OK;
 }
diff --git a/src/transport/unicast/read.c b/src/transport/unicast/read.c
index 4dc7433ec..6d8f14d6f 100644
--- a/src/transport/unicast/read.c
+++ b/src/transport/unicast/read.c
@@ -36,7 +36,7 @@ int8_t _zp_unicast_read(_z_transport_unicast_t *ztu) {
     return ret;
 }
 
-int _zp_unicast_start_read_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task) {
+int8_t _zp_unicast_start_read_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_task_t *task) {
     // Init memory
     (void)memset(task, 0, sizeof(_z_task_t));
     // Attach task
@@ -50,7 +50,7 @@ int _zp_unicast_start_read_task(_z_transport_t *zt, _z_task_attr_t *attr, _z_tas
     return _Z_RES_OK;
 }
 
-int _zp_unicast_stop_read_task(_z_transport_t *zt) {
+int8_t _zp_unicast_stop_read_task(_z_transport_t *zt) {
     zt->_transport._unicast._read_task_running = false;
     return _Z_RES_OK;
 }