diff --git a/docs/about/case-studies/README.md b/docs/about/case-studies/README.md
index 60102889da5..b1f56bd988e 100644
--- a/docs/about/case-studies/README.md
+++ b/docs/about/case-studies/README.md
@@ -1,6 +1,11 @@
 ---
 hide:
   - toc
+audience: buyer
+components:
+  - eventing
+  - serving
+function: marketing
 ---
 
 # Knative Case Studies
diff --git a/docs/about/case-studies/deepc.md b/docs/about/case-studies/deepc.md
index 0623bef5109..af1e3b2b8b5 100644
--- a/docs/about/case-studies/deepc.md
+++ b/docs/about/case-studies/deepc.md
@@ -1,6 +1,10 @@
 ---
 hide:
   - toc
+audience: buyer
+components:
+  - eventing
+function: marketing
 ---
 <h1 style="color:#0071c7;font-size: 3em;">deepc Case Study</h1>
 <table style="border: 0;">
diff --git a/docs/about/case-studies/ibm.md b/docs/about/case-studies/ibm.md
index 9b7937db9ed..26f3ef15d1a 100644
--- a/docs/about/case-studies/ibm.md
+++ b/docs/about/case-studies/ibm.md
@@ -1,6 +1,10 @@
 ---
 hide:
   - toc
+audience: buyer
+components:
+  - eventing
+function: marketing
 ---
 <h1 style="color:#0071c7;font-size: 3em;">IBM Case Study</h1>
 <table style="border: 0;">
diff --git a/docs/about/case-studies/outfit7.md b/docs/about/case-studies/outfit7.md
index 84f6b9bb70f..d91f41e1be4 100644
--- a/docs/about/case-studies/outfit7.md
+++ b/docs/about/case-studies/outfit7.md
@@ -1,6 +1,10 @@
 ---
 hide:
   - toc
+audience: buyer
+components:
+  - serving
+function: marketing
 ---
 <h1 style="color:#0071c7;font-size: 3em;">Outfit7 Case Study</h1>
 <table style="border: 0;">
diff --git a/docs/about/case-studies/pnc.md b/docs/about/case-studies/pnc.md
index 8e7558bdfb9..583b97fdae5 100644
--- a/docs/about/case-studies/pnc.md
+++ b/docs/about/case-studies/pnc.md
@@ -1,6 +1,11 @@
 ---
 hide:
   - toc
+audience: buyer
+components:
+  - eventing
+  - serving
+function: marketing
 ---
 <h1 style="color:#0071c7;font-size: 3em;">PNC Bank Case Study</h1>
 <table style="border: 0;">
diff --git a/docs/about/case-studies/puppet.md b/docs/about/case-studies/puppet.md
index 20c50f1f0fd..e26b0ac9fdc 100644
--- a/docs/about/case-studies/puppet.md
+++ b/docs/about/case-studies/puppet.md
@@ -1,6 +1,10 @@
 ---
 hide:
   - toc
+audience: buyer
+components:
+  - serving
+function: marketing
 ---
 <h1 style="color:#0071c7;font-size: 3em;">Puppet Case Study</h1>
 <table style="border: 0;">
diff --git a/docs/about/case-studies/sva.md b/docs/about/case-studies/sva.md
index 651dbcb16ed..5b9de55b4b9 100644
--- a/docs/about/case-studies/sva.md
+++ b/docs/about/case-studies/sva.md
@@ -1,6 +1,10 @@
 ---
 hide:
   - toc
+audience: buyer
+components:
+  - eventing
+function: marketing
 ---
 <h1 style="color:#0071c7;font-size: 3em;">SVA System Vertrieb Alexander GmbH Case Study</h1>
 <table style="border: 0;">
diff --git a/docs/about/testimonials.md b/docs/about/testimonials.md
index f79907ce946..b38e7f49317 100644
--- a/docs/about/testimonials.md
+++ b/docs/about/testimonials.md
@@ -1,3 +1,11 @@
+---
+audience: buyer
+components:
+  - eventing
+  - serving
+function: marketing
+---
+
 <div class="testimonials">
   <h1>Testimonials</h1>
   <h3><b>Enterprise-grade Serverless on your own terms</b></h3>
diff --git a/docs/bookstore/create-slack-workspace/README.md b/docs/bookstore/create-slack-workspace/README.md
index 9768a751b16..2e24642be4b 100644
--- a/docs/bookstore/create-slack-workspace/README.md
+++ b/docs/bookstore/create-slack-workspace/README.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+  - eventing
+function: tutorial
+---
+
 # Creating a Slack Workspace
 
 ![Image](images/image5.png)
