diff --git a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
index 16e9cd7d1f7..2b7d9e57a0f 100644
--- a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
+++ b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
@@ -2551,6 +2551,32 @@ export const platform: NavMenuConstant = {
name: 'Credits',
url: '/guides/platform/credits' as `/${string}`,
},
+ {
+ name: 'AWS Marketplace',
+ url: '/guides/platform/aws-marketplace',
+ items: [
+ {
+ name: 'Getting Started',
+ url: '/guides/platform/aws-marketplace/getting-started',
+ },
+ {
+ name: 'Account Setup',
+ url: '/guides/platform/aws-marketplace/account-setup',
+ },
+ {
+ name: 'Manage your subscription',
+ url: '/guides/platform/aws-marketplace/manage-your-subscription',
+ },
+ {
+ name: 'Invoices',
+ url: '/guides/platform/aws-marketplace/invoices',
+ },
+ {
+ name: 'FAQ',
+ url: '/guides/platform/aws-marketplace/faq',
+ },
+ ],
+ },
{
name: 'Billing FAQ',
url: '/guides/platform/billing-faq' as `/${string}`,
diff --git a/apps/docs/content/guides/platform/aws-marketplace.mdx b/apps/docs/content/guides/platform/aws-marketplace.mdx
new file mode 100644
index 00000000000..0d9c1b3ab76
--- /dev/null
+++ b/apps/docs/content/guides/platform/aws-marketplace.mdx
@@ -0,0 +1,25 @@
+---
+id: 'aws-marketplace'
+title: 'AWS Marketplace'
+---
+
+You can purchase Supabase through the AWS Marketplace. Buying through AWS Marketplace can mean simpler billing, faster progress toward your AWS spend commitments, and centralized purchasing across all your AWS accounts. Start the purchase process from our marketplace [product page](https://aws.amazon.com/marketplace/pp/prodview-zjciuce2qsb3q).
+
+When you make a purchase on AWS Marketplace, AWS will calculate sales taxes, VAT, GST, service tax, etc. (“Indirect Taxes”), if applicable, based on the location of your AWS account. You can find more details in the [AWS tax help guide](https://aws.amazon.com/tax-help/marketplace-buyers/).
+
+### Plans available through the AWS Marketplace
+
+- Free Plan: not available
+- Pro Plan: available, self-serve
+- Team Plan: available, self-serve
+- Enterprise Plan: available, via AWS Marketplace Private Offer. [Contact us](https://forms.supabase.com/enterprise) for more information.
+
+## More information
+
+- Implications of managing your Supabase organization through the AWS Marketplace. Refer to the [Account Setup guide](./aws-marketplace/account-setup#implications-of-linking-a-supabase-organization-to-a-marketplace-subscription).
+- [AWS Marketplace FAQ](./aws-marketplace/faq)
+- General guidance on using the AWS Marketplace as a buyer. Refer to the [AWS documentation](https://docs.aws.amazon.com/marketplace/latest/buyerguide/using-aws-marketplace-as-a-subscriber.html).
+
+## Next steps
+
+- Purchase Supabase through the AWS Marketplace. Refer to the [Getting Started guide](./aws-marketplace/getting-started).
diff --git a/apps/docs/content/guides/platform/aws-marketplace/account-setup.mdx b/apps/docs/content/guides/platform/aws-marketplace/account-setup.mdx
new file mode 100644
index 00000000000..2eea2f46856
--- /dev/null
+++ b/apps/docs/content/guides/platform/aws-marketplace/account-setup.mdx
@@ -0,0 +1,39 @@
+---
+id: 'account-setup'
+title: 'Account Setup'
+---
+
+After purchasing a Supabase subscription on the AWS Marketplace, the next and final step is to link the newly purchased subscription to a Supabase organization. This can either be an existing organization or a newly created one.
+
+An AWS Marketplace subscription is linked to exactly one Supabase organization. If you want to manage multiple organizations through the AWS Marketplace, you must purchase a separate marketplace subscription for each organization.
+
+
+
+## Implications of linking a Supabase organization to a marketplace subscription
+
+- The billing details from your AWS account, such as the billing address and tax ID, are used. These details are managed through the [AWS Billing and Cost Management console](https://console.aws.amazon.com/billing).
+- The subscription plan is managed through the AWS Marketplace. You can read more about this in the [Manage your subscription](./manage-your-subscription#manage-your-subscription-plan) guide.
+- Charges will come from AWS rather than Supabase, using the default payment method set in your AWS account.
+- The [Spend Cap](/docs/guides/platform/cost-control#spend-cap) for the organization is disabled. The Spend Cap is not available for organizations managed through AWS.
+- When you downgrade your plan to the Free Plan, all projects within the organization will be paused if you exceed the [free projects limit](/docs/guides/platform/billing-on-supabase#free-plan).
+
+### Linking an existing Supabase organization
+
+Linking an existing organization will result in the following:
+
+- The organization will be upgraded or downgraded to the plan purchased on the AWS Marketplace.
+- The organization’s billing cycle will be adjusted. The start date will be set to the date your marketplace subscription became active.
+- The credit card you have on file with Supabase may receive a closing charge. This charge covers usage costs incurred up until the point when the marketplace subscription became active.
+
+## Prerequisites for linking a Supabase organization to a marketplace subscription
+
+- The Supabase user must have the Owner or Admin role
+- There must be no overdue invoices within the organization
+- The organization must not already be managed through another marketplace (e.g. Vercel Marketplace)
diff --git a/apps/docs/content/guides/platform/aws-marketplace/faq.mdx b/apps/docs/content/guides/platform/aws-marketplace/faq.mdx
new file mode 100644
index 00000000000..14e25ae8c49
--- /dev/null
+++ b/apps/docs/content/guides/platform/aws-marketplace/faq.mdx
@@ -0,0 +1,21 @@
+---
+id: 'aws-marketplace-faq'
+title: 'AWS Marketplace FAQ'
+---
+
+#### The payment for completing the subscription on the AWS Marketplace fails.
+
+For more information on payment errors, refer to the [AWS documentation](https://docs.aws.amazon.com/marketplace/latest/buyerguide/buyer-paying-for-products.html#payment-methods).
+
+#### How can the Spend Cap for an organization managed through the AWS Marketplace be enabled?
+
+For organizations on the Pro Plan that are managed through the AWS Marketplace, the Spend Cap is not available.
+In your AWS account, you can set up a budget for marketplace purchases (or for a specific marketplace product) and receive notifications once the budget is exceeded.
+
+#### How to cancel your AWS Marketplace subscription
+
+You can cancel your marketplace subscription within 48 hours of purchase. To do so, open a support ticket via the Supabase dashboard. After the 48-hour period, cancellation is no longer possible. If you cancel within the first 48 hours, the upfront charge for the fixed subscription fee will be refunded. Any usage costs incurred up to that point will not be refunded.
+
+#### Does purchasing Supabase through the AWS Marketplace count toward your AWS spend commitment?
+
+Yes, marketplace purchases do count toward the spend commitment.
diff --git a/apps/docs/content/guides/platform/aws-marketplace/getting-started.mdx b/apps/docs/content/guides/platform/aws-marketplace/getting-started.mdx
new file mode 100644
index 00000000000..6db2910d231
--- /dev/null
+++ b/apps/docs/content/guides/platform/aws-marketplace/getting-started.mdx
@@ -0,0 +1,88 @@
+---
+id: 'getting-started'
+title: 'Getting Started'
+---
+
+## Before you start
+
+Depending on whether a Supabase organization is managed and billed through the AWS Marketplace or directly through the Supabase platform, there are differences. To help you make an informed decision about which approach is better suited for your needs, you can find an overview of these differences in the table below.
+
+| Feature/Aspect | Managed via AWS Marketplace | Managed directly via Supabase platform |
+| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Available Plans | Pro, Team, Enterprise | Free, Pro, Team, Enterprise |
+| Mid-cycle downgrades | No | Yes |
+| Cost Control | Spend Cap not available | Spend Cap available |
+| Downgrade Behaviour | If a downgrade to the Free Plan causes you to exceed the [free projects limit](/docs/guides/platform/billing-on-supabase#free-plan), all projects will be paused. | If a downgrade to the Free Plan causes you to exceed the [free projects limit](/docs/guides/platform/billing-on-supabase#free-plan), you have the option to prevent pausing by transferring projects. |
+| Invoicing | Separate invoices, one for fixed costs and one for usage costs | One invoice for both fixed costs and usage costs |
+
+## Purchase Supabase through the AWS Marketplace
+
+Purchasing Supabase through the AWS Marketplace involves two steps. First, you purchase the corresponding subscription on the marketplace. Then, to complete the setup, you must link this subscription to a Supabase organization on the Supabase platform.
+
+For more details on completing the setup and what it means to link an organization, see our [Account Setup guide](./account-setup).
+
+
+
+
+ Go to the [Supabase product page on the AWS Marketplace](https://aws.amazon.com/marketplace/pp/prodview-zjciuce2qsb3q) and click "View purchase options".
+
+
+
+
+
+ Select the desired plan (Pro Plan or Team Plan) and configure whether the subscription should automatically renew after one month.
+
+
+
+ Disabling auto-renewal means that the subscription will be downgraded to the Free Plan after one month.
+
+ If the downgrade causes you to exceed the [free projects limit](/docs/guides/platform/billing-on-supabase#free-plan), **all** projects within the organization will be paused. We do not make the decision about which projects continue to run and which are paused. You must then decide which projects you want to keep active and manually reactivate them through the Supabase dashboard.
+
+
+
+
+
+
+
+
+ Click "Subscribe" at the bottom of the page.
+
+
+
+
+
+ After the payment has been confirmed and your marketplace subscription is active, click "Set up your account" to be redirected to the Supabase platform.
+
+
+
+
+
+ Complete the setup by linking a Supabase organization to the AWS Marketplace subscription.
+
+
+
+
+
diff --git a/apps/docs/content/guides/platform/aws-marketplace/invoices.mdx b/apps/docs/content/guides/platform/aws-marketplace/invoices.mdx
new file mode 100644
index 00000000000..85c9d5a4533
--- /dev/null
+++ b/apps/docs/content/guides/platform/aws-marketplace/invoices.mdx
@@ -0,0 +1,32 @@
+---
+id: 'invoices'
+title: 'Invoices'
+---
+
+## Where to find your invoices
+
+You can view your invoices in the [AWS Billing and Cost Management console](https://console.aws.amazon.com/billing/home#/bills) under the "Bills" section.
+
+
+
+## What invoices you get from AWS
+
+You'll receive two invoices for your marketplace subscription.
+
+### Invoice 1 - charge type "subscription"
+
+- What for: The fixed subscription fee paid in advance
+- When: At the time of subscription, and in subsequent months on the same day of the month the subscription was started
+
+### Invoice 2 - charge type "usage"
+
+- What for: Usage that exceeds the quota included in the plan, or usage not covered by the plan (e.g. Custom Domain add-on, IPv4 add-on, additionally provisioned Disk IOPS).
+- When: No later than the third day of the month for the previous month. This is independent of your subscription’s billing cycle and instead covers the period from the first to the last day of the previous month.
+
+## More information
+
+- Detailed explanations of how each usage item is billed, independent of the AWS Marketplace. Refer to the [Manage Your Usage guide](../manage-your-usage).
diff --git a/apps/docs/content/guides/platform/aws-marketplace/manage-your-subscription.mdx b/apps/docs/content/guides/platform/aws-marketplace/manage-your-subscription.mdx
new file mode 100644
index 00000000000..434b89ee773
--- /dev/null
+++ b/apps/docs/content/guides/platform/aws-marketplace/manage-your-subscription.mdx
@@ -0,0 +1,63 @@
+---
+id: 'manage-your-subscription'
+title: 'Manage your subscription'
+---
+
+## Manage your subscription plan
+
+Plan changes are not made on the Supabase dashboard, but instead through the AWS Marketplace. The easiest way to navigate to the corresponding page on the marketplace is through the Supabase dashboard.
+
+1. On the [organization's billing page](/dashboard/org/_/billing), go to section **Subscription Plan**
+2. Click **Change subscription plan**
+3. On the side panel, follow the link to the AWS Marketplace
+
+### Upgrade
+
+You can upgrade your plan at any time. The new plan will be active immediately, and you will be charged a prorated amount for the remainder of the current billing cycle. The charge for the upgrade also factors in the upfront payment you have already made for your existing plan.
+
+
+
+### Downgrade
+
+Downgrades are only possible at the end of the billing cycle, not in the middle of a billing cycle.
+
+#### Downgrade to the Free Plan
+
+If you want your subscription to be downgraded to the Free Plan at the end of the current billing cycle, you need to disable auto-renewal for the marketplace subscription.
+
+
+
+If the downgrade causes you to exceed the [free projects limit](/docs/guides/platform/billing-on-supabase#free-plan), **all** projects within the organization will be paused. We do not make the decision about which projects continue to run and which are paused. You must then decide which projects you want to keep active and manually reactivate them through the Supabase dashboard.
+
+
+
+
+
+#### Downgrade to a paid plan
+
+A downgrade to a paid plan (Pro Plan / Team Plan) involves two steps.
+
+**Step 1:** Let the current subscription on the higher plan expire, meaning turn off auto-renewal
+**Step 2:** Start a new subscription on the lower plan
+
+## Manage your payment methods
+
+You can manage your payment methods through the [AWS Billing and Cost Management console](https://console.aws.amazon.com/billing).
+
+## Manage your billing details
+
+You can manage billing details, such as the billing address or tax ID, through the [AWS Billing and Cost Management console](https://console.aws.amazon.com/billing).
diff --git a/apps/docs/public/img/guides/platform/aws-marketplace-change-plan.png b/apps/docs/public/img/guides/platform/aws-marketplace-change-plan.png
new file mode 100644
index 00000000000..fcad1c5e0b2
Binary files /dev/null and b/apps/docs/public/img/guides/platform/aws-marketplace-change-plan.png differ
diff --git a/apps/docs/public/img/guides/platform/aws-marketplace-configure-auto-renewal.png b/apps/docs/public/img/guides/platform/aws-marketplace-configure-auto-renewal.png
new file mode 100644
index 00000000000..19c3fff6a59
Binary files /dev/null and b/apps/docs/public/img/guides/platform/aws-marketplace-configure-auto-renewal.png differ
diff --git a/apps/docs/public/img/guides/platform/aws-marketplace-invoices.png b/apps/docs/public/img/guides/platform/aws-marketplace-invoices.png
new file mode 100644
index 00000000000..1d00e73383c
Binary files /dev/null and b/apps/docs/public/img/guides/platform/aws-marketplace-invoices.png differ
diff --git a/apps/docs/public/img/guides/platform/aws-marketplace-listing-overview.png b/apps/docs/public/img/guides/platform/aws-marketplace-listing-overview.png
new file mode 100644
index 00000000000..18f4c4a8900
Binary files /dev/null and b/apps/docs/public/img/guides/platform/aws-marketplace-listing-overview.png differ
diff --git a/apps/docs/public/img/guides/platform/aws-marketplace-listing-purchase-options.png b/apps/docs/public/img/guides/platform/aws-marketplace-listing-purchase-options.png
new file mode 100644
index 00000000000..54801e5f988
Binary files /dev/null and b/apps/docs/public/img/guides/platform/aws-marketplace-listing-purchase-options.png differ
diff --git a/apps/docs/public/img/guides/platform/aws-marketplace-listing-subscribe.png b/apps/docs/public/img/guides/platform/aws-marketplace-listing-subscribe.png
new file mode 100644
index 00000000000..18a574c49f4
Binary files /dev/null and b/apps/docs/public/img/guides/platform/aws-marketplace-listing-subscribe.png differ
diff --git a/apps/docs/public/img/guides/platform/aws-marketplace-listing-success.png b/apps/docs/public/img/guides/platform/aws-marketplace-listing-success.png
new file mode 100644
index 00000000000..ffd9ff83ff0
Binary files /dev/null and b/apps/docs/public/img/guides/platform/aws-marketplace-listing-success.png differ
diff --git a/apps/docs/public/img/guides/platform/aws-marketplace-onboarding-page--dark.png b/apps/docs/public/img/guides/platform/aws-marketplace-onboarding-page--dark.png
new file mode 100644
index 00000000000..da1d3a20a2c
Binary files /dev/null and b/apps/docs/public/img/guides/platform/aws-marketplace-onboarding-page--dark.png differ
diff --git a/apps/docs/public/img/guides/platform/aws-marketplace-onboarding-page--light.png b/apps/docs/public/img/guides/platform/aws-marketplace-onboarding-page--light.png
new file mode 100644
index 00000000000..9b78e4f44af
Binary files /dev/null and b/apps/docs/public/img/guides/platform/aws-marketplace-onboarding-page--light.png differ
diff --git a/apps/docs/public/img/guides/platform/aws-marketplace-onboarding-page-extended--dark.png b/apps/docs/public/img/guides/platform/aws-marketplace-onboarding-page-extended--dark.png
new file mode 100644
index 00000000000..1ee94172cbb
Binary files /dev/null and b/apps/docs/public/img/guides/platform/aws-marketplace-onboarding-page-extended--dark.png differ
diff --git a/apps/docs/public/img/guides/platform/aws-marketplace-onboarding-page-extended--light.png b/apps/docs/public/img/guides/platform/aws-marketplace-onboarding-page-extended--light.png
new file mode 100644
index 00000000000..8d351159b6d
Binary files /dev/null and b/apps/docs/public/img/guides/platform/aws-marketplace-onboarding-page-extended--light.png differ
diff --git a/supa-mdx-lint/Rule001HeadingCase.toml b/supa-mdx-lint/Rule001HeadingCase.toml
index bb46b1ff458..630f771792d 100644
--- a/supa-mdx-lint/Rule001HeadingCase.toml
+++ b/supa-mdx-lint/Rule001HeadingCase.toml
@@ -18,6 +18,7 @@ may_uppercase = [
"Auth",
"Auth0",
"Auth0 Actions?",
+ "AWS Marketplace",
"Azure",
"Azure Developers?",
"BigQuery",
@@ -126,6 +127,7 @@ may_uppercase = [
"Magic Link",
"Mailpit",
"Management API",
+ "Marketplace",
"Mixpeek",
"Mixpeek Embed",
"MySQL",