diff --git a/docs/cloud/reference/03_billing/01_billing_overview.md b/docs/cloud/reference/03_billing/01_billing_overview.md
index 64235e6f9ad..7ce4bceae26 100644
--- a/docs/cloud/reference/03_billing/01_billing_overview.md
+++ b/docs/cloud/reference/03_billing/01_billing_overview.md
@@ -376,4 +376,4 @@ However, combining two services in a warehouse and idling one of them helps you
## ClickPipes pricing {#clickpipes-pricing}
-For information on ClickPipes billing, please see ["ClickPipes billing"](/cloud/reference/billing/clickpipes)
+For information on ClickPipes billing, please see the dedicated ["ClickPipes billing" section](/cloud/reference/billing/clickpipes).
diff --git a/docs/cloud/reference/03_billing/02_marketplace/index.md b/docs/cloud/reference/03_billing/02_marketplace/index.md
index 4d5dc5d88c0..b6261a0e0a0 100644
--- a/docs/cloud/reference/03_billing/02_marketplace/index.md
+++ b/docs/cloud/reference/03_billing/02_marketplace/index.md
@@ -1,7 +1,7 @@
---
slug: /cloud/manage/marketplace/
-title: 'Market Place'
-description: 'Market Place Table of Contents page'
+title: 'Marketplace'
+description: 'Marketplace Table of Contents page'
keywords: ['Marketplace Billing', 'AWS', 'GCP']
doc_type: 'landing-page'
---
diff --git a/docs/cloud/reference/03_billing/03_clickpipes_billing.md b/docs/cloud/reference/03_billing/03_clickpipes/clickpipes_for_cdc.md
similarity index 60%
rename from docs/cloud/reference/03_billing/03_clickpipes_billing.md
rename to docs/cloud/reference/03_billing/03_clickpipes/clickpipes_for_cdc.md
index 10391a25229..a61deb2863d 100644
--- a/docs/cloud/reference/03_billing/03_clickpipes_billing.md
+++ b/docs/cloud/reference/03_billing/03_clickpipes/clickpipes_for_cdc.md
@@ -1,86 +1,12 @@
---
-sidebar_label: 'ClickPipes'
-slug: /cloud/reference/billing/clickpipes
-title: 'ClickPipes billing'
-description: 'Overview of ClickPipes billing'
-doc_type: 'guide'
+sidebar_label: 'PostgreSQL CDC'
+slug: /cloud/reference/billing/clickpipes/postgres-cdc
+title: 'ClickPipes for PostgreSQL CDC'
+description: 'Overview of billing for PostgreSQL CDC ClickPipes'
+doc_type: 'reference'
---
-import ClickPipesFAQ from '../../_snippets/_clickpipes_faq.md'
-
-## ClickPipes for streaming and object storage {#clickpipes-for-streaming-object-storage}
-
-This section outlines the pricing model of ClickPipes for streaming and object storage.
-
-### What does the ClickPipes pricing structure look like? {#what-does-the-clickpipes-pricing-structure-look-like}
-
-It consists of two dimensions:
-
-- **Compute**: Price **per unit per hour**.
- Compute represents the cost of running the ClickPipes replica pods whether they actively ingest data or not.
- It applies to all ClickPipes types.
-- **Ingested data**: Price **per GB**.
- The ingested data rate applies to all streaming ClickPipes
- (Kafka, Confluent, Amazon MSK, Amazon Kinesis, Redpanda, WarpStream, Azure Event Hubs)
- for the data transferred via the replica pods. The ingested data size (GB) is charged based on bytes received from the source (uncompressed or compressed).
-
-### What are ClickPipes replicas? {#what-are-clickpipes-replicas}
-
-ClickPipes ingests data from remote data sources via a dedicated infrastructure
-that runs and scales independently of the ClickHouse Cloud service.
-For this reason, it uses dedicated compute replicas.
-
-### What is the default number of replicas and their size? {#what-is-the-default-number-of-replicas-and-their-size}
-
-Each ClickPipe defaults to 1 replica that is provided with 512 MiB of RAM and 0.125 vCPU (XS).
-This corresponds to **0.0625** ClickHouse compute units (1 unit = 8 GiB RAM, 2 vCPUs).
-
-### What are the ClickPipes public prices? {#what-are-the-clickpipes-public-prices}
-
-- Compute: \$0.20 per unit per hour (\$0.0125 per replica per hour for the default replica size)
-- Ingested data: \$0.04 per GB
-
-The price for the Compute dimension depends on the **number** and **size** of replica(s) in a ClickPipe. The default replica size can be adjusted using vertical scaling, and each replica size is priced as follows:
-
-| Replica Size | Compute Units | RAM | vCPU | Price per Hour |
-|----------------------------|---------------|---------|--------|----------------|
-| Extra Small (XS) (default) | 0.0625 | 512 MiB | 0.125. | $0.0125 |
-| Small (S) | 0.125 | 1 GiB | 0.25 | $0.025 |
-| Medium (M) | 0.25 | 2 GiB | 0.5 | $0.05 |
-| Large (L) | 0.5 | 4 GiB | 1.0 | $0.10 |
-| Extra Large (XL) | 1.0 | 8 GiB | 2.0 | $0.20 |
-
-### How does it look in an illustrative example? {#how-does-it-look-in-an-illustrative-example}
-
-The following examples assume a single M-sized replica, unless explicitly mentioned.
-
-
-
- |
- 100 GB over 24h |
- 1 TB over 24h |
- 10 TB over 24h |
-
-
-
- | Streaming ClickPipe |
- (0.25 x 0.20 x 24) + (0.04 x 100) = \$5.20 |
- (0.25 x 0.20 x 24) + (0.04 x 1000) = \$41.20 |
- With 4 replicas: (0.25 x 0.20 x 24 x 4) + (0.04 x 10000) = \$404.80 |
-
-
- | Object Storage ClickPipe $^*$ |
- (0.25 x 0.20 x 24) = \$1.20 |
- (0.25 x 0.20 x 24) = \$1.20 |
- (0.25 x 0.20 x 24) = \$1.20 |
-
-
-
-
-$^1$ _Only ClickPipes compute for orchestration,
-effective data transfer is assumed by the underlying Clickhouse Service_
-
-## ClickPipes for PostgreSQL CDC {#clickpipes-for-postgresql-cdc}
+# ClickPipes for PostgreSQL CDC {#clickpipes-for-postgresql-cdc}
This section outlines the pricing model for the Postgres Change Data Capture (CDC)
connector in ClickPipes. In designing this model, the goal was to keep pricing
@@ -98,7 +24,7 @@ Pricing started being metered in monthly bills on **September 1st, 2025**
for all customers (both existing and new) using Postgres CDC ClickPipes.
:::
-### Pricing dimensions {#pricing-dimensions}
+## Pricing dimensions {#pricing-dimensions}
There are two main dimensions to pricing:
@@ -169,11 +95,6 @@ Compute is shared across both pipes
$$\$200 \text{ (ingest)} + \$146 \text{ (compute)} = \$346$$
-# ClickPipes pricing FAQ {#clickpipes-pricing-faq}
-
-Below, you will find frequently asked questions about CDC ClickPipes and streaming
-and object-based storage ClickPipes.
-
## FAQ for Postgres CDC ClickPipes {#faq-postgres-cdc-clickpipe}
@@ -256,8 +177,4 @@ existing monthly ClickHouse Cloud spend post trial. Actual costs may vary
depending on your workload—some workloads involve high data volumes with
lesser processing, while others require more processing with less data.
-
-
-## FAQ for streaming and object storage ClickPipes {#faq-streaming-and-object-storage}
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/docs/cloud/reference/03_billing/03_clickpipes/clickpipes_for_streaming_and_object_storage.md b/docs/cloud/reference/03_billing/03_clickpipes/clickpipes_for_streaming_and_object_storage.md
new file mode 100644
index 00000000000..fab2fa5e37c
--- /dev/null
+++ b/docs/cloud/reference/03_billing/03_clickpipes/clickpipes_for_streaming_and_object_storage.md
@@ -0,0 +1,85 @@
+---
+sidebar_label: 'Streaming and object storage'
+slug: /cloud/reference/billing/clickpipes/streaming-and-object-storage
+title: 'ClickPipes for streaming and object storage'
+description: 'Overview of billing for streaming and object storage ClickPipes'
+doc_type: 'reference'
+---
+
+import ClickPipesFAQ from '../../../_snippets/_clickpipes_faq.md'
+
+# ClickPipes for streaming and object storage {#clickpipes-for-streaming-object-storage}
+
+This section outlines the pricing model of ClickPipes for streaming and object storage.
+
+## What does the ClickPipes pricing structure look like? {#what-does-the-clickpipes-pricing-structure-look-like}
+
+It consists of two dimensions:
+
+- **Compute**: Price **per unit per hour**.
+ Compute represents the cost of running the ClickPipes replica pods whether they actively ingest data or not.
+ It applies to all ClickPipes types.
+- **Ingested data**: Price **per GB**.
+ The ingested data rate applies to all streaming ClickPipes
+ (Kafka, Confluent, Amazon MSK, Amazon Kinesis, Redpanda, WarpStream, Azure Event Hubs)
+ for the data transferred via the replica pods. The ingested data size (GB) is charged based on bytes received from the source (uncompressed or compressed).
+
+## What are ClickPipes replicas? {#what-are-clickpipes-replicas}
+
+ClickPipes ingests data from remote data sources via a dedicated infrastructure
+that runs and scales independently of the ClickHouse Cloud service.
+For this reason, it uses dedicated compute replicas.
+
+## What is the default number of replicas and their size? {#what-is-the-default-number-of-replicas-and-their-size}
+
+Each ClickPipe defaults to 1 replica that is provided with 512 MiB of RAM and 0.125 vCPU (XS).
+This corresponds to **0.0625** ClickHouse compute units (1 unit = 8 GiB RAM, 2 vCPUs).
+
+## What are the ClickPipes public prices? {#what-are-the-clickpipes-public-prices}
+
+- Compute: \$0.20 per unit per hour (\$0.0125 per replica per hour for the default replica size)
+- Ingested data: \$0.04 per GB
+
+The price for the Compute dimension depends on the **number** and **size** of replica(s) in a ClickPipe. The default replica size can be adjusted using vertical scaling, and each replica size is priced as follows:
+
+| Replica Size | Compute Units | RAM | vCPU | Price per Hour |
+|----------------------------|---------------|---------|--------|----------------|
+| Extra Small (XS) (default) | 0.0625 | 512 MiB | 0.125. | $0.0125 |
+| Small (S) | 0.125 | 1 GiB | 0.25 | $0.025 |
+| Medium (M) | 0.25 | 2 GiB | 0.5 | $0.05 |
+| Large (L) | 0.5 | 4 GiB | 1.0 | $0.10 |
+| Extra Large (XL) | 1.0 | 8 GiB | 2.0 | $0.20 |
+
+## How does it look in an illustrative example? {#how-does-it-look-in-an-illustrative-example}
+
+The following examples assume a single M-sized replica, unless explicitly mentioned.
+
+
+
+ |
+ 100 GB over 24h |
+ 1 TB over 24h |
+ 10 TB over 24h |
+
+
+
+ | Streaming ClickPipe |
+ (0.25 x 0.20 x 24) + (0.04 x 100) = \$5.20 |
+ (0.25 x 0.20 x 24) + (0.04 x 1000) = \$41.20 |
+ With 4 replicas: (0.25 x 0.20 x 24 x 4) + (0.04 x 10000) = \$404.80 |
+
+
+ | Object Storage ClickPipe $^*$ |
+ (0.25 x 0.20 x 24) = \$1.20 |
+ (0.25 x 0.20 x 24) = \$1.20 |
+ (0.25 x 0.20 x 24) = \$1.20 |
+
+
+
+
+$^1$ _Only ClickPipes compute for orchestration,
+effective data transfer is assumed by the underlying Clickhouse Service_
+
+## FAQ for streaming and object storage ClickPipes {#faq-streaming-and-object-storage}
+
+
\ No newline at end of file
diff --git a/docs/cloud/reference/03_billing/03_clickpipes/index.md b/docs/cloud/reference/03_billing/03_clickpipes/index.md
new file mode 100644
index 00000000000..cb3da587a4a
--- /dev/null
+++ b/docs/cloud/reference/03_billing/03_clickpipes/index.md
@@ -0,0 +1,18 @@
+---
+slug: /cloud/reference/billing/clickpipes
+title: 'ClickPipes'
+description: 'ClickPipes billing'
+keywords: ['ClickPipes Billing']
+doc_type: 'reference'
+---
+
+:::note
+Usage is free for MySQL and MongoDB CDC ClickPipes before reaching General Availability (GA). Customers will be notified ahead of GA launches to review and optimize their ClickPipes usage.
+:::
+
+[ClickPipes](/integrations/clickpipes) billing is based on **compute usage** and **ingested data**. For more information on the pricing model for each category, see the dedicated billing pages:
+
+| Page | Description |
+|---------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [ClickPipes for Postgres CDC](/cloud/reference/billing/clickpipes/postgres-cdc) | Pricing for PostgreSQL CDC ClickPipes. |
+| [ClickPipes for streaming and object storage](/cloud/reference/billing/clickpipes/streaming-and-object-storage) | Pricing for streaming and object storage ClickPipes. |
diff --git a/docs/cloud/reference/03_billing/05_network-data-transfer.mdx b/docs/cloud/reference/03_billing/04_network-data-transfer.mdx
similarity index 100%
rename from docs/cloud/reference/03_billing/05_network-data-transfer.mdx
rename to docs/cloud/reference/03_billing/04_network-data-transfer.mdx
diff --git a/docs/cloud/reference/03_billing/04_payment-thresholds.md b/docs/cloud/reference/03_billing/05_payment-thresholds.md
similarity index 100%
rename from docs/cloud/reference/03_billing/04_payment-thresholds.md
rename to docs/cloud/reference/03_billing/05_payment-thresholds.md
diff --git a/vercel.json b/vercel.json
index 3c60347cb72..ee9b783ef10 100644
--- a/vercel.json
+++ b/vercel.json
@@ -2828,12 +2828,12 @@
},
{
"source": "/docs/cloud/manage/billing/overview#clickpipes-for-postgres-cdc",
- "destination": "/docs/cloud/reference/billing/clickpipes#clickpipes-for-postgresql-cdc",
+ "destination": "/docs/cloud/reference/billing/clickpipes/postgresql-cdc",
"permanent": true
},
{
"source": "/docs/cloud/manage/billing/overview#clickpipes-for-streaming-object-storage",
- "destination": "/docs/cloud/reference/billing/clickpipes#clickpipes-for-streaming-object-storage",
+ "destination": "/docs/cloud/reference/billing/clickpipes/streaming-and-object-storage",
"permanent": true
},
{