diff --git a/docs/bookstore/disclaimer/README.md b/docs/bookstore/disclaimer/README.md
index 83885b6dee7..3b0338d0ec1 100644
--- a/docs/bookstore/disclaimer/README.md
+++ b/docs/bookstore/disclaimer/README.md
@@ -1,3 +1,9 @@
+---
+audience: developer
+components: []
+function: tutorial
+---
+
 # **Disclaimer**
 
 ![image](images/image2.png)
diff --git a/docs/bookstore/extra-challenge/README.md b/docs/bookstore/extra-challenge/README.md
index b0548187e68..606fe155f6c 100644
--- a/docs/bookstore/extra-challenge/README.md
+++ b/docs/bookstore/extra-challenge/README.md
@@ -1,3 +1,12 @@
+---
+audience: developer
+components:
+  - eventing
+  - serving
+  - functions
+function: tutorial
+---
+
 # **Extra Challenges**
 
 ![image](images/image5.png)
diff --git a/docs/bookstore/page-0.5/environment-setup.md b/docs/bookstore/page-0.5/environment-setup.md
index 6bb18215278..e43275a9b28 100644
--- a/docs/bookstore/page-0.5/environment-setup.md
+++ b/docs/bookstore/page-0.5/environment-setup.md
@@ -1,3 +1,11 @@
+---
+audience: developer
+components:
+  - eventing
+  - serving
+function: tutorial
+---
+
 # Environment Setup
 
 ![Image](images/image20.png)
diff --git a/docs/bookstore/page-0/welcome-knative-bookstore-tutorial.md b/docs/bookstore/page-0/welcome-knative-bookstore-tutorial.md
index 61a0f077a9b..32baa4ab100 100644
--- a/docs/bookstore/page-0/welcome-knative-bookstore-tutorial.md
+++ b/docs/bookstore/page-0/welcome-knative-bookstore-tutorial.md
@@ -1,3 +1,12 @@
+---
+audience: developer
+components:
+  - eventing
+  - functions
+  - serving
+function: tutorial
+---
+
 # Welcome: Knative Bookstore Tutorial
 
 ![Welcome Image](images/1.png)
diff --git a/docs/bookstore/page-1/send-review-comment-to-broker.md b/docs/bookstore/page-1/send-review-comment-to-broker.md
index c29c5db2ece..47a05f71b8f 100644
--- a/docs/bookstore/page-1/send-review-comment-to-broker.md
+++ b/docs/bookstore/page-1/send-review-comment-to-broker.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+  - eventing
+function: tutorial
+---
+
 # Send Review Comment to Broker
 
 ![Image](images/image25.png)
diff --git a/docs/bookstore/page-2/sentiment-analysis-service-for-bookstore-reviews.md b/docs/bookstore/page-2/sentiment-analysis-service-for-bookstore-reviews.md
index 7fc58d25bca..ef0996cbbca 100644
--- a/docs/bookstore/page-2/sentiment-analysis-service-for-bookstore-reviews.md
+++ b/docs/bookstore/page-2/sentiment-analysis-service-for-bookstore-reviews.md
@@ -1,3 +1,11 @@
+---
+audience: developer
+components:
+  - functions
+  - serving
+function: tutorial
+---
+
 # Sentiment Analysis Service for Bookstore Reviews
 
 ![Image1](images/image1.png)
diff --git a/docs/bookstore/page-3/create-bad-word-filter-service.md b/docs/bookstore/page-3/create-bad-word-filter-service.md
index 81d84136cc3..0258267711e 100644
--- a/docs/bookstore/page-3/create-bad-word-filter-service.md
+++ b/docs/bookstore/page-3/create-bad-word-filter-service.md
@@ -1,3 +1,11 @@
+---
+audience: developer
+components:
+  - functions
+  - serving
+function: tutorial
+---
+
 # Create Bad Word Filter Service
 
 ![Image 4](images/image4.png)
diff --git a/docs/bookstore/page-3/solution-create-bad-word-filter-service.md b/docs/bookstore/page-3/solution-create-bad-word-filter-service.md
index 60eebe12f56..ba743208c2f 100644
--- a/docs/bookstore/page-3/solution-create-bad-word-filter-service.md
+++ b/docs/bookstore/page-3/solution-create-bad-word-filter-service.md
@@ -1,3 +1,11 @@
+---
+audience: developer
+components:
+  - functions
+  - serving
+function: tutorial
+---
+
 # Solution - Create Bad Word Filter Service
 
 ![image](images/image4.png)
