diff --git a/content/en/cloud/_index.md b/content/en/cloud/_index.md
index 9cf2d821..78228d40 100755
--- a/content/en/cloud/_index.md
+++ b/content/en/cloud/_index.md
@@ -7,6 +7,8 @@ type: docs
 menu: {main: {weight: 2}}
 cascade: 
     type: docs
+tags: [cloud]
+categories: [cloud, documentation]
 ---
 ![layer5-cloud-provider](layer5-cloud-provider.svg "image-center-shadow")
 {{% pageinfo %}}
diff --git a/content/en/cloud/catalog/_index.md b/content/en/cloud/catalog/_index.md
index 7564aaf5..48903a88 100644
--- a/content/en/cloud/catalog/_index.md
+++ b/content/en/cloud/catalog/_index.md
@@ -3,6 +3,8 @@ title: Catalog
 weight: 4
 description: >
   The Cloud Catalog is a web-based, public catalog to facilitate easy sharing and discovery of common cloud native architectures and design patterns.
+tags: [catalog]
+categories: [catalog,cloud]
 ---
 
 {{%pageinfo%}}
diff --git a/content/en/cloud/concepts/_index.md b/content/en/cloud/concepts/_index.md
index f4ef416a..be6092cc 100644
--- a/content/en/cloud/concepts/_index.md
+++ b/content/en/cloud/concepts/_index.md
@@ -3,6 +3,8 @@ title: Concepts
 weight: 2
 description: >
   An overview of Layer5 Cloud concepts and their relationships to one another.
+tags: [cloud]
+categories: [cloud, concepts]
 ---
 
 ![concepts-overview](concepts-overview.svg "image-center-shadow")
diff --git a/content/en/cloud/getting-started/_index.md b/content/en/cloud/getting-started/_index.md
index 2596b18a..399be8a3 100644
--- a/content/en/cloud/getting-started/_index.md
+++ b/content/en/cloud/getting-started/_index.md
@@ -2,6 +2,8 @@
 title: Getting Started
 description: Learn how to effectively manage your organizations, teams, users, workspaces, environments, and more.
 weight: 1
+tags: [cloud]
+categories: [cloud]
 ---
 <!-- {{% pageinfo %}}
 Page under construction.
diff --git a/content/en/cloud/getting-started/creating-a-design-from-templete.md.md b/content/en/cloud/getting-started/creating-a-design-from-templete.md.md
index c8a06e3b..6cc5f05f 100644
--- a/content/en/cloud/getting-started/creating-a-design-from-templete.md.md
+++ b/content/en/cloud/getting-started/creating-a-design-from-templete.md.md
@@ -2,6 +2,8 @@
 title: Creating a Design from Meshery Catalog Templates
 description: With this guide, you can create amazing cloud native designs for your infrastructure from already avaliable templetes in the meshery catalog. 
 weight: 2
