diff --git a/apps/studio/components/ui/PartnerManagedResource.tsx b/apps/studio/components/ui/PartnerManagedResource.tsx
index c5c28b3844c..2acd744ed9a 100644
--- a/apps/studio/components/ui/PartnerManagedResource.tsx
+++ b/apps/studio/components/ui/PartnerManagedResource.tsx
@@ -3,9 +3,10 @@ import { ExternalLink } from 'lucide-react'
 import { useVercelRedirectQuery } from 'data/integrations/vercel-redirect-query'
 import { Alert_Shadcn_, AlertTitle_Shadcn_, Button } from 'ui'
 import PartnerIcon from './PartnerIcon'
+import { MANAGED_BY, ManagedBy } from 'lib/constants/infrastructure'
 
 interface PartnerManagedResourceProps {
-  partner: 'vercel-marketplace' | 'aws-marketplace'
+  partner: ManagedBy
   resource: string
   cta?: {
     installationId?: string
@@ -15,11 +16,13 @@ interface PartnerManagedResourceProps {
 }
 
 export const PARTNER_TO_NAME = {
-  'vercel-marketplace': 'Vercel Marketplace',
-  'aws-marketplace': 'AWS Marketplace',
+  [MANAGED_BY.VERCEL_MARKETPLACE]: 'Vercel Marketplace',
+  [MANAGED_BY.AWS_MARKETPLACE]: 'AWS Marketplace',
+  [MANAGED_BY.SUPABASE]: 'Supabase',
 } as const
 
 function PartnerManagedResource({ partner, resource, cta }: PartnerManagedResourceProps) {
+  const isManagedBySupabase = partner === MANAGED_BY.SUPABASE
   const ctaEnabled = cta !== undefined
 
   const { data, isLoading, isError } = useVercelRedirectQuery(
@@ -27,10 +30,12 @@ function PartnerManagedResource({ partner, resource, cta }: PartnerManagedResour
       installationId: cta?.installationId,
     },
     {
-      enabled: ctaEnabled,
+      enabled: ctaEnabled && !isManagedBySupabase,
     }
   )
 
+  if (isManagedBySupabase) return null
+
   const ctaUrl = (data?.url ?? '') + (cta?.path ?? '')
 
   return (
diff --git a/apps/studio/data/organizations/organizations-query.ts b/apps/studio/data/organizations/organizations-query.ts
index 1e6b8d1c35d..3ddbac115d3 100644
--- a/apps/studio/data/organizations/organizations-query.ts
+++ b/apps/studio/data/organizations/organizations-query.ts
@@ -5,6 +5,7 @@ import { get, handleError } from 'data/fetchers'
 import { useProfile } from 'lib/profile'
 import type { Organization, ResponseError } from 'types'
 import { organizationKeys } from './keys'
+import { MANAGED_BY, ManagedBy } from 'lib/constants/infrastructure'
 
 export type OrganizationBase = components['schemas']['OrganizationResponse']
 
@@ -12,11 +13,25 @@ export function castOrganizationResponseToOrganization(org: OrganizationBase): O
   return {
     ...org,
     billing_email: org.billing_email ?? 'Unknown',
-    managed_by: org.slug.startsWith('vercel_icfg_') ? 'vercel-marketplace' : 'supabase',
+    managed_by: getManagedBy(org),
     partner_id: org.slug.startsWith('vercel_') ? org.slug.replace('vercel_', '') : undefined,
   }
 }
 
+function getManagedBy(org: OrganizationBase): ManagedBy {
+  switch (org.billing_partner) {
+    case 'vercel_marketplace':
+      return MANAGED_BY.VERCEL_MARKETPLACE
+    // TODO(ignacio): Uncomment this when we've deployed the AWS Marketplace new slug
+    // case 'aws_marketplace':
+    // return MANAGED_BY.AWS_MARKETPLACE
+    case 'aws':
+      return MANAGED_BY.AWS_MARKETPLACE
+    default:
+      return MANAGED_BY.SUPABASE
+  }
+}
+
 export async function getOrganizations({
   signal,
   headers,
diff --git a/apps/studio/lib/constants/infrastructure.ts b/apps/studio/lib/constants/infrastructure.ts
index 78a76521753..4d2d4ffbf66 100644
--- a/apps/studio/lib/constants/infrastructure.ts
+++ b/apps/studio/lib/constants/infrastructure.ts
@@ -11,6 +11,14 @@ export const AWS_REGIONS_DEFAULT =
 // TO DO, change default to US region for prod
 export const FLY_REGIONS_DEFAULT = FLY_REGIONS.SOUTHEAST_ASIA
 
+export const MANAGED_BY = {
+  VERCEL_MARKETPLACE: 'vercel-marketplace',
+  AWS_MARKETPLACE: 'aws-marketplace',
+  SUPABASE: 'supabase',
+}
+
+export type ManagedBy = (typeof MANAGED_BY)[keyof typeof MANAGED_BY]
+
 export const PRICING_TIER_LABELS_ORG = {
   FREE: 'Free - $0/month',
   PRO: 'Pro - $25/month',
diff --git a/apps/studio/types/base.ts b/apps/studio/types/base.ts
index 53d471ae055..04847b64c66 100644
--- a/apps/studio/types/base.ts
+++ b/apps/studio/types/base.ts
@@ -2,9 +2,10 @@ import { PermissionAction } from '@supabase/shared-types/out/constants'
 import { OrganizationBase } from 'data/organizations/organizations-query'
 import { PlanId } from 'data/subscriptions/types'
 import jsonLogic from 'json-logic-js'
+import { ManagedBy } from 'lib/constants/infrastructure'
 
 export interface Organization extends OrganizationBase {
-  managed_by: 'supabase' | 'vercel-marketplace' | 'aws-marketplace'
+  managed_by: ManagedBy
   partner_id?: string
   plan: { id: PlanId; name: string }
 }