diff --git a/src/content/products/1.1.1.1.yaml b/src/content/products/1.1.1.1.yaml
index 8fad0cd0202eb87..9b2b7dea665e28a 100644
--- a/src/content/products/1.1.1.1.yaml
+++ b/src/content/products/1.1.1.1.yaml
@@ -4,7 +4,7 @@ product:
   title: 1.1.1.1 (DNS Resolver)
   url: /1.1.1.1/
   group: Consumer services
-  additional_groups: [Network security]
+  additional_groups: [Network security, Privacy]
 
 meta:
   title: Cloudflare 1.1.1.1 docs
diff --git a/src/content/products/aegis.yaml b/src/content/products/aegis.yaml
index 6addce2893c6d70..2887908799179b7 100644
--- a/src/content/products/aegis.yaml
+++ b/src/content/products/aegis.yaml
@@ -5,7 +5,7 @@ product:
   url: /aegis/
   group: Network security
   additional_groups:
-    [Application performance, Application security, Core platform]
+    [Application performance, Application security]
 
 meta:
   title: Cloudflare Aegis docs
diff --git a/src/content/products/ai-audit.yaml b/src/content/products/ai-audit.yaml
index 3c1f779be03f896..81b91f74f6a7c10 100644
--- a/src/content/products/ai-audit.yaml
+++ b/src/content/products/ai-audit.yaml
@@ -4,6 +4,7 @@ product:
   url: /ai-audit/
   group: Core platform
   additional_groups: [AI]
+  tags: [AI]
 meta:
   title: Cloudflare AI Audit docs
   description: Analyze and control third-party AI crawlers in your website
diff --git a/src/content/products/automatic-platform-optimization.yaml b/src/content/products/automatic-platform-optimization.yaml
index 115088b6c75f602..18b8052b443d32f 100644
--- a/src/content/products/automatic-platform-optimization.yaml
+++ b/src/content/products/automatic-platform-optimization.yaml
@@ -8,5 +8,5 @@ product:
 
 meta:
   title: Cloudflare Automatic Platform Optimization docs
-  description: Improve performance by serving your WordPress site from Cloudflare's global network
+  description: Improve WordPress site performance by serving it from Cloudflare's global network
   author: "@cloudflare"
diff --git a/src/content/products/byoip.yaml b/src/content/products/byoip.yaml
index 0d899acf92a8bcb..dcff4cbe9a88a6e 100644
--- a/src/content/products/byoip.yaml
+++ b/src/content/products/byoip.yaml
@@ -3,8 +3,8 @@ name: BYOIP
 product:
   title: BYOIP
   url: /byoip/
-  group: Core platform
-  additional_groups: [Application performance, Network security]
+  group: Network security
+  additional_groups: [Application performance]
 
 meta:
   title: Cloudflare BYOIP docs
diff --git a/src/content/products/data-localization.yml b/src/content/products/data-localization.yml
index 79bfd50f28383ac..d48ab82a529a29f 100644
--- a/src/content/products/data-localization.yml
+++ b/src/content/products/data-localization.yml
@@ -4,13 +4,12 @@ logo: <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="M5.87
 product:
   title: Data Localization Suite
   url: /data-localization/
