diff --git a/openapi.yaml b/openapi.yaml
index f97c3d8df..3d3794c6a 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -8,8 +8,7 @@ paths:
   /v2/_info:
     get:
       tags:
-        - Ledger
-        - Server
+        - Ledger.V2
       summary: Show server information
       operationId: getInfo
       responses:
@@ -31,7 +30,7 @@ paths:
       summary: Get information about a ledger
       operationId: getLedgerInfo
       tags:
-        - Ledger
+        - Ledger.V2
       parameters:
         - name: ledger
           in: path
@@ -59,7 +58,7 @@ paths:
       summary: Bulk request
       operationId: createBulk
       tags:
-      - Ledger
+      - Ledger.V2
       parameters:
       - name: ledger
         in: path
@@ -98,8 +97,7 @@ paths:
       summary: Count the accounts from a ledger
       operationId: countAccounts
       tags:
-        - Ledger
-        - Accounts
+        - Ledger.V2
       parameters:
         - name: ledger
           in: path
@@ -141,8 +139,7 @@ paths:
       description: List accounts from a ledger, sorted by address in descending order.
       operationId: listAccounts
       tags:
-        - Ledger
-        - Accounts
+        - Ledger.V2
       parameters:
         - name: ledger
           in: path
@@ -208,8 +205,7 @@ paths:
       summary: Get account by its address
       operationId: getAccount
       tags:
-        - Ledger
-        - Accounts
+        - Ledger.V2
       parameters:
         - name: ledger
           in: path
@@ -260,8 +256,7 @@ paths:
       summary: Add metadata to an account
       operationId: addMetadataToAccount
       tags:
-        - Ledger
-        - Accounts
+        - Ledger.V2
       parameters:
         - name: ledger
           in: path
@@ -315,8 +310,7 @@ paths:
       description: Delete metadata by key
       operationId: deleteAccountMetadata
       tags:
-        - Ledger
-        - Transactions
+        - Ledger.V2
       summary: Delete metadata by key
       parameters:
         - name: ledger
@@ -347,8 +341,7 @@ paths:
   /v2/{ledger}/stats:
     get:
       tags:
-        - Ledger
-        - Stats
+        - Ledger.V2
       operationId: readStats
       summary: Get statistics from a ledger
       description: |
@@ -378,8 +371,7 @@ paths:
   /v2/{ledger}/transactions:
     head:
       tags:
-        - Ledger
-        - Transactions
+        - Ledger.V2
       summary: Count the transactions from a ledger
       operationId: countTransactions
       parameters:
@@ -420,8 +412,7 @@ paths:
 
     get:
       tags:
-        - Ledger
-        - Transactions
+        - Ledger.V2
       summary: List transactions from a ledger
       description: List transactions from a ledger, sorted by id in descending order.
       operationId: listTransactions
@@ -487,8 +478,7 @@ paths:
 
     post:
       tags:
-        - Ledger
-        - Transactions
+        - Ledger.V2
       summary: Create a new transaction to a ledger
       operationId: createTransaction
       parameters:
@@ -537,8 +527,7 @@ paths:
   /v2/{ledger}/transactions/{id}:
     get:
       tags:
-        - Ledger
-        - Transactions
+        - Ledger.V2
       summary: Get transaction from a ledger by its ID
       operationId: getTransaction
       parameters:
@@ -587,8 +576,7 @@ paths:
   /v2/{ledger}/transactions/{id}/metadata:
     post:
       tags:
-        - Ledger
-        - Transactions
+        - Ledger.V2
       summary: Set the metadata of a transaction by its ID
       operationId: addMetadataOnTransaction
       parameters:
@@ -642,8 +630,7 @@ paths:
       operationId: deleteTransactionMetadata
       summary: Delete metadata by key
       tags:
-        - Ledger
-        - Transactions
+        - Ledger.V2
       parameters:
         - name: ledger
           in: path
@@ -676,8 +663,7 @@ paths:
   /v2/{ledger}/transactions/{id}/revert:
     post:
       tags:
-        - Ledger
-        - Transactions
+        - Ledger.V2
       operationId: revertTransaction
       summary: Revert a ledger transaction by its ID
       parameters:
@@ -719,8 +705,7 @@ paths:
   /v2/{ledger}/aggregate/balances:
     get:
       tags:
-        - Ledger
-        - Balances
+        - Ledger.V2
       summary: Get the aggregated balances from selected accounts
       operationId: getBalancesAggregated
       parameters:
@@ -760,8 +745,7 @@ paths:
   /v2/{ledger}/logs:
     get:
       tags:
-        - Ledger
-        - Logs
+        - Ledger.V2
       summary: List the logs from a ledger
       description: List the logs from a ledger, sorted by ID in descending order.
       operationId: listLogs