diff --git a/include/zephyr/sys/mpsc_pbuf.h b/include/zephyr/sys/mpsc_pbuf.h
index a80cc2db464642..72f6e99515b89e 100644
--- a/include/zephyr/sys/mpsc_pbuf.h
+++ b/include/zephyr/sys/mpsc_pbuf.h
@@ -19,7 +19,7 @@ extern "C" {
 /**
  * @brief Multi producer, single consumer packet buffer API
  * @defgroup mpsc_buf MPSC (Multi producer, single consumer) packet buffer API
- * @ingroup kernel_apis
+ * @ingroup datastructure_apis
  * @{
  */
 
diff --git a/include/zephyr/sys/spsc_pbuf.h b/include/zephyr/sys/spsc_pbuf.h
index 682d610e34b4fe..0e7f018fa63ccc 100644
--- a/include/zephyr/sys/spsc_pbuf.h
+++ b/include/zephyr/sys/spsc_pbuf.h
@@ -16,11 +16,12 @@ extern "C" {
 
 /**
  * @brief Single producer, single consumer packet buffer API
- * @ingroup kernel_apis
+ * @defgroup spsc_buf SPSC (Single producer, single consumer) packet buffer API
+ * @ingroup datastructure_apis
  * @{
  */
 
-/**@defgroup SPSC_PBUF_FLAGS MPSC packet buffer flags
+/**@defgroup SPSC_PBUF_FLAGS SPSC packet buffer flags
  * @{
  */