diff --git a/packages/aws/manifest.yml b/packages/aws/manifest.yml
index b5587dba119..f82f3a68b78 100644
--- a/packages/aws/manifest.yml
+++ b/packages/aws/manifest.yml
@@ -11,6 +11,12 @@ categories:
   - observability
   # Added security category as AWS integration collects security-relevant data like CloudTrail logs, GuardDuty findings, and other security monitoring data
   - security
+  # Added containers category to match policy template categories (ECS metrics template references containers subcategory)
+  - containers
+  # Added network category to match policy template categories (VPC Flow, Transit Gateway, and NAT Gateway templates reference network subcategory)
+  - network
+  # Added datastore category to match policy template categories (DynamoDB, RDS, Redshift, and other database templates reference datastore subcategory)
+  - datastore
 conditions:
   elastic:
     subscription: basic
diff --git a/packages/azure_metrics/manifest.yml b/packages/azure_metrics/manifest.yml
index 7a9a280349c..b1ea8948f4d 100644
--- a/packages/azure_metrics/manifest.yml
+++ b/packages/azure_metrics/manifest.yml
@@ -19,6 +19,10 @@ categories:
   - observability
   - azure
   - custom
+  # Added containers category to match policy template categories (container_registry, container_instance, and container_service templates reference containers subcategory)
+  - containers
+  # Added datastore category to match policy template categories (database_account template references datastore subcategory)
+  - datastore
 conditions:
   kibana:
     version: "~8.18.8 || ~8.19.5 || ~9.0.8 || ^9.1.5"
diff --git a/packages/cloud_asset_inventory/manifest.yml b/packages/cloud_asset_inventory/manifest.yml
index b31d5ea46ac..14737741578 100644
--- a/packages/cloud_asset_inventory/manifest.yml
+++ b/packages/cloud_asset_inventory/manifest.yml
@@ -10,6 +10,8 @@ categories:
   - security
   - asset_inventory
   - cloudsecurity_cdr
+  # Added cloud category to match policy template categories (asset_inventory template references cloud as a top-level category)
+  - cloud
 conditions:
   kibana:
     version: ">=9.2.0"
diff --git a/packages/cloud_security_posture/manifest.yml b/packages/cloud_security_posture/manifest.yml
index de66727ce1a..7c4937d5010 100644
--- a/packages/cloud_security_posture/manifest.yml
+++ b/packages/cloud_security_posture/manifest.yml
@@ -11,6 +11,16 @@ categories:
   - cloudsecurity_cdr
   - misconfiguration_workflow
   - vulnerability_workflow
+  # Added containers category to match policy template categories (kspm template references containers subcategory)
+  - containers
+  # Added observability category to match policy template categories (kspm template references kubernetes subcategory which requires observability as parent)
+  - observability
+  # Added google_cloud category to match policy template categories (cspm template references google_cloud as a top-level category)
+  - google_cloud
+  # Added aws category to match policy template categories (kspm and cspm templates reference aws as a top-level category)
+  - aws
+  # Added cloud category to match policy template categories (cspm and vuln_mgmt templates reference cloud as a top-level category)
+  - cloud
 conditions:
   kibana:
     version: "^9.2.0"
diff --git a/packages/gcp/manifest.yml b/packages/gcp/manifest.yml
index 30157165d1f..4f4413e2aa0 100644
--- a/packages/gcp/manifest.yml
+++ b/packages/gcp/manifest.yml
@@ -13,6 +13,12 @@ categories:
   - google_cloud
   - cloud
   - observability
+  # Added containers category to match policy template categories (gke template references containers subcategory)
+  - containers
+  # Added datastore category to match policy template categories (CloudSQL templates reference datastore subcategory)
+  - datastore
+  # Added security category to match policy template categories (audit, firewall, and dns templates reference security subcategories like firewall_security and dns_security)
+  - security
 conditions:
   kibana:
     version: "^8.13.0 || ^9.0.0"