diff --git a/include/zephyr/net/net_mgmt.h b/include/zephyr/net/net_mgmt.h
index fe3ee7f946d..7b279c07837 100644
--- a/include/zephyr/net/net_mgmt.h
+++ b/include/zephyr/net/net_mgmt.h
@@ -236,7 +236,7 @@ struct net_mgmt_event_static_handler {
  * @brief Helper to initialize a struct net_mgmt_event_callback properly
  * @param cb A valid application's callback structure pointer.
  * @param handler A valid handler function pointer.
- * @param mgmt_event_mask A mask of relevant events for the handler
+ * @param mgmt_event_mask A mask of relevant events for the handler. Ensure all events share a layer code.
  */
 #ifdef CONFIG_NET_MGMT_EVENT
 static inline
diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index 4fdc144d435..5aec0cfccf7 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -1146,12 +1146,17 @@ static void handler(void)
 #endif
 
 	ctx = get_default_context();
+	struct k_work_queue_config wq_cfg = {
+		.name = "wpa_supplicant_wq",
+		.no_yield = false,
+		.essential = false
+	};
 
 	k_work_queue_init(&ctx->iface_wq);
 	k_work_queue_start(&ctx->iface_wq, iface_wq_stack,
 			   K_THREAD_STACK_SIZEOF(iface_wq_stack),
 			   CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO,
-			   NULL);
+			   &wq_cfg);
 
 	k_work_init(&ctx->iface_work, iface_work_handler);
 
@@ -1214,6 +1219,7 @@ static int init(void)
 			K_THREAD_STACK_SIZEOF(supplicant_thread_stack),
 			(k_thread_entry_t)handler, NULL, NULL, NULL,
 			CONFIG_WIFI_NM_WPA_SUPPLICANT_PRIO, 0, K_NO_WAIT);
+	k_thread_name_set(&tid, "wpa_supplicant");
 
 	return 0;
 }