-  group: Core platform
+  group: Cloudflare One
   additional_groups:
     [
       Analytics,
       Application performance,
       Application security,
-      Cloudflare One,
       Developer platform,
       Network security,
       Storage,
diff --git a/src/content/products/developer-spotlight.yaml b/src/content/products/developer-spotlight.yaml
index aedd3976f0e1935..a24b6b7fdd54c70 100644
--- a/src/content/products/developer-spotlight.yaml
+++ b/src/content/products/developer-spotlight.yaml
@@ -4,6 +4,7 @@ product:
   title: Developer Spotlight
   url: /developer-spotlight/
   group: Developer platform
+  additional_groups: [Docs collections]
 
 meta:
   title: Cloudflare Developer Spotlight
diff --git a/src/content/products/fundamentals.yml b/src/content/products/fundamentals.yml
index 5fe3434620dc0f3..45048098df9d7d8 100644
--- a/src/content/products/fundamentals.yml
+++ b/src/content/products/fundamentals.yml
@@ -6,6 +6,7 @@ product:
   url: /fundamentals/
   wrap: true
   group: Core platform
+  additional_groups: [Docs collections]
 
 meta:
   title: Cloudflare Fundamentals docs
diff --git a/src/content/products/google-tag-gateway.yaml b/src/content/products/google-tag-gateway.yaml
index 5068886c05332a5..7c220a5b064bde6 100644
--- a/src/content/products/google-tag-gateway.yaml
+++ b/src/content/products/google-tag-gateway.yaml
@@ -4,6 +4,7 @@ product:
   title: Google tag gateway for advertisers
   url: /google-tag-gateway/
   group: Application performance
+  additional_groups: [Privacy]
 
 meta:
   title: Google tag gateway for advertisers docs
diff --git a/src/content/products/learning-paths.yaml b/src/content/products/learning-paths.yaml
index 21fbf1a577a7a7b..b9a52352404379b 100644
--- a/src/content/products/learning-paths.yaml
+++ b/src/content/products/learning-paths.yaml
@@ -3,6 +3,7 @@ name: Learning Paths
 product:
   title: Learning Paths
   url: /learning-paths/
+  group: Docs collections
   wrap: true
 
 meta:
diff --git a/src/content/products/log-explorer.yaml b/src/content/products/log-explorer.yaml
index 1d45c7bd3d28919..17b273b83b581ff 100644
--- a/src/content/products/log-explorer.yaml
+++ b/src/content/products/log-explorer.yaml
@@ -5,6 +5,7 @@ product:
   title: Log Explorer
   url: /log-explorer/
   group: Core platform
+  additional_groups: [Analytics]
 
 meta:
   title: Cloudflare Log Explorer docs
diff --git a/src/content/products/logs.yaml b/src/content/products/logs.yaml
index 0ccf389cceb165a..50623bd29a62462 100644
--- a/src/content/products/logs.yaml
+++ b/src/content/products/logs.yaml
@@ -8,5 +8,5 @@ product:
 
 meta:
   title: Cloudflare Logs docs
-  description: Access detailed logs with metadata from our products
+  description: Access detailed logs with metadata from Cloudflare products
   author: "@cloudflare"
diff --git a/src/content/products/radar.yml b/src/content/products/radar.yml
index d4cd9d8386fbdc1..cd2c97c55d22a64 100644
--- a/src/content/products/radar.yml
+++ b/src/content/products/radar.yml
@@ -5,6 +5,7 @@ product:
   title: Radar
   url: /radar/
   group: Consumer services
+  additional_groups: [Analytics]
 
 meta:
   title: Cloudflare Radar docs
diff --git a/src/content/products/reference-architecture.yml b/src/content/products/reference-architecture.yml
index 3e6dfeccd5312b0..e6ff9d1d89c3e35 100644
--- a/src/content/products/reference-architecture.yml
+++ b/src/content/products/reference-architecture.yml
@@ -6,6 +6,7 @@ product:
   url: /reference-architecture/
   wrap: true
   group: Core platform
+  additional_groups: [Docs collections]
 
 meta:
   title: Cloudflare Reference Architecture docs
diff --git a/src/content/products/support.yml b/src/content/products/support.yml
index fbc8422a52785c0..692271d4172f42a 100644
--- a/src/content/products/support.yml
+++ b/src/content/products/support.yml
@@ -5,6 +5,7 @@ product:
   title: Support
   url: /support/
   group: Core platform
+  additional_groups: [Docs collections]
 
 meta:
   title: Cloudflare Support docs
diff --git a/src/content/products/terraform.yaml b/src/content/products/terraform.yaml
index 21af9edeab6ee97..e050fbcb2f296ad 100644
--- a/src/content/products/terraform.yaml
+++ b/src/content/products/terraform.yaml
@@ -4,8 +4,9 @@ product:
   title: Terraform
   url: /terraform/
   group: Core platform
+  additional_groups: [Developer platform]
 
 meta:
   title: Cloudflare Terraform docs
-  description: Define and store configuration in source code repositories like GitHub, without needing to learn the Cloudflare APIs
+  description: Define and store Cloudflare configurations in source code repositories like GitHub
   author: "@cloudflare"
diff --git a/src/content/products/warp-client.yaml b/src/content/products/warp-client.yaml
index 6637bf167ac3d1f..5749e8a67813de6 100644
--- a/src/content/products/warp-client.yaml
+++ b/src/content/products/warp-client.yaml
@@ -4,9 +4,9 @@ product:
   title: WARP Client
   url: /warp-client/
   group: Consumer services
-  additional_groups: [Network security]
+  additional_groups: [Network security, Privacy]
 
 meta:
   title: Cloudflare WARP client docs
-  description: Allows individuals or organizations to have a faster, more secure, and private experience online
+  description: Allows individuals or organizations to have a faster, more secure connection to the Internet
   author: "@cloudflare"
diff --git a/src/content/products/web3.yml b/src/content/products/web3.yml
index 68da87c9c320573..6eadf7e97f4b86d 100644
--- a/src/content/products/web3.yml
+++ b/src/content/products/web3.yml
@@ -10,5 +10,5 @@ product:
 
 meta:
   title: Cloudflare Web3 docs
-  description: Gateways to various networks to help you develop applications without worrying about running infrastructure
+  description: Gateways to networks to help you develop applications without worrying about running infrastructure
   author: "@cloudflare"
diff --git a/src/content/products/workers-analytics-engine.yaml b/src/content/products/workers-analytics-engine.yaml
index eebaf0debce16ae..1e40ef7c6d85899 100644
--- a/src/content/products/workers-analytics-engine.yaml
+++ b/src/content/products/workers-analytics-engine.yaml
@@ -7,4 +7,4 @@ product:
   additional_groups: [Analytics]
 
 meta:
-  description: Unlimited-cardinality analytics at scale, via an API to write data from Workers, and a SQL API to query that data
+  description: Unlimited-cardinality analytics at scale via an API to write data from Workers and a SQL API to query that data
diff --git a/src/content/products/workers-for-platforms.yaml b/src/content/products/workers-for-platforms.yaml
index 2a6118475b8f301..6fcf8c392febf0c 100644
--- a/src/content/products/workers-for-platforms.yaml
+++ b/src/content/products/workers-for-platforms.yaml
@@ -6,4 +6,4 @@ product:
   url: /cloudflare-for-platforms/workers-for-platforms/
 
 meta:
-  description: Deploy custom code for your users or let them directly deploy code to your platform, managing infrastructure
+  description: Deploy custom code for your users or let them directly deploy code to your platform
diff --git a/src/content/products/zaraz.yml b/src/content/products/zaraz.yml
index 9c1fece172b30ca..8c2dc6ce8135d43 100644
--- a/src/content/products/zaraz.yml
+++ b/src/content/products/zaraz.yml
@@ -5,7 +5,7 @@ product:
   title: Zaraz
   url: /zaraz/
   group: Developer platform
-  additional_groups: [Application performance, Analytics]
+  additional_groups: [Application performance, Analytics, Privacy]
 
 meta:
   title: Cloudflare Zaraz docs