diff --git a/components/bt/bluedroid/api/include/esp_gatt_defs.h b/components/bt/bluedroid/api/include/esp_gatt_defs.h
index 9ebe464e2..931733e40 100644
--- a/components/bt/bluedroid/api/include/esp_gatt_defs.h
+++ b/components/bt/bluedroid/api/include/esp_gatt_defs.h
@@ -24,9 +24,9 @@ extern "C" {
 /// GATT INVALID UUID
 #define ESP_GATT_ILLEGAL_UUID                0
 
-/**
- * @brief GATT attribute types
-*/
+/**@{
+ * All "ESP_GATT_UUID_xxx" is attribute types
+ */
 #define ESP_GATT_UUID_PRI_SERVICE            0x2800
 #define ESP_GATT_UUID_SEC_SERVICE            0x2801
 #define ESP_GATT_UUID_INCLUDE_SERVICE        0x2802
@@ -114,6 +114,9 @@ extern "C" {
 /* Scan ESP_Parameter characteristics */
 #define ESP_GATT_UUID_SCAN_INT_WINDOW        0x2A4F
 #define ESP_GATT_UUID_SCAN_REFRESH           0x2A31
+/**
+ * @}
+ */
 
 /// Attribute write data type from the client
 typedef enum {
diff --git a/docs/api/esp_gatt_defs.rst b/docs/api/esp_gatt_defs.rst
index a4cfe918c..b5a416d43 100644
--- a/docs/api/esp_gatt_defs.rst
+++ b/docs/api/esp_gatt_defs.rst
@@ -25,7 +25,65 @@ Header Files
 
 Macros
 ^^^^^^
-
+.. doxygendefine:: ESP_GATT_UUID_PRI_SERVICE
+.. doxygendefine:: ESP_GATT_UUID_SEC_SERVICE
+.. doxygendefine:: ESP_GATT_UUID_INCLUDE_SERVICE
+.. doxygendefine:: ESP_GATT_UUID_CHAR_DECLARE
+.. doxygendefine:: ESP_GATT_UUID_CHAR_EXT_PROP
+.. doxygendefine:: ESP_GATT_UUID_CHAR_DESCRIPTION
+.. doxygendefine:: ESP_GATT_UUID_CHAR_CLIENT_CONFIG
+.. doxygendefine:: ESP_GATT_UUID_CHAR_SRVR_CONFIG
+.. doxygendefine:: ESP_GATT_UUID_CHAR_PRESENT_FORMAT
+.. doxygendefine:: ESP_GATT_UUID_CHAR_AGG_FORMAT
+.. doxygendefine:: ESP_GATT_UUID_CHAR_VALID_RANGE
+.. doxygendefine:: ESP_GATT_UUID_EXT_RPT_REF_DESCR
+.. doxygendefine:: ESP_GATT_UUID_RPT_REF_DESCR
+.. doxygendefine:: ESP_GATT_UUID_GAP_DEVICE_NAME
+.. doxygendefine:: ESP_GATT_UUID_GAP_ICON
+.. doxygendefine:: ESP_GATT_UUID_GAP_PREF_CONN_PARAM
+.. doxygendefine:: ESP_GATT_UUID_GAP_CENTRAL_ADDR_RESOL
+.. doxygendefine:: ESP_GATT_UUID_GATT_SRV_CHGD
+.. doxygendefine:: ESP_GATT_UUID_ALERT_LEVEL
+.. doxygendefine:: ESP_GATT_UUID_TX_POWER_LEVEL
+.. doxygendefine:: ESP_GATT_UUID_CURRENT_TIME
+.. doxygendefine:: ESP_GATT_UUID_LOCAL_TIME_INFO
+.. doxygendefine:: ESP_GATT_UUID_REF_TIME_INFO
+.. doxygendefine:: ESP_GATT_UUID_NW_STATUS
+.. doxygendefine:: ESP_GATT_UUID_NW_TRIGGER
+.. doxygendefine:: ESP_GATT_UUID_ALERT_STATUS
+.. doxygendefine:: ESP_GATT_UUID_RINGER_CP
+.. doxygendefine:: ESP_GATT_UUID_RINGER_SETTING
+.. doxygendefine:: ESP_GATT_UUID_GM_MEASUREMENT
+.. doxygendefine:: ESP_GATT_UUID_GM_CONTEXT
+.. doxygendefine:: ESP_GATT_UUID_GM_CONTROL_POINT
+.. doxygendefine:: ESP_GATT_UUID_GM_FEATURE
+.. doxygendefine:: ESP_GATT_UUID_SYSTEM_ID
+.. doxygendefine:: ESP_GATT_UUID_MODEL_NUMBER_STR
+.. doxygendefine:: ESP_GATT_UUID_SERIAL_NUMBER_STR
+.. doxygendefine:: ESP_GATT_UUID_FW_VERSION_STR
+.. doxygendefine:: ESP_GATT_UUID_HW_VERSION_STR
+.. doxygendefine:: ESP_GATT_UUID_SW_VERSION_STR
+.. doxygendefine:: ESP_GATT_UUID_MANU_NAME
+.. doxygendefine:: ESP_GATT_UUID_IEEE_DATA
+.. doxygendefine:: ESP_GATT_UUID_PNP_ID
+.. doxygendefine:: ESP_GATT_UUID_HID_INFORMATION
+.. doxygendefine:: ESP_GATT_UUID_HID_REPORT_MAP
+.. doxygendefine:: ESP_GATT_UUID_HID_CONTROL_POINT
+.. doxygendefine:: ESP_GATT_UUID_HID_REPORT
+.. doxygendefine:: ESP_GATT_UUID_HID_PROTO_MODE
+.. doxygendefine:: ESP_GATT_UUID_HID_BT_KB_INPUT
+.. doxygendefine:: ESP_GATT_UUID_HID_BT_KB_OUTPUT
+.. doxygendefine:: ESP_GATT_UUID_HID_BT_MOUSE_INPUT
+.. doxygendefine:: ESP_GATT_UUID_BATTERY_LEVEL
+.. doxygendefine:: ESP_GATT_UUID_SC_CONTROL_POINT
+.. doxygendefine:: ESP_GATT_UUID_SENSOR_LOCATION
+.. doxygendefine:: ESP_GATT_UUID_RSC_MEASUREMENT
+.. doxygendefine:: ESP_GATT_UUID_RSC_FEATURE
+.. doxygendefine:: ESP_GATT_UUID_CSC_MEASUREMENT
+.. doxygendefine:: ESP_GATT_UUID_CSC_FEATURE
+.. doxygendefine:: ESP_GATT_UUID_SCAN_INT_WINDOW
+.. doxygendefine:: ESP_GATT_UUID_SCAN_REFRESH
+.. doxygendefine:: ESP_GATT_ILLEGAL_UUID
 .. doxygendefine:: ESP_GATT_MAX_ATTR_LEN
 
 Type Definitions