diff --git a/config/_default/menus/main.en.yaml b/config/_default/menus/main.en.yaml
index d0ffa89f272..6eee19b60e8 100644
--- a/config/_default/menus/main.en.yaml
+++ b/config/_default/menus/main.en.yaml
@@ -3088,6 +3088,26 @@ menu:
parent: datadog_cloudcraft
identifier: datadog_cloudcraft_overlays
weight: 1
+ - name: Infrastructure
+ url: datadog_cloudcraft/overlays/infrastructure/
+ parent: datadog_cloudcraft_overlays
+ identifier: datadog_cloudcraft_overlays_infrastructure
+ weight: 101
+ - name: Observability
+ url: datadog_cloudcraft/overlays/observability/
+ parent: datadog_cloudcraft_overlays
+ identifier: datadog_cloudcraft_overlays_observability
+ weight: 102
+ - name: Security
+ url: datadog_cloudcraft/overlays/security/
+ parent: datadog_cloudcraft_overlays
+ identifier: datadog_cloudcraft_overlays_security
+ weight: 103
+ - name: Cloud Cost Management
+ url: datadog_cloudcraft/overlays/ccm/
+ parent: datadog_cloudcraft_overlays
+ identifier: datadog_cloudcraft_overlays_ccm
+ weight: 104
- name: Resource Catalog
url: infrastructure/resource_catalog/
pre: resource-catalog
diff --git a/content/en/datadog_cloudcraft/overlays.md b/content/en/datadog_cloudcraft/overlays.md
deleted file mode 100644
index 43464f5b08f..00000000000
--- a/content/en/datadog_cloudcraft/overlays.md
+++ /dev/null
@@ -1,132 +0,0 @@
----
-title: Overlays
-description: "Use Cloudcraft overlays to view AWS infrastructure from different perspectives including observability, security, cost management, and infrastructure."
-further_reading:
-- link: "https://www.datadoghq.com/blog/cloud-architecture-diagrams-cost-compliance-cloudcraft-datadog/"
- tag: "Blog"
- text: "Plan new architectures and track your cloud footprint with Cloudcraft (Standalone)"
-- link: "https://www.datadoghq.com/blog/cloudcraft-observability-overlay/"
- tag: "Blog"
- text: "Visually identify observability gaps with Cloudcraft in Datadog"
----
-
-## Overview
-
-Cloudcraft supports overlays that integrate data from multiple sources, enriching your diagrams with real-time insights. These views let you group and filter resources by key attributes, helping you focus on different parts of your architecture for troubleshooting, cost optimization, or security analysis. Each overlay is designed to address a specific operational goal, making it easy to adapt the diagram to your needs.
-
-## Available overlays
-
-Cloudcraft provides the following built-in overlays:
-
-- [Infrastructure](#infrastructure) (default)
-- [Observability](#observability)
-- [Security](#security)
-- [Cloud Cost Management (CCM)](#cloud-cost-management)
-
-### Infrastructure
-
-The infrastructure view provides a broad overview, grouping resources by Account, Region, and VPC. This view is ideal for generating architecture diagrams for troubleshooting or high-level review.
-
-The infrastructure diagram excludes components like EBS, NAT Gateway, and Transit Gateway to reduce visual clutter and highlight the most important parts of your architecture.
-
-{{< img src="datadog_cloudcraft/infra_overlay_4.png" alt="Infrastructure overlay in Cloudcraft." style="width:100%;" >}}
-
-### Observability
-
-The Observability overlay shows where the Datadog Agent is installed and what features are enabled per host, such as Application Performance Monitoring (APM), Cloud Network Monitoring (CNM), Log Management, and more. This helps you to assess visibility gaps across your environment.
-
-On the Observability overlay, you can take action on individual resources or groups of resources:
-
-- Click a single host to open a side panel with direct links to Fleet Automation, where you can deploy configurations or upgrade the Agent.
-- Click a resource group, such as a subnet or VPC, to open a side panel that allows you to apply bulk updates across all the hosts in that resource group.
-- To select multiple (but not all) hosts, hold down the Command key on Mac or the Control key on Windows while clicking on each host.
-
-{{< img src="datadog_cloudcraft/observability_overlay_with_fleet_2.mp4" alt="Observability overlay in Cloudcraft, clicking on a resource group, and opening the side panel to display the bulk update feature." video=true >}}
-
-In the bottom left legend, the **View Datadog coverage by** dropdown allows you to inspect the installation status for specific features. Each row shows:
-
-- Feature name (for example, APM, Logs, CNM)
-- Numerical coverage: X / Y (for example, 16/35), where:
- - X is the number of resources with that feature enabled
- - Y is the total number of relevant resources in the current view or filter
-
-Legend:
-
-| Pin Color | Description |
-|-----------|-----------------------------------------------------------|
-| Green | Agent and feature are both enabled |
-| Gray | Feature is not enabled |
-| Yellow | Agent is installed but requires an upgrade |
-
-The observability overlay tracks coverage for the following products:
-
-| Feature | Description |
-|-------------------|--------------------------------------------------------------------|
-| Agent version | Verifies if the Datadog Agent is installed and its version |
-| APM | Application Performance Monitoring (traces collected) |
-| CNM | Cloud Network Monitoring coverage |
-| Logs | Log Management collection status |
-| CWS | Cloud Workload Protection coverage |
-| CSPM | Cloud Security Misconfigurations coverage |
-| Process | Process monitoring enabled |
-| CSM VM Hosts | Coverage of Cloud Security Vulnerabilities on hosts |
-| CSM VM Containers | Coverage of Cloud Security Vulnerabilities on containers |
-| USM | Coverage of Universal Service Monitoring |
-
-### Security
-
-The security overlay highlights potential security exposures in your architecture, grouping resources by Region, VPC, and Security Group. It displays security findings detected by Cloud Security, helping you:
-
-- Identify security issues directly in infrastructure diagrams
-- Analyze findings in context, so you can prioritize remediation:
- - Misconfigurations
- - Identity risks
- - Sensitive data (S3 buckets only)
-- Assess your security posture before deploying applications
-
-This view is ideal for mapping attack surfaces during penetration tests or security audits. To keep the diagram focused, components like EBS volumes and NAT Gateways are excluded.
-
-#### Investigate misconfigurations and identity risks
-
-By default, the security overlay shows Critical, High, and Medium severity misconfigurations or identity risks, which you can filter in the legend.
-
-You can click on any resource that has findings to open a side panel with more details, allowing deeper investigation without leaving the diagram. Click **Investigate** to get more context about the finding and learn how to remediate it.
-
-{{< img src="datadog_cloudcraft/overlays/cloudcraft_security_overlay_misconfigurations_2.png" alt="Security overlay in Cloudcraft with the misconfigurations filter applied in the collapsible legend in the bottom of the screen, and highlighting the Investigate button" style="width:100%;" >}}
-
-#### Investigate sensitive data
-
-You can view sensitive data matches for your S3 buckets. Click a resource with matches to learn more about the bucket's sensitive data matches. Then, hover over a filename and click its **Inspect in AWS** button.
-
-{{< img src="datadog_cloudcraft/overlays/cloudcraft_security_overlay_sensitive_data_2.png" alt="Security overlay in Cloudcraft with the sensitive data filter applied, highlighting the collapsible legend in the bottom left of the screen, and the Inspect in AWS button on the side panel." style="width:100%;" >}}
-
-#### Investigate vulnerabilities
-
-View security vulnerability matches associated with your EC2 instances. Click a resource that has a matching vulnerability. This opens a side panel which provides detailed vulnerability data for a selected EC2 instance, including severity, affected packages, and exploit status. For deeper analysis, click **Investigate** to get more context about the vulnerability and learn how to remediate it.
-
-{{< img src="datadog_cloudcraft/overlays/cloudcraft_security_vuln_2.png" alt="Security overlay in Cloudcraft with the vulnerabilities filter applied, highlighting the collapsible legend in the bottom left of the screen, and the Investigate button on the side panel." style="width:100%;" >}}
-
-### Cloud Cost Management
-
-The Cloud Cost overlay helps you identify and act on savings opportunities within your AWS architecture diagrams.
-In this view:
-
-- Recommendations are shown directly on resources with estimated monthly savings (for example, terminate unused RDS instances, migrate storage classes).
-- Use the filter at the bottom of the screen to narrow recommendations by potential monthly savings range and recommendation type (**Terminate**, **Migrate**, **Downsize**, **Purchase**).
-
-Clicking a resource opens a detailed side panel with:
-
-- Current and projected monthly costs.
-- A description of recommended changes.
-- Quick actions to create a Jira issue or support case.
-- Metrics and usage patterns explaining the recommendation.
-
-This enables faster, in-context cost optimization without switching views.
-
-{{< img src="datadog_cloudcraft/overlays/cloudcraft_ccm_overlay_4.png" alt="Cloud Cost Management (CCM) overlay in Cloudcraft, highlighting the recommendations option in the collapsible legend at the bottom left hand side of the screen." style="width:100%;" >}}
-
-## Further reading
-
-{{< partial name="whats-next/whats-next.html" >}}
-
-[1]: /agent/fleet_automation
diff --git a/content/en/datadog_cloudcraft/overlays/_index.md b/content/en/datadog_cloudcraft/overlays/_index.md
new file mode 100644
index 00000000000..ed65435efa2
--- /dev/null
+++ b/content/en/datadog_cloudcraft/overlays/_index.md
@@ -0,0 +1,34 @@
+---
+title: Overlays
+description: "Use Cloudcraft overlays to view your infrastructure from different perspectives including observability, security, cost management, and infrastructure."
+further_reading:
+- link: "https://www.datadoghq.com/blog/cloud-architecture-diagrams-cost-compliance-cloudcraft-datadog/"
+ tag: "Blog"
+ text: "Plan new architectures and track your cloud footprint with Cloudcraft (Standalone)"
+- link: "https://www.datadoghq.com/blog/cloudcraft-observability-overlay/"
+ tag: "Blog"
+ text: "Visually identify observability gaps with Cloudcraft in Datadog"
+---
+
+## Overview
+
+Cloudcraft supports overlays that integrate data from multiple sources, enriching your diagrams with real-time insights. These views let you group and filter resources by key attributes, helping you focus on different parts of your architecture for troubleshooting, cost optimization, or security analysis. Each overlay is designed to address a specific operational goal, making it easy to adapt the diagram to your needs.
+
+## Available overlays
+
+Cloudcraft provides the following built-in overlays:
+
+- [Infrastructure][1]: View resources grouped by Account, Region, and VPC for architecture diagrams and troubleshooting.
+- [Observability][2]: See where the Datadog Agent is installed and which features are enabled per host.
+- [Security][3]: Identify security exposures, misconfigurations, and vulnerabilities in your architecture.
+- [Cloud Cost Management (CCM)][4]: Discover savings opportunities with cost recommendations shown directly on resources.
+
+## Further reading
+
+{{< partial name="whats-next/whats-next.html" >}}
+
+[1]: /datadog_cloudcraft/overlays/infrastructure/
+[2]: /datadog_cloudcraft/overlays/observability/
+[3]: /datadog_cloudcraft/overlays/security/
+[4]: /datadog_cloudcraft/overlays/ccm/
+
diff --git a/content/en/datadog_cloudcraft/overlays/ccm.md b/content/en/datadog_cloudcraft/overlays/ccm.md
new file mode 100644
index 00000000000..e4733714401
--- /dev/null
+++ b/content/en/datadog_cloudcraft/overlays/ccm.md
@@ -0,0 +1,69 @@
+---
+title: Cloud Cost Management
+description: "Use the Cloud Cost Management overlay in Cloudcraft to view resource-level costs and discover savings opportunities directly on your architecture diagrams."
+further_reading:
+- link: "/datadog_cloudcraft/overlays/infrastructure/"
+ tag: "Documentation"
+ text: "Infrastructure overlay"
+- link: "/datadog_cloudcraft/overlays/observability/"
+ tag: "Documentation"
+ text: "Observability overlay"
+- link: "/datadog_cloudcraft/overlays/security/"
+ tag: "Documentation"
+ text: "Security overlay"
+- link: "/cloud_cost_management/"
+ tag: "Documentation"
+ text: "Cloud Cost Management"
+---
+
+## Overview
+
+The Cloud Cost overlay helps you visualize resource-level costs and identify savings opportunities within your AWS architecture diagrams. This overlay provides two views: **[Cost](#cost-view)** and **[Recommendations](#recommendations-view)**.
+
+## Cost view
+
+The Cost view shows resource-level cloud costs from the past 30 days, allowing you to understand spending patterns across your architecture.
+
+### Filter by cost
+
+Use the slider filter at the bottom of the screen to set a cost range. The diagram updates dynamically to highlight resources within your selected range.
+
+You can also filter by region to focus on specific parts of your infrastructure.
+
+### Resource details
+
+Click a resource to open the side panel, which displays:
+
+- Cost breakdown for the last 30 days
+- Tag information associated with the resource
+- **Top Cost Changes** section (when applicable) highlighting significant cost fluctuations
+
+**Note**: The time range defaults to the last 30 days and is not configurable.
+
+{{< img src="datadog_cloudcraft/overlays/cloudcraft_ccm_cost_view.png" alt="Cloud Cost Management overlay in Cloudcraft showing the Cost view with resource-level costs." style="width:100%;" >}}
+
+## Recommendations view
+
+The Recommendations view shows savings opportunities directly on resources with estimated monthly savings (for example, terminate unused RDS instances, migrate storage classes).
+
+Use the filter at the bottom of the screen to narrow recommendations by:
+
+- Potential monthly savings range
+- Recommendation type: **Terminate**, **Migrate**, **Downsize**, or **Purchase**
+
+### Resource details
+
+Clicking a resource opens a detailed side panel with:
+
+- Current and projected monthly costs
+- A description of recommended changes
+- Quick actions to create a Jira issue or support case
+- Metrics and usage patterns explaining the recommendation
+
+This enables faster, in-context cost optimization without switching views.
+
+{{< img src="datadog_cloudcraft/overlays/cloudcraft_ccm_overlay_5.png" alt="Cloud Cost Management overlay in Cloudcraft showing the Recommendations view with savings opportunities highlighted." style="width:100%;" >}}
+
+## Further reading
+
+{{< partial name="whats-next/whats-next.html" >}}
diff --git a/content/en/datadog_cloudcraft/overlays/infrastructure.md b/content/en/datadog_cloudcraft/overlays/infrastructure.md
new file mode 100644
index 00000000000..47217725e5e
--- /dev/null
+++ b/content/en/datadog_cloudcraft/overlays/infrastructure.md
@@ -0,0 +1,61 @@
+---
+title: Infrastructure
+description: "Use the Infrastructure overlay in Cloudcraft to view resources grouped by Account, Region, and VPC for architecture diagrams and troubleshooting."
+further_reading:
+- link: "/datadog_cloudcraft/overlays/observability/"
+ tag: "Documentation"
+ text: "Observability overlay"
+- link: "/datadog_cloudcraft/overlays/security/"
+ tag: "Documentation"
+ text: "Security overlay"
+- link: "/datadog_cloudcraft/overlays/ccm/"
+ tag: "Documentation"
+ text: "Cloud Cost Management overlay"
+---
+
+## Overview
+
+The Infrastructure overlay provides a broad overview of your cloud environment by grouping resources into Account, Region, and VPC. This is the default view when opening a Cloudcraft diagram.
+
+{{< img src="datadog_cloudcraft/infra_overlay_4.png" alt="Infrastructure overlay in Cloudcraft." style="width:100%;" >}}
+
+## Use cases
+
+The Infrastructure overlay is ideal for:
+
+- Generating architecture diagrams for documentation or presentations
+- Troubleshooting connectivity and resource relationships
+- Conducting high-level architecture reviews
+- Onboarding team members to your cloud environment
+
+## Resource grouping
+
+Resources are organized in a hierarchical structure:
+
+- **Account**: Top-level grouping by AWS account
+- **Region**: Resources grouped by geographic region within each account
+- **VPC**: Resources grouped by Virtual Private Cloud within each region
+
+This hierarchy helps you understand how resources are distributed across your cloud infrastructure.
+
+## Interact with resources
+
+Click any resource to open a side panel with additional details, including:
+
+- Resource type and name
+- Associated tags
+- Links to related Datadog views
+
+## Excluded components
+
+To reduce visual clutter and highlight the most important parts of your architecture, the Infrastructure overlay excludes certain components by default:
+
+- EBS volumes
+- NAT Gateways
+- Transit Gateways
+
+These components are still part of your infrastructure but are hidden to keep the diagram focused on core resources.
+
+## Further reading
+
+{{< partial name="whats-next/whats-next.html" >}}
diff --git a/content/en/datadog_cloudcraft/overlays/observability.md b/content/en/datadog_cloudcraft/overlays/observability.md
new file mode 100644
index 00000000000..f997321b8dd
--- /dev/null
+++ b/content/en/datadog_cloudcraft/overlays/observability.md
@@ -0,0 +1,70 @@
+---
+title: Observability
+description: "Use the Observability overlay in Cloudcraft to see where the Datadog Agent is installed and which features are enabled per host."
+further_reading:
+- link: "/datadog_cloudcraft/overlays/infrastructure/"
+ tag: "Documentation"
+ text: "Infrastructure overlay"
+- link: "/datadog_cloudcraft/overlays/security/"
+ tag: "Documentation"
+ text: "Security overlay"
+- link: "/datadog_cloudcraft/overlays/ccm/"
+ tag: "Documentation"
+ text: "Cloud Cost Management overlay"
+- link: "/agent/fleet_automation/"
+ tag: "Documentation"
+ text: "Fleet Automation"
+---
+
+## Overview
+
+The Observability overlay shows where the Datadog Agent is installed and what features are enabled per host, such as Application Performance Monitoring (APM), Cloud Network Monitoring (CNM), Log Management, and more. This helps you to assess visibility gaps across your environment.
+
+## Take action on resources
+
+On the Observability overlay, you can take action on individual resources or groups of resources:
+
+- Click a single host to open a side panel with direct links to Fleet Automation, where you can deploy configurations or upgrade the Agent.
+- Click a resource group, such as a subnet or VPC, to open a side panel that allows you to apply bulk updates across all the hosts in that resource group.
+- To select multiple (but not all) hosts, hold down the Command key on Mac or the Control key on Windows while clicking on each host.
+
+{{< img src="datadog_cloudcraft/observability_overlay_with_fleet_2.mp4" alt="Observability overlay in Cloudcraft, clicking on a resource group, and opening the side panel to display the bulk update feature." video=true >}}
+
+## View Datadog coverage
+
+In the bottom left legend, the **View Datadog coverage by** dropdown allows you to inspect the installation status for specific features. Each row shows:
+
+- Feature name (for example, APM, Logs, CNM)
+- Numerical coverage: X / Y (for example, 16/35), where:
+ - X is the number of resources with that feature enabled
+ - Y is the total number of relevant resources in the current view or filter
+
+### Legend
+
+| Pin Color | Description |
+|-----------|-----------------------------------------------------------|
+| Green | Agent and feature are both enabled |
+| Gray | Feature is not enabled |
+| Yellow | Agent is installed but needs an upgrade to enable all features |
+
+### Tracked features
+
+The observability overlay tracks coverage for the following products:
+
+| Feature | Description |
+|-------------------|--------------------------------------------------------------------|
+| Agent version | Verifies if the Datadog Agent is installed and its version |
+| APM | Application Performance Monitoring (traces collected) |
+| CNM | Cloud Network Monitoring coverage |
+| Logs | Log Management collection status |
+| CWS | Cloud Workload Protection coverage |
+| CSPM | Cloud Security Misconfigurations coverage |
+| Process | Process monitoring enabled |
+| CSM VM Hosts | Coverage of Cloud Security Vulnerabilities on hosts |
+| CSM VM Containers | Coverage of Cloud Security Vulnerabilities on containers |
+| USM | Coverage of Universal Service Monitoring |
+
+## Further reading
+
+{{< partial name="whats-next/whats-next.html" >}}
+
diff --git a/content/en/datadog_cloudcraft/overlays/security.md b/content/en/datadog_cloudcraft/overlays/security.md
new file mode 100644
index 00000000000..83e60af8c08
--- /dev/null
+++ b/content/en/datadog_cloudcraft/overlays/security.md
@@ -0,0 +1,55 @@
+---
+title: Security
+description: "Use the Security overlay in Cloudcraft to identify security exposures, misconfigurations, and vulnerabilities in your architecture."
+further_reading:
+- link: "/datadog_cloudcraft/overlays/infrastructure/"
+ tag: "Documentation"
+ text: "Infrastructure overlay"
+- link: "/datadog_cloudcraft/overlays/observability/"
+ tag: "Documentation"
+ text: "Observability overlay"
+- link: "/datadog_cloudcraft/overlays/ccm/"
+ tag: "Documentation"
+ text: "Cloud Cost Management overlay"
+- link: "/security/"
+ tag: "Documentation"
+ text: "Cloud Security"
+---
+
+## Overview
+
+The Security overlay highlights potential security exposures in your architecture, grouping resources by Region, VPC, and Security Group. It displays security findings detected by Cloud Security, helping you:
+
+- Identify security issues directly in infrastructure diagrams
+- Analyze findings in context, so you can prioritize remediation:
+ - Misconfigurations
+ - Identity risks
+ - Sensitive data (S3 buckets only)
+- Assess your security posture before deploying applications
+
+This view is ideal for mapping attack surfaces during penetration tests or security audits. To keep the diagram focused, components like EBS volumes and NAT Gateways are excluded.
+
+## Investigate misconfigurations and identity risks
+
+By default, the security overlay shows Critical, High, and Medium severity misconfigurations or identity risks, which you can filter in the legend.
+
+You can click on any resource that has findings to open a side panel with more details, allowing deeper investigation without leaving the diagram. Click **Investigate** to get more context about the finding and learn how to remediate it.
+
+{{< img src="datadog_cloudcraft/overlays/cloudcraft_security_overlay_misconfigurations_2.png" alt="Security overlay in Cloudcraft with the misconfigurations filter applied in the collapsible legend in the bottom of the screen, and highlighting the Investigate button" style="width:100%;" >}}
+
+## Investigate sensitive data
+
+You can view sensitive data matches for your S3 buckets. Click a resource with matches to learn more about the bucket's sensitive data matches. Then, hover over a filename and click its **Inspect in AWS** button.
+
+{{< img src="datadog_cloudcraft/overlays/cloudcraft_security_overlay_sensitive_data_2.png" alt="Security overlay in Cloudcraft with the sensitive data filter applied, highlighting the collapsible legend in the bottom left of the screen, and the Inspect in AWS button on the side panel." style="width:100%;" >}}
+
+## Investigate vulnerabilities
+
+View security vulnerability matches associated with your EC2 instances. Click a resource that has a matching vulnerability. This opens a side panel which provides detailed vulnerability data for a selected EC2 instance, including severity, affected packages, and exploit status. For deeper analysis, click **Investigate** to get more context about the vulnerability and learn how to remediate it.
+
+{{< img src="datadog_cloudcraft/overlays/cloudcraft_security_vuln_2.png" alt="Security overlay in Cloudcraft with the vulnerabilities filter applied, highlighting the collapsible legend in the bottom left of the screen, and the Investigate button on the side panel." style="width:100%;" >}}
+
+## Further reading
+
+{{< partial name="whats-next/whats-next.html" >}}
+
diff --git a/static/images/datadog_cloudcraft/overlays/cloudcraft_ccm_cost_view.png b/static/images/datadog_cloudcraft/overlays/cloudcraft_ccm_cost_view.png
new file mode 100644
index 00000000000..9bab237655e
Binary files /dev/null and b/static/images/datadog_cloudcraft/overlays/cloudcraft_ccm_cost_view.png differ
diff --git a/static/images/datadog_cloudcraft/overlays/cloudcraft_ccm_overlay_5.png b/static/images/datadog_cloudcraft/overlays/cloudcraft_ccm_overlay_5.png
new file mode 100644
index 00000000000..44c4f09ded7
Binary files /dev/null and b/static/images/datadog_cloudcraft/overlays/cloudcraft_ccm_overlay_5.png differ