diff --git a/docs/administration-console/azure-ad-sso-setup.md b/docs/administration-console/azure-ad-sso-setup.md
index 8ced2150..50251158 100644
--- a/docs/administration-console/azure-ad-sso-setup.md
+++ b/docs/administration-console/azure-ad-sso-setup.md
@@ -1,10 +1,12 @@
 ---
 tags:
   - cloud
+  - administration
   - authentication
   - sso
-  - azure
+  - azure-ad
   - configuration
+  - security
 title: "Microsoft Entra ID SSO Setup"
 description: "Complete guide to configuring single sign-on (SSO) for NetBox Cloud using Microsoft Entra ID (formerly Azure Active Directory) as an authentication backend."
 author: "NetBox Labs Documentation Team"
diff --git a/docs/administration-console/azure-group-mapping.md b/docs/administration-console/azure-group-mapping.md
index 7b102842..f9107bf0 100644
--- a/docs/administration-console/azure-group-mapping.md
+++ b/docs/administration-console/azure-group-mapping.md
@@ -1,10 +1,10 @@
 ---
 tags:
   - cloud
+  - administration
   - authentication
   - sso
-  - azure
-  - rbac
+  - azure-ad
   - configuration
 title: "Microsoft Entra ID Group Mapping"
 description: "Configure automatic group synchronization and role mapping between Microsoft Entra ID and NetBox Cloud for streamlined user access management."
diff --git a/docs/administration-console/console-access.md b/docs/administration-console/console-access.md
index 16232aeb..e103c454 100644
--- a/docs/administration-console/console-access.md
+++ b/docs/administration-console/console-access.md
@@ -4,6 +4,9 @@ tags:
   - administration
   - getting-started
   - authentication
+  - security
+  - configuration
+  - troubleshooting
 title: "NetBox Cloud Console Access"
 description: "How to access the NetBox Labs Console through direct URL or from within NetBox Cloud UI, including login options and account setup."
 author: "NetBox Labs Documentation Team"
diff --git a/docs/administration-console/console-administration.md b/docs/administration-console/console-administration.md
index 860a2c1b..f9c54677 100644
--- a/docs/administration-console/console-administration.md
+++ b/docs/administration-console/console-administration.md
@@ -2,8 +2,9 @@
 tags:
   - cloud
   - administration
-  - authentication
+  - configuration
   - security
+  - users
 title: "Console Administration"
 description: "Administrative tasks for the NetBox Labs Console, including managing administrator accounts, permissions, and security settings."
 author: "NetBox Labs Documentation Team"
diff --git a/docs/administration-console/console-overview.md b/docs/administration-console/console-overview.md
index 5eca6ba9..b96888a3 100644
--- a/docs/administration-console/console-overview.md
+++ b/docs/administration-console/console-overview.md
@@ -2,8 +2,12 @@
 tags:
   - cloud
   - administration
-  - operations
-  - monitoring
+  - getting-started
+  - configuration
+  - overview
+  - billing
+  - networking
+  - automation
 title: "NetBox Cloud: Administrative Console Overview"
 description: "Comprehensive overview of the NetBox Cloud Administrative Console interface, features, and sections including deployment, database, and monitoring panels."
 author: "NetBox Labs Documentation Team"
diff --git a/docs/administration-console/free-plan-features.md b/docs/administration-console/free-plan-features.md
index cf83fb36..0daba96f 100644
--- a/docs/administration-console/free-plan-features.md
+++ b/docs/administration-console/free-plan-features.md
@@ -4,9 +4,14 @@ hide:
   - toc
 tags:
   - cloud
-  - free-plan
-  - features
+  - administration
   - getting-started
+  - configuration
+  - billing
+  - features
+  - limitations
+  - networking
+  - automation
 title: "Free Plan Features"
 description: "Overview of features and capabilities available in the NetBox Cloud Free Plan, including limitations and upgrade options."
 author: "NetBox Labs Documentation Team"
diff --git a/docs/administration-console/free-plan-new-user.md b/docs/administration-console/free-plan-new-user.md
index 96f4c031..c9a11afa 100644
--- a/docs/administration-console/free-plan-new-user.md
+++ b/docs/administration-console/free-plan-new-user.md
@@ -1,9 +1,10 @@
 ---
 tags:
   - cloud
