diff --git a/BTCPayServer/Controllers/UIHomeController.cs b/BTCPayServer/Controllers/UIHomeController.cs
index afc7e5e3d..ad2e0bccf 100644
--- a/BTCPayServer/Controllers/UIHomeController.cs
+++ b/BTCPayServer/Controllers/UIHomeController.cs
@@ -135,6 +135,12 @@ namespace BTCPayServer.Controllers
             var servers = new JArray();
             servers.Add(new JObject(new JProperty("url", HttpContext.Request.GetAbsoluteRoot())));
             json["servers"] = servers;
+            var tags = (JArray)json["tags"];
+            json["tags"] = new JArray(tags
+                .Select(o => (name: ((JObject)o)["name"].Value<string>(), o))
+                .OrderBy(o => o.name)
+                .Select(o => o.o)
+                .ToArray());
             return Json(json);
         }
         [Route("docs")]
diff --git a/BTCPayServer/wwwroot/swagger/v1/swagger.template.authorization.json b/BTCPayServer/wwwroot/swagger/v1/swagger.template.authorization.json
index c072abce8..e969c2d26 100644
--- a/BTCPayServer/wwwroot/swagger/v1/swagger.template.authorization.json
+++ b/BTCPayServer/wwwroot/swagger/v1/swagger.template.authorization.json
@@ -92,5 +92,10 @@
                 "security": []
             }
         }
-    }
+    },
+    "tags": [
+        {
+            "name": "Authorization"
+        }
+    ]
 }
diff --git a/BTCPayServer/wwwroot/swagger/v1/swagger.template.pull-payments.json b/BTCPayServer/wwwroot/swagger/v1/swagger.template.pull-payments.json
index 97f7f772e..5cd05a367 100644
--- a/BTCPayServer/wwwroot/swagger/v1/swagger.template.pull-payments.json
+++ b/BTCPayServer/wwwroot/swagger/v1/swagger.template.pull-payments.json
@@ -554,7 +554,7 @@
             },
             "CreatePayoutRequest": {
                 "type": "object",
-                "properties":{
+                "properties": {
                     "destination": {
                         "type": "string",
                         "example": "1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2",
@@ -571,7 +571,7 @@
                         "example": "BTC",
                         "description": "The payment method of the payout"
                     }
-                }                
+                }
             },
             "PayoutData": {
                 "type": "object",
@@ -689,5 +689,16 @@
                 }
             }
         }
-    }
+    },
+    "tags": [
+        {
+            "name": "Pull payments (Management)"
+        },
+        {
+            "name": "Pull payments (Public)"
+        },
+        {
+            "name": "Pull payments payout (Public)"
+        }
+    ]
 }
diff --git a/BTCPayServer/wwwroot/swagger/v1/swagger.template.stores-payment-methods.lnurl.json b/BTCPayServer/wwwroot/swagger/v1/swagger.template.stores-payment-methods.lnurl.json
index b808b2f71..dff41b723 100644
--- a/BTCPayServer/wwwroot/swagger/v1/swagger.template.stores-payment-methods.lnurl.json
+++ b/BTCPayServer/wwwroot/swagger/v1/swagger.template.stores-payment-methods.lnurl.json
@@ -3,7 +3,7 @@
         "/api/v1/stores/{storeId}/payment-methods/LNURL": {
             "get": {
                 "tags": [
-                    "Store Payment Methods (LNURL)"
+                    "Store Payment Methods (LNURL Pay)"
                 ],
                 "summary": "Get store LNURL payment methods",
                 "parameters": [