diff --git a/include/zenoh-pico/config.h b/include/zenoh-pico/config.h
index 1d22d110b..6b23cc350 100644
--- a/include/zenoh-pico/config.h
+++ b/include/zenoh-pico/config.h
@@ -18,7 +18,7 @@
 /*--- CMake generated config; pass values to CMake to change the following tokens ---*/
 #define Z_FRAG_MAX_SIZE 4096
 #define Z_BATCH_UNICAST_SIZE 2048
-#define Z_BATCH_MULTICAST_SIZE 2048
+#define Z_BATCH_MULTICAST_SIZE 8192
 #define Z_CONFIG_SOCKET_TIMEOUT 100
 
 /* #undef Z_FEATURE_UNSTABLE_API */
@@ -27,7 +27,7 @@
 #define Z_FEATURE_SUBSCRIPTION 1
 #define Z_FEATURE_QUERY 1
 #define Z_FEATURE_QUERYABLE 1
-#define Z_FEATURE_LIVELINESS 0
+#define Z_FEATURE_LIVELINESS 1
 #define Z_FEATURE_RAWETH_TRANSPORT 0
 #define Z_FEATURE_INTEREST 1
 #define Z_FEATURE_DYNAMIC_MEMORY_ALLOCATION 0
diff --git a/src/system/rpi_pico/system.c b/src/system/rpi_pico/system.c
index 26f3b011a..c3b323483 100644
--- a/src/system/rpi_pico/system.c
+++ b/src/system/rpi_pico/system.c
@@ -72,7 +72,7 @@ static void z_task_wrapper(void *arg) {
 static z_task_attr_t z_default_task_attr = {
     .name = "",
     .priority = configMAX_PRIORITIES / 2,
-    .stack_depth = 5120,
+    .stack_depth = 1024,
 };
 
 /*------------------ Thread ------------------*/