diff --git a/docs/content/developer/iota-identity/contact.mdx b/docs/content/developer/iota-identity/contact.mdx
index 16b0d853bd6..d5e81e6dd05 100644
--- a/docs/content/developer/iota-identity/contact.mdx
+++ b/docs/content/developer/iota-identity/contact.mdx
@@ -3,10 +3,6 @@ title: Contact
 sidebar_label: Contact
 description: Get in touch with the project maintainers.
 image: /img/identity/icon.png
-tags:
-  - Contact
-  - GitHub
-  - Maintainers
 ---
 
 If you found a security related issue, please follow the [responsible disclosure policy](https://github.com/iotaledger/identity.rs/security/policy).
diff --git a/docs/content/developer/iota-identity/contribute.mdx b/docs/content/developer/iota-identity/contribute.mdx
index 13f88b51ede..b809304e7f3 100644
--- a/docs/content/developer/iota-identity/contribute.mdx
+++ b/docs/content/developer/iota-identity/contribute.mdx
@@ -4,12 +4,7 @@ sidebar_label: Contribute
 description: Contribute to IOTA Identity by joining the Identity initiative, via the projects GitHub repository, documentation, or sharing your knowledge.
 image: /img/identity/icon.png
 tags:
-- Contribute
-- GitHub
-- Identity Initiative
-- Documentation
-- Discord
-- reference
+  - reference
 ---
 
 **Thanks for thinking about contributing to the project! You can contribute using the following ways.**
diff --git a/docs/content/developer/iota-identity/explanations/about-alias-outputs.mdx b/docs/content/developer/iota-identity/explanations/about-alias-outputs.mdx
index 6634a7520d9..7e2ed850226 100644
--- a/docs/content/developer/iota-identity/explanations/about-alias-outputs.mdx
+++ b/docs/content/developer/iota-identity/explanations/about-alias-outputs.mdx
@@ -3,12 +3,9 @@ title: Alias Outputs
 description: UTXO Alias Output
 image: /img/identity/icon.png
 tags:
-  - public keys
-  - utxo
-  - Method Specification
-  - Decentralized Identifiers
-  - overview
-  - DLT
+  - explanation
+  - did
+  - getting-started
 ---
 
 # Alias Outputs
diff --git a/docs/content/developer/iota-identity/explanations/decentralized-identifiers.mdx b/docs/content/developer/iota-identity/explanations/decentralized-identifiers.mdx
index 6145ebcc304..d4d51c03c9d 100644
--- a/docs/content/developer/iota-identity/explanations/decentralized-identifiers.mdx
+++ b/docs/content/developer/iota-identity/explanations/decentralized-identifiers.mdx
@@ -2,11 +2,11 @@
 description: The Decentralized Identifiers (DID) standard from W3C is the fundamental standard that supports the concept of a decentralized digital identity. Explore the basic aspects of the DID standard.
 image: /img/identity/icon.png
 tags:
-    - public keys
-    - Method Specification
-    - Decentralized Identifiers
-    - overview
-    - DLT
+    - explanation
+    - did
+    - getting-started
+    - verification-method
+    - verifiable-credentials
 ---
 
 # Decentralized Identifiers (DID)
diff --git a/docs/content/developer/iota-identity/explanations/verifiable-credentials.mdx b/docs/content/developer/iota-identity/explanations/verifiable-credentials.mdx
index 412f4ae505f..4b6bfdcf1b5 100644
--- a/docs/content/developer/iota-identity/explanations/verifiable-credentials.mdx
+++ b/docs/content/developer/iota-identity/explanations/verifiable-credentials.mdx
@@ -2,9 +2,8 @@
 description: Verifiable credentials are statements about the holder. They can be verified online or in person, and the holder decides who to share them with.
 image: /img/identity/icon.png
 tags:
-  - verifiable
-  - credentials
-  - person
+  - explanation
+  - verifiable-credentials
 ---
 # Verifiable Credentials
 
diff --git a/docs/content/developer/iota-identity/faq.mdx b/docs/content/developer/iota-identity/faq.mdx
index 0219f4e5550..c1d6745ae72 100644
--- a/docs/content/developer/iota-identity/faq.mdx
+++ b/docs/content/developer/iota-identity/faq.mdx
@@ -3,11 +3,6 @@ title: Frequently Asked Questions
 sidebar_label: FAQ
 description: Frequently Asked Question regarding IOTA Identity.
 image: /img/identity/icon.png
-tags:
-  - FAQ
-  - Frequently Asked Question
-  - Troubleshooting
-  - IOTA Identity
 ---
 
 This page contains frequently asked questions regarding the Identity Library and Self-Sovereign Identity in general.
diff --git a/docs/content/developer/iota-identity/getting-started/rust.mdx b/docs/content/developer/iota-identity/getting-started/rust.mdx
index 27e8035717b..c193c592c90 100644
--- a/docs/content/developer/iota-identity/getting-started/rust.mdx
+++ b/docs/content/developer/iota-identity/getting-started/rust.mdx
@@ -3,8 +3,10 @@ sidebar_label: Rust
 description: Getting started with the IOTA Identity Rust Library.
 image: /img/identity/icon.png
 tags:
-  - Rust
-  - Identity
+  - rust
+  - setup
+  - install
+  - getting-started
 ---
 # Getting Started with Rust
 
diff --git a/docs/content/developer/iota-identity/getting-started/wasm.mdx b/docs/content/developer/iota-identity/getting-started/wasm.mdx
index ec5cb468188..39f7a60f569 100644
--- a/docs/content/developer/iota-identity/getting-started/wasm.mdx
+++ b/docs/content/developer/iota-identity/getting-started/wasm.mdx
@@ -3,13 +3,10 @@ sidebar_label: Wasm
 description: Getting started with the IOTA Identity WASM Library.
 image: /img/identity/icon.png
 tags:
-    - WASM
+    - wasm
+    - setup
     - install
-    - npm
-    - yarn
-    - build
-    - nodejs
-    - webpack
+    - getting-started
 ---
 
 # Getting Started with Wasm
diff --git a/docs/content/developer/iota-identity/glossary.mdx b/docs/content/developer/iota-identity/glossary.mdx
index 88412c15e2a..c72fcb01b8f 100644
--- a/docs/content/developer/iota-identity/glossary.mdx
+++ b/docs/content/developer/iota-identity/glossary.mdx
@@ -2,11 +2,7 @@
 description: Glossary for IOTA Identity, defines the terms used in this specification and throughout decentralized identifier infrastructure.
 image: /img/identity/icon.png
 tags:
-  - W3C
-  - terminology
-  - IOTA
-  - verification method
-  - verifiable data registry
+  - verification-method
   - reference
 ---
 
diff --git a/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/create.mdx b/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/create.mdx
index 5e7a6ca86c3..0a99fde6b7b 100644
--- a/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/create.mdx
+++ b/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/create.mdx
@@ -4,11 +4,8 @@ sidebar_label: Create and Publish
 description: Create DID Documents and publish them to the Tangle
 image: /img/identity/icon.png
 tags:
-    - Documents
-    - DID
-    - Tangle
-    - Create
-    - Publish
+    - how-to
+    - did
 ---
 
 import Tabs from '@theme/Tabs';
diff --git a/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/delete.mdx b/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/delete.mdx
index c0233d65460..8995c9177bb 100644
--- a/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/delete.mdx
+++ b/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/delete.mdx
@@ -4,9 +4,8 @@ sidebar_label: Delete
 description: How to deactivate or destroy an IOTA Identity
 image: /img/identity/icon.png
 tags:
-    - Delete
-    - Deactivate
-    - Destroy
+    - how-to
+    - did
 ---
 
 import Tabs from '@theme/Tabs';
diff --git a/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/resolve.mdx b/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/resolve.mdx
index 18a0d0f39bd..748604bc273 100644
--- a/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/resolve.mdx
+++ b/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/resolve.mdx
@@ -4,7 +4,8 @@ sidebar_label: Resolve
 description: Explain how resolving works including arguments
 image: /img/identity/icon.png
 tags:
-    - Resolve
+    - how-to
+    - did
 ---
 
 import Tabs from '@theme/Tabs';
diff --git a/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/update.mdx b/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/update.mdx
index 0ab3ada4cda..b73577d7bed 100644
--- a/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/update.mdx
+++ b/docs/content/developer/iota-identity/how-tos/decentralized-identifiers/update.mdx
@@ -3,11 +3,8 @@ sidebar_label: Update
 description: How DID Documents can be manipulated and how updates should be published
 image: /img/identity/icon.png
 tags:
-    - Documents
-    - DID
-    - Tangle
-    - Update
-    - Publish
+    - how-to
+    - did
 ---
 
 import Tabs from '@theme/Tabs';
diff --git a/docs/content/developer/iota-identity/how-tos/domain-linkage/create-and-verify.mdx b/docs/content/developer/iota-identity/how-tos/domain-linkage/create-and-verify.mdx
index 648cbc890cc..b0270f831a6 100644
--- a/docs/content/developer/iota-identity/how-tos/domain-linkage/create-and-verify.mdx
+++ b/docs/content/developer/iota-identity/how-tos/domain-linkage/create-and-verify.mdx
@@ -3,10 +3,7 @@ description: How to link a domain and a DID
 sidebar_label: Create and Verify
 image: /img/identity/icon.png
 tags:
-  - well-known
-  - domain linkage
-  - DID Configuration Resource
-  - Domain Linkage Credential
+  - how-to
 ---
 
 import Tabs from '@theme/Tabs';
diff --git a/docs/content/developer/iota-identity/how-tos/key-storage.mdx b/docs/content/developer/iota-identity/how-tos/key-storage.mdx
index 5665b518bdc..196eb00f1de 100644
--- a/docs/content/developer/iota-identity/how-tos/key-storage.mdx
+++ b/docs/content/developer/iota-identity/how-tos/key-storage.mdx
@@ -4,11 +4,7 @@ sidebar_label: Key Storage
 description: Explain the use of the storage interfaces and how they can be implemented
 image: /img/identity/icon.png
 tags:
-  - key storage
-  - storage interfaces
-  - json web key
-  - json web algorithm
-  - signing
+  - how-to
 ---
 
 import Tabs from '@theme/Tabs';
diff --git a/docs/content/developer/iota-identity/how-tos/verifiable-credentials/create.mdx b/docs/content/developer/iota-identity/how-tos/verifiable-credentials/create.mdx
index ffb4b02ebbb..797607a4311 100644
--- a/docs/content/developer/iota-identity/how-tos/verifiable-credentials/create.mdx
+++ b/docs/content/developer/iota-identity/how-tos/verifiable-credentials/create.mdx
@@ -4,10 +4,8 @@ sidebar_label: Create and Sign
 description: Explain how a VC is created and verified
 image: /img/identity/icon.png
 tags:
-  - verifiable
-  - credentials
-  - Create
-  - sign
+  - how-to
+  - verifiable-credentials
 ---
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
diff --git a/docs/content/developer/iota-identity/how-tos/verifiable-credentials/revocation.mdx b/docs/content/developer/iota-identity/how-tos/verifiable-credentials/revocation.mdx
index 4c74380a4fb..f4a1ab7f2ab 100644
--- a/docs/content/developer/iota-identity/how-tos/verifiable-credentials/revocation.mdx
+++ b/docs/content/developer/iota-identity/how-tos/verifiable-credentials/revocation.mdx
@@ -3,10 +3,8 @@ sidebar_label: Revoke
 description: Explain how a VC can be revoked
 image: /img/identity/icon.png
 tags:
-    - verifiable
-    - credentials
-    - revoke
-    - revocation
+    - how-to
+    - verifiable-credentials
 ---
 
 import Tabs from '@theme/Tabs';
diff --git a/docs/content/developer/iota-identity/how-tos/verifiable-credentials/selective-disclosure.mdx b/docs/content/developer/iota-identity/how-tos/verifiable-credentials/selective-disclosure.mdx
index 349c2be99dd..489f269909e 100644
--- a/docs/content/developer/iota-identity/how-tos/verifiable-credentials/selective-disclosure.mdx
+++ b/docs/content/developer/iota-identity/how-tos/verifiable-credentials/selective-disclosure.mdx
@@ -3,10 +3,8 @@ sidebar_label: Selective Disclosure
 description: Explain VC with selective disclosure.
 image: /img/identity/icon.png
 tags:
-  - verifiable
-  - credentials
-  - SD-JWT
-  - Disclosure
+  - how-to
+  - verifiable-credentials
 ---
 
 import Tabs from '@theme/Tabs';
diff --git a/docs/content/developer/iota-identity/how-tos/verifiable-credentials/zero-knowledge-selective-disclosure.mdx b/docs/content/developer/iota-identity/how-tos/verifiable-credentials/zero-knowledge-selective-disclosure.mdx
index f165b800818..25058f3db1e 100644
--- a/docs/content/developer/iota-identity/how-tos/verifiable-credentials/zero-knowledge-selective-disclosure.mdx
+++ b/docs/content/developer/iota-identity/how-tos/verifiable-credentials/zero-knowledge-selective-disclosure.mdx
@@ -3,10 +3,8 @@ sidebar_label: Zero Knowledge Selective Disclosure
 description: Zero Knowledge selectively disclosable VCs.
 image: /img/identity/icon.png
 tags:
-  - verifiable
-  - credentials
-  - Zero Knowledge
-  - Disclosure
+  - verifiable-credentials
+  - zk
 ---
 
 import Tabs from '@theme/Tabs';
diff --git a/docs/content/developer/iota-identity/how-tos/verifiable-presentations/create-and-validate.mdx b/docs/content/developer/iota-identity/how-tos/verifiable-presentations/create-and-validate.mdx
index 2f5c28d5d5b..682de1fb05e 100644
--- a/docs/content/developer/iota-identity/how-tos/verifiable-presentations/create-and-validate.mdx
+++ b/docs/content/developer/iota-identity/how-tos/verifiable-presentations/create-and-validate.mdx
@@ -3,8 +3,7 @@ sidebar_label: Create and Validate
 description: Explain how a VP is created and verified
 image: /img/identity/icon.png
 tags:
-  - verifiable
-  - presentations
+  - how-to
 ---
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
diff --git a/docs/content/developer/iota-identity/welcome.mdx b/docs/content/developer/iota-identity/welcome.mdx
index 93c86a37cd5..e9dc6ba8486 100644
--- a/docs/content/developer/iota-identity/welcome.mdx
+++ b/docs/content/developer/iota-identity/welcome.mdx
@@ -2,10 +2,6 @@
 description: The most important concepts that developers will need to know to utilize IOTA Identity to its full potential.
 image: /img/identity/icon.png
 tags:
-  - Identity
-  - guide
-  - TOC
-  - overview
   - reference
 ---
 # IOTA Identity Framework
diff --git a/docs/content/developer/iota-identity/workflow.mdx b/docs/content/developer/iota-identity/workflow.mdx
index 5a8e4ee9f4b..d93cd749b3c 100644
--- a/docs/content/developer/iota-identity/workflow.mdx
+++ b/docs/content/developer/iota-identity/workflow.mdx
@@ -3,11 +3,6 @@ title: Identity.rs workflow
 sidebar_label: Workflow
 description: Learn about the software development process of the IOTA Identity repository.
 image: /img/identity/icon.png
-tags:
-  - Workflow
-  - Contribute
-  - GitHub
-  - explanation
 ---
 
 # Identity Workflow
diff --git a/docs/content/references/iota-identity/iota-did-method-spec.mdx b/docs/content/references/iota-identity/iota-did-method-spec.mdx
index 193fd6328bc..fd21347cd95 100644
--- a/docs/content/references/iota-identity/iota-did-method-spec.mdx
+++ b/docs/content/references/iota-identity/iota-did-method-spec.mdx
@@ -4,12 +4,8 @@ sidebar_label: DID Method
 description: How IOTA Identity implements the Decentralized Identifiers Standard on the IOTA Tangle.
 image: /img/identity/icon.png
 tags:
-  - DID
-  - specs
-  - specifications
-  - Decentralized Identifiers
-  - Tangle
-  - format
+  - reference
+  - did
 ---
 
 # IOTA DID Method Specification v1.0
diff --git a/docs/content/references/iota-identity/overview.mdx b/docs/content/references/iota-identity/overview.mdx
index b806686fcf6..a596ec64c79 100644
--- a/docs/content/references/iota-identity/overview.mdx
+++ b/docs/content/references/iota-identity/overview.mdx
@@ -4,7 +4,7 @@ sidebar_label: Overview
 description: Provide overview of the specifications
 image: /img/identity/icon.png
 tags:
-  - specifications
+  - reference
 ---
 
 While IOTA Identity implements many existing standards, it also adds some additional features we would like to standardize ourselves. This section covers these features and how they work in great detail. These are not light reads and can be skipped.
diff --git a/docs/content/references/iota-identity/revocation-bitmap-2022.mdx b/docs/content/references/iota-identity/revocation-bitmap-2022.mdx
index 3e7461b9b72..d3b2a0df60b 100644
--- a/docs/content/references/iota-identity/revocation-bitmap-2022.mdx
+++ b/docs/content/references/iota-identity/revocation-bitmap-2022.mdx
@@ -4,11 +4,8 @@ sidebar_label: Revocation Bitmap
 description: The specification for the embedded revocation bitmap.
 image: /img/identity/icon.png
 tags:
-  - DID
-  - specs
-  - specifications
-  - revocation
-  - bitmap
+  - reference
+  - did
 ---
 
 # Revocation Bitmap 2022
diff --git a/docs/content/references/iota-identity/revocation-timeframe-2024.mdx b/docs/content/references/iota-identity/revocation-timeframe-2024.mdx
index 8a58bb3ab88..a894c164d96 100644
--- a/docs/content/references/iota-identity/revocation-timeframe-2024.mdx
+++ b/docs/content/references/iota-identity/revocation-timeframe-2024.mdx
@@ -4,11 +4,8 @@ sidebar_label: Revocation Timeframe 2024
 description: The specification for an embeddable time-based revocation method - `RevocationTimeframe2024`.
 image: /img/identity/icon.png
 tags:
-  - DID
-  - specs
-  - specifications
-  - revocation
-  - bitmap
+  - reference
+  - did
 ---
 
 # Revocation Timeframe 2024
diff --git a/docs/content/references/iota-identity/wasm.md b/docs/content/references/iota-identity/wasm.md
index 90194b6f5b6..f3a87cfc978 100644
--- a/docs/content/references/iota-identity/wasm.md
+++ b/docs/content/references/iota-identity/wasm.md
@@ -3,8 +3,9 @@ title: WASM API Reference
 description: WASM API reference.
 image: /img/identity/icon.png
 tags:
-  - WASM
-  - API Reference
+  - reference
+  - wasm
+  - api
 ---
 
 # Wasm Api Reference
diff --git a/docs/content/tags.yml b/docs/content/tags.yml
index 0c178717ed7..af49b1959cc 100644
--- a/docs/content/tags.yml
+++ b/docs/content/tags.yml
@@ -40,6 +40,10 @@ typescript:
   label: TypeScript
   description: TypeScript programming language.
 
+wasm:
+  label: WASM
+  description: WebAssembly programming language.
+
 # VMs
 evm:
   label: EVM
@@ -70,6 +74,10 @@ access-node:
 pruning:
   label: Pruning
 
+rest-api:
+  label: REST API
+  description: Representational State Transfer API.
+
 rpc:
   label: RPC
   description: Remote Procedure Call.
@@ -81,6 +89,23 @@ validator:
   label: Validator
   description: Node that validates transactions.
 
+# Identity
+did:
+  label: DID
+  description: Decentralized Identifier.
+
+verifiable-credentials:
+  label: Verifiable Credentials
+  description: Verifiable Credentials.
+
+verification-method:
+  label: Verification Method
+  description: Verification Method.
+
+zk:
+  label: Zero-Knowledge
+  description: Zero-Knowledge.
+
 # ISC
 allowance:
   label: Allowance
@@ -146,6 +171,10 @@ address:
   label: Address
   description: Identifier for a wallet.
 
+api:
+  label: API
+  description: Application Programming Interface.
+
 balance:
   label: Balance
   description: Amount of tokens.