+tags: [cloud, meshery]
+categories: [cloud]
 ---
 
 [Meshery Catalog](https://meshery.layer5.io/catalog) functions much like a cloud marketplace, providing a user-friendly interface for browsing, discovering, and sharing configurations and patterns for cloud native infrastructure. With Meshery Catalog, you can easily find,clone and deploy Kubernetes-based infrastructure and tools, making it easy to streamline your cloud native development and operations processes.
diff --git a/content/en/cloud/getting-started/getting-started-with-layer5-account.md b/content/en/cloud/getting-started/getting-started-with-layer5-account.md
index 314ad1de..280fb392 100644
--- a/content/en/cloud/getting-started/getting-started-with-layer5-account.md
+++ b/content/en/cloud/getting-started/getting-started-with-layer5-account.md
@@ -2,6 +2,8 @@
 title: Setting up Layer5 Account
 description: With a personal account on Layer5 Cloud, you can import or create infrastructural designs, collaborate with others through workspaces and teams, manage your organizations and more.
 weight: 1
+tags: [cloud,layer5]
+categories: [cloud]
 ---
 
 This guide will walk you through setting up your Layer5 account.
diff --git a/content/en/cloud/identity/_index.md b/content/en/cloud/identity/_index.md
index 919d6ab3..09bf59e9 100755
--- a/content/en/cloud/identity/_index.md
+++ b/content/en/cloud/identity/_index.md
@@ -4,4 +4,5 @@ description: >
   Organizations, Teams, Users
 weight: 3
 categories: [Identity]
+tags: [Identity]
 ---
\ No newline at end of file
diff --git a/content/en/cloud/security/tokens.md b/content/en/cloud/security/tokens.md
index 3852a641..4034eb68 100644
--- a/content/en/cloud/security/tokens.md
+++ b/content/en/cloud/security/tokens.md
@@ -3,6 +3,8 @@ title: Tokens
 description: >
   API Tokens are used to authenticate to Layer5 Cloud's REST API. Generated on your user account's security tokens page. Tokens can be revoked at any time.
 weight: 3
+tags: [tokens, permissions]
+categories: [Security]
 ---
 
 ## What tokens are
diff --git a/content/en/cloud/self-hosted/_index.md b/content/en/cloud/self-hosted/_index.md
index 06419eb1..65be4703 100644
--- a/content/en/cloud/self-hosted/_index.md
+++ b/content/en/cloud/self-hosted/_index.md
@@ -3,6 +3,8 @@ title: Self-Hosted
 weight: 10
 description: >
   Keep your MeshMap designs internal to your workplace. Get remote support from Layer5 when you need it.
+tags: [cloud]
+categories: [cloud]
 ---
 
 ![self-hosted](images/self-hosted.svg "image-right-no-shadow")
diff --git a/content/en/cloud/tutorials/_index.md b/content/en/cloud/tutorials/_index.md
index b88fd3b7..5e5c1dcc 100755
--- a/content/en/cloud/tutorials/_index.md
+++ b/content/en/cloud/tutorials/_index.md
@@ -2,4 +2,6 @@
 title: Tutorials
 description: Show your user how to work through some end to end examples.
 weight: 8
+tags: [tutorial]
+categories: [tutorial]
 ---
diff --git a/content/en/cloud/tutorials/assigning-user-badges.md b/content/en/cloud/tutorials/assigning-user-badges.md
index 7adbbb39..61a553f1 100755
--- a/content/en/cloud/tutorials/assigning-user-badges.md
+++ b/content/en/cloud/tutorials/assigning-user-badges.md
@@ -2,6 +2,8 @@
 title: Recognizing User and Contributor Milestones
 description: >
   Showcasing user and contributor achievements
+tags: [badges, milestones]
+categories: [tutorial]
 ---
 
 
diff --git a/content/en/cloud/tutorials/gitops-snapshots.md b/content/en/cloud/tutorials/gitops-snapshots.md
index 4a226fc3..70cafe32 100644
--- a/content/en/cloud/tutorials/gitops-snapshots.md
+++ b/content/en/cloud/tutorials/gitops-snapshots.md
@@ -4,6 +4,8 @@ description: >
   Connect MeshMap to your GitHub repo and see changes pull request-to-pull request.
 category: GitOps
 weight: 4
+tags: [meshmap]
+categories: [tutorial]
 ---
 
 
diff --git a/content/en/cloud/tutorials/sharing-a-workspace.md b/content/en/cloud/tutorials/sharing-a-workspace.md
index 51c58bc9..36b7b30f 100644
--- a/content/en/cloud/tutorials/sharing-a-workspace.md
+++ b/content/en/cloud/tutorials/sharing-a-workspace.md
@@ -3,6 +3,8 @@ title: Sharing a Workspace
 description: >
   Learn how to control access to workspaces and their resources.
 weight: 5
+tags: [workspace]
+categories: [tutorial]
 ---
 ## Share designs from Workspaces
 
diff --git a/content/en/cloud/workspaces/_index.md b/content/en/cloud/workspaces/_index.md
index d257f20a..b401ceff 100644
--- a/content/en/cloud/workspaces/_index.md
+++ b/content/en/cloud/workspaces/_index.md
@@ -3,7 +3,8 @@ title: Workspaces
 description: >
   Meshery Workspaces serve as a virtual space for your team-based work.
 weight: 6
-categories: [Workspaces]
+categories: [workspace]
+tags: [workspace]
 ---
 
 Meshery Workspaces serve as a virtual space for your team-based work. Create a Workspace to organize your work and to serve as the central point of collaboration for you and your teams and a central point of access control to Environments and their resources.
diff --git a/content/en/meshmap/_index.md b/content/en/meshmap/_index.md
index 8373be76..57cef2f8 100755
--- a/content/en/meshmap/_index.md
+++ b/content/en/meshmap/_index.md
@@ -7,6 +7,9 @@ menu: {main: {weight: 3}}
 weight: 1
 cascade: 
     type: docs
+tags: [meshmap]
+categories: [meshmap]
+
 ---
 
 
diff --git a/content/en/meshmap/tasks/_index.md b/content/en/meshmap/tasks/_index.md
index a566d8ac..40a48014 100755
--- a/content/en/meshmap/tasks/_index.md
+++ b/content/en/meshmap/tasks/_index.md
@@ -2,6 +2,8 @@
 title: Core Tasks
 description: Navigate your way around MeshMap with these common tasks.
 weight: 6
+categories: [tasks]
+tags: [tasks]
 ---
 
 {{% pageinfo %}}
diff --git a/content/en/meshmap/tasks/designs/_index.md b/content/en/meshmap/tasks/designs/_index.md
index 812f4799..8b445e78 100755
--- a/content/en/meshmap/tasks/designs/_index.md
+++ b/content/en/meshmap/tasks/designs/_index.md
@@ -2,5 +2,7 @@
 title: Deploying Designs
 description: >
   Each Meshery design is deployable to one or more Kubernetes clusters.
+categories: [Designer]
+tags: [designs]
 ---
 
diff --git a/content/en/meshmap/visualizer/_index.md b/content/en/meshmap/visualizer/_index.md
index 5164b65e..735f33ef 100644
--- a/content/en/meshmap/visualizer/_index.md
+++ b/content/en/meshmap/visualizer/_index.md
@@ -4,6 +4,7 @@ weight: 5
 description: >
   Visualizer mode is for operating your Kubernetes clusters and cloud native infrastructure. 
 categories: [Visualizer]
+tags: [Visualizer]
 ---
 
 Discover and examine your Kubernetes clusters and cloud native infrastructure using Visualizer mode.