diff --git a/docs/bookstore/page-4/create-sequence-to-streamline-ML-workflows.md b/docs/bookstore/page-4/create-sequence-to-streamline-ML-workflows.md
index 20640cde0a8..d9da41226f9 100644
--- a/docs/bookstore/page-4/create-sequence-to-streamline-ML-workflows.md
+++ b/docs/bookstore/page-4/create-sequence-to-streamline-ML-workflows.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+  - eventing
+function: tutorial
+---
+
 # **Create Knative Sequence to Streamline ML Workflows**
 
 ![image](images/image8.png)
diff --git a/docs/bookstore/page-5/deploy-database-service.md b/docs/bookstore/page-5/deploy-database-service.md
index 4515742d6e5..f5c3a5a8716 100644
--- a/docs/bookstore/page-5/deploy-database-service.md
+++ b/docs/bookstore/page-5/deploy-database-service.md
@@ -1,3 +1,9 @@
+---
+audience: developer
+components: []
+function: tutorial
+---
+
 # **Deploy the Database Service**
 
 ![image1](images/image1.png)
diff --git a/docs/bookstore/page-6/advanced-event-filtering.md b/docs/bookstore/page-6/advanced-event-filtering.md
index e3d461c7017..cb8d87d1a91 100644
--- a/docs/bookstore/page-6/advanced-event-filtering.md
+++ b/docs/bookstore/page-6/advanced-event-filtering.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+  - eventing
+function: tutorial
+---
+
 # **Advanced Event Filtering**
 
 ![Image](images/image4.png)
diff --git a/docs/bookstore/page-7/slack-sink-learning-knative-eventing-and-apache-camel-K-integration.md b/docs/bookstore/page-7/slack-sink-learning-knative-eventing-and-apache-camel-K-integration.md
index 9504368b851..3052eed3c9c 100644
--- a/docs/bookstore/page-7/slack-sink-learning-knative-eventing-and-apache-camel-K-integration.md
+++ b/docs/bookstore/page-7/slack-sink-learning-knative-eventing-and-apache-camel-K-integration.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+  - eventing
+function: tutorial
+---
+
 # **Slack sink - Learning Knative Eventing and the Apache Camel K integration**
 
 ![image](images/image2.png)
diff --git a/docs/client/README.md b/docs/client/README.md
index fb1a18e177a..1c37f3fb51e 100755
--- a/docs/client/README.md
+++ b/docs/client/README.md
@@ -1,3 +1,12 @@
+---
+audience: developer
+components:
+  - eventing
+  - functions
+  - serving
+function: explanation
+---
+
 # CLI tools
 
 The following CLI tools are supported for use with Knative.
diff --git a/docs/client/configure-kn.md b/docs/client/configure-kn.md
index e2e5f0daca5..3dcfdff8ea5 100644
--- a/docs/client/configure-kn.md
+++ b/docs/client/configure-kn.md
@@ -1,3 +1,12 @@
+---
+audience: developer
+components:
+  - eventing
+  - functions
+  - serving
+function: reference
+---
+
 # Customizing kn
 
 You can customize your `kn` CLI setup by creating a `config.yaml` configuration file. You can provide this configuration by using the `--config` flag, otherwise the configuration is picked up from a default location. The default configuration location conforms to the [XDG Base Directory Specification](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html), and is different for Unix systems and Windows systems.
diff --git a/docs/client/install-kn.md b/docs/client/install-kn.md
index 47b38b74cea..ead7c9650c1 100644
--- a/docs/client/install-kn.md
+++ b/docs/client/install-kn.md
@@ -1,3 +1,12 @@
+---
+audience: developer
+components:
+  - eventing
+  - functions
+  - serving
+function: how-to
+---
+
 # Installing the Knative CLI
 
 This guide provides details about how you can install the Knative `kn` CLI.
diff --git a/docs/client/kn-plugins.md b/docs/client/kn-plugins.md
index c5834eeffff..1a82f61135b 100644
--- a/docs/client/kn-plugins.md
+++ b/docs/client/kn-plugins.md
@@ -1,3 +1,12 @@
+---
+audience: developer
+components:
+  - eventing
+  - functions
+  - serving
+function: reference
+---
+
 # kn plugins
 
 The `kn` CLI supports the use of plugins. Plugins enable you to extend the functionality of your `kn` installation by adding custom commands and other shared commands that are not part of the core distribution of `kn`.