-  - free-plan
   - administration
   - getting-started
+  - configuration
+  - billing
 title: "Add a New User to Free Plan"
 description: "Step-by-step guide to inviting and adding new users to a NetBox Cloud Free Plan instance through the console administration interface."
 author: "NetBox Labs Documentation Team"
diff --git a/docs/administration-console/managing-hostnames.md b/docs/administration-console/managing-hostnames.md
index 81c7009a..d0448430 100644
--- a/docs/administration-console/managing-hostnames.md
+++ b/docs/administration-console/managing-hostnames.md
@@ -3,8 +3,8 @@ tags:
   - cloud
   - administration
   - networking
-  - dns
   - configuration
+  - dns
 title: "Managing Hostnames"
 description: "Configure and manage custom hostnames and DNS settings for your NetBox Cloud instance."
 author: "NetBox Labs Documentation Team"
diff --git a/docs/administration-console/netbox-cloud-plugins.md b/docs/administration-console/netbox-cloud-plugins.md
index 2d09afd9..1aeddd53 100644
--- a/docs/administration-console/netbox-cloud-plugins.md
+++ b/docs/administration-console/netbox-cloud-plugins.md
@@ -1,8 +1,9 @@
 ---
 tags:
   - cloud
+  - administration
+  - configuration
   - plugins
-  - features
 title: "NetBox Cloud Plugins"
 description: "View and manage installed plugins in your NetBox Cloud instance through the administrative console."
 author: "NetBox Labs Documentation Team"
diff --git a/docs/administration-console/okta-group-mapping.md b/docs/administration-console/okta-group-mapping.md
index 1876bd29..9305cbfa 100644
--- a/docs/administration-console/okta-group-mapping.md
+++ b/docs/administration-console/okta-group-mapping.md
@@ -1,11 +1,9 @@
 ---
 tags:
   - cloud
+  - administration
   - authentication
-  - sso
   - okta
-  - rbac
-  - configuration
 title: "Okta Group Mapping"
 description: "Configure automatic group synchronization and role mapping between Okta and NetBox Cloud for streamlined user access management."
 author: "NetBox Labs Documentation Team"
diff --git a/docs/administration-console/okta-sso-setup.md b/docs/administration-console/okta-sso-setup.md
index e9d63059..bbe39889 100644
--- a/docs/administration-console/okta-sso-setup.md
+++ b/docs/administration-console/okta-sso-setup.md
@@ -1,6 +1,7 @@
 ---
 tags:
   - cloud
+  - administration
   - authentication
   - sso
   - okta
diff --git a/docs/administration-console/prefix-lists.md b/docs/administration-console/prefix-lists.md
index 549c4e64..d705601f 100644
--- a/docs/administration-console/prefix-lists.md
+++ b/docs/administration-console/prefix-lists.md
@@ -2,9 +2,11 @@
 tags:
   - cloud
   - administration
-  - security
   - networking
+  - configuration
   - ipam
+  - security
+  - automation
 title: "Prefix Lists"
 description: "Configure and manage IP prefix lists for NetBox Cloud security, including both synchronized and non-synchronized prefix list creation and management."
 author: "NetBox Labs Documentation Team"
diff --git a/docs/administration-console/public-ip-addressing.md b/docs/administration-console/public-ip-addressing.md
index 1ada140b..18963b12 100644
--- a/docs/administration-console/public-ip-addressing.md
+++ b/docs/administration-console/public-ip-addressing.md
@@ -1,9 +1,8 @@
 ---
 tags:
   - cloud
+  - administration
   - networking
-  - security
-  - ipam
   - configuration
 title: "Public IP Addressing"
 description: "Configure and manage public IP addressing settings for NetBox Cloud instances."
diff --git a/docs/administration-console/saml-group-map.md b/docs/administration-console/saml-group-map.md
index 29c37fca..19e76cfb 100644
--- a/docs/administration-console/saml-group-map.md
+++ b/docs/administration-console/saml-group-map.md
@@ -1,11 +1,10 @@
 ---
 tags:
   - cloud
+  - administration
   - authentication
   - sso
   - saml
-  - rbac
-  - configuration
 title: "SAML Group Mapping"
 description: "Configure automatic group synchronization and role mapping between SAML identity providers and NetBox Cloud."
 author: "NetBox Labs Documentation Team"
