diff --git a/plugins/zenoh-plugin-storage-manager/src/lib.rs b/plugins/zenoh-plugin-storage-manager/src/lib.rs
index 139d1d258a..6732bbe4f6 100644
--- a/plugins/zenoh-plugin-storage-manager/src/lib.rs
+++ b/plugins/zenoh-plugin-storage-manager/src/lib.rs
@@ -289,6 +289,7 @@ impl RunningPluginTrait for StorageRuntime {
     ) -> ZResult<Vec<zenoh::plugins::Response>> {
         let mut responses = Vec::new();
         let mut key = String::from(plugin_status_key);
+        // TODO: to be removed when "__version__" is implemented in admin space
         with_extended_string(&mut key, &["/version"], |key| {
             if keyexpr::new(key.as_str())
                 .unwrap()
diff --git a/zenoh/src/net/runtime/adminspace.rs b/zenoh/src/net/runtime/adminspace.rs
index a2b9d714ce..d8b25c2c6d 100644
--- a/zenoh/src/net/runtime/adminspace.rs
+++ b/zenoh/src/net/runtime/adminspace.rs
@@ -683,6 +683,7 @@ fn plugins_status(context: &AdminContext, query: Query) {
 
     for plugin in guard.started_plugins() {
         with_extended_string(&mut root_key, &[plugin.name()], |plugin_key| {
+            // TODO: reqponse to "__version__" also, this need noot to be implemented by each plugin
             with_extended_string(plugin_key, &["/__path__"], |plugin_path_key| {
                 if let Ok(key_expr) = KeyExpr::try_from(plugin_path_key.clone()) {
                     if query.key_expr().intersects(&key_expr) {