diff --git a/src/lib/components/deployments/compute-badge.svelte b/src/lib/components/deployments/compute-badge.svelte
index 1d6b1b9306..958f8a0c7f 100644
--- a/src/lib/components/deployments/compute-badge.svelte
+++ b/src/lib/components/deployments/compute-badge.svelte
@@ -1,6 +1,9 @@
 <script lang="ts">
+  import {
+    COMPUTE_PROVIDERS,
+    computeProviderFromType,
+  } from '$lib/components/workers/serverless-worker-form/compute-providers';
   import Tooltip from '$lib/holocene/tooltip.svelte';
-  import { IconAwsColor, type IconComponent, IconGcpColor } from '$lib/io/icon';
   import type { ComputeStatus } from '$lib/types/deployments';
   import {
     connectionStateColor,
@@ -9,20 +12,13 @@
     deriveConnectionStatus,
   } from '$lib/utilities/connection-status';
 
-  const CONFIG: Record<string, { Icon: IconComponent; label: string }> = {
-    // Brand marks, not monochrome glyphs: these identify a vendor, so they
-    // keep their own colour on either theme.
-    'aws-lambda': { Icon: IconAwsColor, label: 'Lambda' },
-    'aws-agentcore': { Icon: IconAwsColor, label: 'AgentCore' },
-    'gcp-cloud-run': { Icon: IconGcpColor, label: 'Cloud Run' },
-  };
-
   let {
     type,
     computeStatus,
   }: { type: string | undefined; computeStatus?: ComputeStatus } = $props();
 
-  const config = $derived(type ? CONFIG[type] : undefined);
+  const provider = $derived(computeProviderFromType(type));
+  const config = $derived(provider ? COMPUTE_PROVIDERS[provider] : undefined);
   const state = $derived(
     computeStatus ? deriveConnectionStatus(computeStatus) : undefined,
   );
@@ -33,9 +29,9 @@
     class="inline-flex min-w-24 items-center justify-center gap-2 border border-primary px-1"
   >
     {#if config}
-      {@const ProviderIcon = config.Icon}
+      {@const ProviderIcon = config.icon}
       <ProviderIcon />
-      <p>{config.label}</p>
+      <p>{config.badgeLabel}</p>
     {/if}
     {#if state}
       <span
diff --git a/src/lib/components/workers/serverless-worker-form/compute-fields.svelte b/src/lib/components/workers/serverless-worker-form/compute-fields.svelte
index a0e2a1e9f6..c4a07f253f 100644
--- a/src/lib/components/workers/serverless-worker-form/compute-fields.svelte
+++ b/src/lib/components/workers/serverless-worker-form/compute-fields.svelte
@@ -22,17 +22,20 @@
     hasCloudRunImpersonatorPlaceholder,
     interpolateCloudRunTerraformTemplate,
   } from './cloud-run-terraform';
+  import {
+    COMPUTE_PROVIDERS,
+    computeProviderFromType,
+    type ComputeProviderTemplates,
+    type ComputeProviderValue,
+    defaultComputeProviderTemplates,
+    TERRAFORM_MODULES,
+  } from './compute-providers';
   import { GCP_REGIONS } from './gcp-regions';
-  import defaultAgentCoreTerraformTemplate from './serverless-worker-agentcore.tf?raw';
-  import defaultCloudRunTerraformTemplate from './serverless-worker-cloud-run.tf?raw';
-  import defaultTerraformTemplate from './serverless-worker-lambda.tf?raw';
   import {
     defaultScaleDownStabilization,
     interpolateTerraformTemplate,
     scaleDownStabilizationUnits,
   } from './shared';
-  import agentCoreCfnTemplate from './temporal-agentcore-role.yaml?raw';
-  import cfnTemplate from './temporal-worker-role.yaml?raw';
 
   interface Props {
     provider?: string;
@@ -54,13 +57,14 @@
     scaleUpBacklogThreshold?: number;
     maxWorkerLifetimeMs?: number;
     metricsPollIntervalMs?: number;
-    cfnTemplateUrl?: string;
-    cfnTemplate?: string;
-    terraformTemplate?: string;
-    cloudRunTerraformTemplate?: string;
-    agentCoreCfnTemplateUrl?: string;
-    agentCoreCfnTemplate?: string;
-    agentCoreTerraformTemplate?: string;
+    /**
+     * The templates offered per provider. Defaults to the ones bundled here,
+     * which is what a self-hosted deployment wants. A consumer overrides them
+     * by passing a full map: it is exhaustive over ComputeProviderValue, so
+     * adding a provider fails the consumer's type check until it supplies
+     * templates for it.
+     */
+    templates?: Record<ComputeProviderValue, ComputeProviderTemplates>;
     errors?: {
       lambdaArn?: string[];
       agentCoreEndpointArn?: string[];
@@ -102,45 +106,44 @@
     scaleUpBacklogThreshold = $bindable(),
     maxWorkerLifetimeMs = $bindable(),
     metricsPollIntervalMs = $bindable(),
-    cfnTemplateUrl,
-    cfnTemplate: cfnTemplateProp,
-    terraformTemplate,
-    cloudRunTerraformTemplate,
-    agentCoreCfnTemplateUrl,
-    agentCoreCfnTemplate: agentCoreCfnTemplateProp,
-    agentCoreTerraformTemplate,
+    templates = defaultComputeProviderTemplates,
     errors = {},
   }: Props = $props();
 
   // Both AWS providers assume a role, and the role each needs is different:
   // one grants lambda:InvokeFunction, the other bedrock-agentcore:
   // InvokeAgentRuntime. Handing out the Lambda role for AgentCore would
-  // produce a role that cannot invoke a runtime, so the helper follows the
+  // produce a role that cannot invoke a runtime, so the templates follow the
   // selected provider rather than being shared.
   const isAgentCore = $derived(provider === 'agentcore');
-
-  const resolvedCfnTemplate = $derived(
-    isAgentCore
-      ? (agentCoreCfnTemplateProp ?? agentCoreCfnTemplate)
-      : (cfnTemplateProp ?? cfnTemplate),
+  // `provider` arrives as a form field, so it is a string until proven one of
+  // ours. Narrowing here rather than asserting keeps an unrecognised value from
+  // reading as a provider that happens to have no entry.
+  const providerValue = $derived(computeProviderFromType(provider));
+  const providerTemplates = $derived(
+    providerValue ? templates[providerValue] : undefined,
   );
+  const cloudFormation = $derived(providerTemplates?.cloudFormation);
+
+  const resolvedCfnTemplate = $derived(cloudFormation?.template ?? '');
+  // Only the key belonging to this provider's template is present, so both
+  // ARNs are passed and the absent one is a no-op.
   const resolvedTerraformTemplate = $derived(
-    isAgentCore
-      ? interpolateTerraformTemplate(
-          agentCoreTerraformTemplate ?? defaultAgentCoreTerraformTemplate,
-          { externalId: roleExternalId, agentCoreEndpointArn },
-        )
-      : interpolateTerraformTemplate(
-          terraformTemplate ?? defaultTerraformTemplate,
-          { externalId: roleExternalId, lambdaArn },
-        ),
+    interpolateTerraformTemplate(providerTemplates?.terraform ?? '', {
+      externalId: roleExternalId,
+      lambdaArn,
+      agentCoreEndpointArn,
+    }),
   );
   const terraformModuleHref = $derived(
-    `https://github.com/temporalio/terraform-modules/tree/main/modules/serverless-workers/aws/${isAgentCore ? 'agentcore' : 'lambda'}`,
+    (providerValue && COMPUTE_PROVIDERS[providerValue].terraformModuleHref) ||
+      TERRAFORM_MODULES,
   );
+  // Read from the map rather than the selected provider: the Cloud Run block
+  // renders inside its own branch, where `provider` is already 'cloud-run'.
   const resolvedCloudRunTerraformTemplate = $derived(
     interpolateCloudRunTerraformTemplate(
-      cloudRunTerraformTemplate ?? defaultCloudRunTerraformTemplate,
+      templates['cloud-run'].terraform,
       gcpProject,
     ),
   );
@@ -149,7 +152,7 @@
   );
 
   const launchStackHref = $derived.by(() => {
-    const templateUrl = isAgentCore ? agentCoreCfnTemplateUrl : cfnTemplateUrl;
+    const templateUrl = cloudFormation?.url;
 
     if (!templateUrl) {
       return 'https://console.aws.amazon.com/cloudformation/';
@@ -181,9 +184,7 @@
     const url = URL.createObjectURL(blob);
     const a = document.createElement('a');
     a.href = url;
-    a.download = isAgentCore
-      ? 'temporal-agentcore-role.yaml'
-      : 'temporal-worker-role.yaml';
+    a.download = cloudFormation?.fileName ?? 'temporal-worker-role.yaml';
     a.click();
     URL.revokeObjectURL(url);
   }
diff --git a/src/lib/components/workers/serverless-worker-form/compute-fields.test.ts b/src/lib/components/workers/serverless-worker-form/compute-fields.test.ts
index 87a555fe0b..e1d50df78a 100644
--- a/src/lib/components/workers/serverless-worker-form/compute-fields.test.ts
+++ b/src/lib/components/workers/serverless-worker-form/compute-fields.test.ts
@@ -15,6 +15,7 @@ import {
   hasCloudRunImpersonatorPlaceholder,
   interpolateCloudRunTerraformTemplate,
 } from './cloud-run-terraform';
+import { defaultComputeProviderTemplates } from './compute-providers';
 import defaultAgentCoreTerraformTemplate from './serverless-worker-agentcore.tf?raw';
 import defaultCloudRunTerraformTemplate from './serverless-worker-cloud-run.tf?raw';
 import defaultTerraformTemplate from './serverless-worker-lambda.tf?raw';
@@ -89,6 +90,7 @@ interface ComputeFieldsOptions {
   agentCoreEndpointArn?: string;
   gcpProject?: string;
   gcpServiceAccount?: string;
+  /** Overrides the Terraform template for the named provider only. */
   cloudRunTerraformTemplate?: string;
   terraformTemplate?: string;
   roleExternalId?: string;
@@ -106,6 +108,26 @@ const renderComputeFields = ({
   terraformTemplate,
   roleExternalId = '',
 }: ComputeFieldsOptions): string => {
+  // The component takes one exhaustive map now, so an override for a single
+  // provider is layered onto the defaults rather than passed as its own prop.
+  const templates = {
+    ...defaultComputeProviderTemplates,
+    ...(terraformTemplate !== undefined && {
+      [provider]: {
+        ...defaultComputeProviderTemplates[
+          provider as keyof typeof defaultComputeProviderTemplates
+        ],
+        terraform: terraformTemplate,
+      },
+    }),
+    ...(cloudRunTerraformTemplate !== undefined && {
+      'cloud-run': {
+        ...defaultComputeProviderTemplates['cloud-run'],
+        terraform: cloudRunTerraformTemplate,
+      },
+    }),
+  };
+
   const { body } = renderComponent(computeFields, {
     props: {
       provider,
@@ -115,8 +137,7 @@ const renderComputeFields = ({
       roleExternalId,
       gcpProject,
       gcpServiceAccount,
-      cloudRunTerraformTemplate,
-      terraformTemplate,
+      templates,
     },
   });
   return body;
diff --git a/src/lib/components/workers/serverless-worker-form/compute-provider-picker.svelte b/src/lib/components/workers/serverless-worker-form/compute-provider-picker.svelte
index 7820a7cdaa..1dbf1dc57d 100644
--- a/src/lib/components/workers/serverless-worker-form/compute-provider-picker.svelte
+++ b/src/lib/components/workers/serverless-worker-form/compute-provider-picker.svelte
@@ -7,14 +7,14 @@
   import RadioGroup from '$lib/holocene/radio-input/radio-group.svelte';
   import { translate } from '$lib/i18n/translate';
   import { Badge } from '$lib/io/badge';
-  import { IconAwsColor, type IconComponent, IconGcpColor } from '$lib/io/icon';
 
   import {
-    type ComputeProviderOption,
+    COMPUTE_PROVIDER_VALUES,
+    COMPUTE_PROVIDERS,
     type ComputeProviderReleaseStage,
     type ComputeProviderValue,
-    defaultReleaseStage,
-  } from './shared';
+  } from './compute-providers';
+  import { type ComputeProviderOption, defaultReleaseStage } from './shared';
 
   interface Props {
     provider?: string;
@@ -26,35 +26,11 @@
 
   const configuredProviders = untrack(() => providers);
 
-  // The brand marks, not the monochrome glyphs. These are vendor logos rather
-  // than UI icons, so they keep their own colour on either theme.
-  const providerIcon: Record<ComputeProviderValue, IconComponent> = {
-    lambda: IconAwsColor,
-    agentcore: IconAwsColor,
-    'cloud-run': IconGcpColor,
-  };
+  const providerLabel = (value: ComputeProviderValue): string =>
+    translate(COMPUTE_PROVIDERS[value].labelKey);
 
-  const providerLabel = (value: ComputeProviderValue): string => {
-    switch (value) {
-      case 'lambda':
-        return translate('workers.provider-lambda');
-      case 'agentcore':
-        return translate('workers.provider-agentcore');
-      case 'cloud-run':
-        return translate('workers.provider-cloud-run');
-    }
-  };
-
-  const providerDescription = (value: ComputeProviderValue): string => {
-    switch (value) {
-      case 'lambda':
-        return translate('workers.provider-lambda-description');
-      case 'agentcore':
-        return translate('workers.provider-agentcore-description');
-      case 'cloud-run':
-        return translate('workers.provider-cloud-run-description');
-    }
-  };
+  const providerDescription = (value: ComputeProviderValue): string =>
+    translate(COMPUTE_PROVIDERS[value].descriptionKey);
 
   const releaseStageOf = (
     option: ComputeProviderOption,
@@ -82,11 +58,9 @@
    * how Temporal Cloud offers only the providers matching the Namespace's own
    * cloud.
    */
-  const defaultProviders = $derived<ComputeProviderOption[]>([
-    { value: 'lambda' },
-    { value: 'agentcore' },
-    { value: 'cloud-run' },
-  ]);
+  const defaultProviders = $derived<ComputeProviderOption[]>(
+    COMPUTE_PROVIDER_VALUES.map((value) => ({ value })),
+  );
 
   const resolvedProviders = $derived(configuredProviders ?? defaultProviders);
   const visibleProviders = $derived(
@@ -130,7 +104,7 @@
         </span>
       {/snippet}
       {#snippet icon()}
-        {@const ProviderIcon = providerIcon[option.value]}
+        {@const ProviderIcon = COMPUTE_PROVIDERS[option.value].icon}
         <div
           class="flex h-11 w-11 items-center justify-center rounded border border-primary bg-surface-primary"
         >
diff --git a/src/lib/components/workers/serverless-worker-form/compute-providers.ts b/src/lib/components/workers/serverless-worker-form/compute-providers.ts
new file mode 100644
index 0000000000..074944eec4
--- /dev/null
+++ b/src/lib/components/workers/serverless-worker-form/compute-providers.ts
@@ -0,0 +1,175 @@
+import type { I18nKey, I18nResources } from '$lib/i18n';
+import { IconAwsColor, type IconComponent, IconGcpColor } from '$lib/io/icon';
+
+import defaultAgentCoreTerraform from './serverless-worker-agentcore.tf?raw';
+import defaultCloudRunTerraform from './serverless-worker-cloud-run.tf?raw';
+import defaultLambdaTerraform from './serverless-worker-lambda.tf?raw';
+import defaultAgentCoreCloudFormation from './temporal-agentcore-role.yaml?raw';
+import defaultLambdaCloudFormation from './temporal-worker-role.yaml?raw';
+
+/**
+ * Everything the UI knows about a compute provider, in one place.
+ *
+ * This exists because a provider used to be described in ten of them: an icon
+ * map and two label switches in the picker, a release stage map in shared.ts, a
+ * second icon-and-label map in compute-badge keyed by the wire name, an
+ * if-chain normalising those wire names in lock-compute-provider, and five raw
+ * template imports resolved through provider ternaries in compute-fields.
+ * Adding a provider meant finding all ten.
+ *
+ * Adding one now means adding an entry here. The Record is exhaustive over
+ * ComputeProviderValue, so the compiler names the gap if an entry is missing —
+ * including in a consumer that supplies its own templates.
+ */
+
+/**
+ * The order the picker offers them in. The union is derived from this tuple
+ * rather than the other way round, so the list needs no cast to stay in step.
+ */
+export const COMPUTE_PROVIDER_VALUES = [
+  'lambda',
+  'agentcore',
+  'cloud-run',
+] as const;
+
+export type ComputeProviderValue = (typeof COMPUTE_PROVIDER_VALUES)[number];
+
+/** The `providerType` the API uses, as opposed to the short name the UI uses. */
+export type ComputeProviderType =
+  | 'aws-lambda'
+  | 'aws-agentcore'
+  | 'gcp-cloud-run';
+
+export type ComputeProviderReleaseStage =
+  | 'public-preview'
+  | 'pre-release'
+  | 'generally-available';
+
+/**
+ * The infrastructure templates offered for a provider.
+ *
+ * CloudFormation is AWS-only, so a GCP provider has none. That asymmetry is
+ * modelled rather than filled in with an empty string, so the picker can ask
+ * whether a provider has a CloudFormation path instead of inferring it.
+ */
+export type ComputeProviderTemplates = {
+  terraform: string;
+  cloudFormation?: {
+    template: string;
+    /** The name the template downloads as. */
+    fileName: string;
+    /** A prefilled Launch Stack URL. Deployment-specific, so consumers supply it. */
+    url?: string;
+  };
+};
+
+export type ComputeProviderDefinition = {
+  value: ComputeProviderValue;
+  providerType: ComputeProviderType;
+  /**
+   * The brand mark, not a monochrome glyph: it identifies a vendor, so it keeps
+   * its own colour on either theme.
+   */
+  icon: IconComponent;
+  /**
+   * i18n keys rather than resolved strings, so a locale change re-renders the
+   * label instead of freezing whatever was current at module load. Typed as the
+   * key union, so a typo is a compile error rather than a label reading
+   * "workers.provider-lamda" in the UI.
+   */
+  labelKey: I18nKey<I18nResources>;
+  descriptionKey: I18nKey<I18nResources>;
+  /** The compact label for compute-badge, where the full vendor name will not fit. */
+  badgeLabel: string;
+  releaseStage: ComputeProviderReleaseStage;
+  templates: ComputeProviderTemplates;
+  /** The published Terraform module, when one exists for the provider. */
+  terraformModuleHref?: string;
+};
+
+export const TERRAFORM_MODULES =
+  'https://github.com/temporalio/terraform-modules/tree/main/modules/serverless-workers';
+
+export const COMPUTE_PROVIDERS: Record<
+  ComputeProviderValue,
+  ComputeProviderDefinition
+> = {
+  lambda: {
+    value: 'lambda',
+    providerType: 'aws-lambda',
+    icon: IconAwsColor,
+    labelKey: 'workers.provider-lambda',
+    descriptionKey: 'workers.provider-lambda-description',
+    badgeLabel: 'Lambda',
+    releaseStage: 'public-preview',
+    templates: {
+      terraform: defaultLambdaTerraform,
+      cloudFormation: {
+        template: defaultLambdaCloudFormation,
+        fileName: 'temporal-worker-role.yaml',
+      },
+    },
+    terraformModuleHref: `${TERRAFORM_MODULES}/aws/lambda`,
+  },
+  agentcore: {
+    value: 'agentcore',
+    providerType: 'aws-agentcore',
+    icon: IconAwsColor,
+    labelKey: 'workers.provider-agentcore',
+    descriptionKey: 'workers.provider-agentcore-description',
+    badgeLabel: 'AgentCore',
+    releaseStage: 'pre-release',
+    templates: {
+      terraform: defaultAgentCoreTerraform,
+      cloudFormation: {
+        template: defaultAgentCoreCloudFormation,
+        fileName: 'temporal-agentcore-role.yaml',
+      },
+    },
+    terraformModuleHref: `${TERRAFORM_MODULES}/aws/agentcore`,
+  },
+  'cloud-run': {
+    value: 'cloud-run',
+    providerType: 'gcp-cloud-run',
+    icon: IconGcpColor,
+    labelKey: 'workers.provider-cloud-run',
+    descriptionKey: 'workers.provider-cloud-run-description',
+    badgeLabel: 'Cloud Run',
+    releaseStage: 'public-preview',
+    templates: {
+      // CloudFormation is AWS-only, so Cloud Run offers Terraform alone.
+      terraform: defaultCloudRunTerraform,
+    },
+  },
+};
+
+/**
+ * The default templates, which a consumer overrides by passing its own map.
+ *
+ * Written out rather than mapped, because the annotation then makes the
+ * compiler name a provider that has no entry. Building it with
+ * Object.fromEntries needs a cast, and the cast would suppress exactly the error
+ * this exists to raise.
+ */
+export const defaultComputeProviderTemplates: Record<
+  ComputeProviderValue,
+  ComputeProviderTemplates
+> = {
+  lambda: COMPUTE_PROVIDERS.lambda.templates,
+  agentcore: COMPUTE_PROVIDERS.agentcore.templates,
+  'cloud-run': COMPUTE_PROVIDERS['cloud-run'].templates,
+};
+
+// Both spellings appear in the wild: the API sends `aws-lambda`, while some
+// stored configs carry the short name.
+const BY_PROVIDER_TYPE = new Map<string, ComputeProviderValue>(
+  COMPUTE_PROVIDER_VALUES.flatMap((value) => [
+    [COMPUTE_PROVIDERS[value].providerType, value] as const,
+    [value, value] as const,
+  ]),
+);
+
+export const computeProviderFromType = (
+  type: string | undefined,
+): ComputeProviderValue | undefined =>
+  type === undefined ? undefined : BY_PROVIDER_TYPE.get(type);
diff --git a/src/lib/components/workers/serverless-worker-form/create-version-form.svelte b/src/lib/components/workers/serverless-worker-form/create-version-form.svelte
index d6c64781a8..430b918bd7 100644
--- a/src/lib/components/workers/serverless-worker-form/create-version-form.svelte
+++ b/src/lib/components/workers/serverless-worker-form/create-version-form.svelte
@@ -10,6 +10,10 @@
   import { translate } from '$lib/i18n/translate';
   import type { VersionSummary } from '$lib/types/deployments';
 
+  import {
+    type ComputeProviderTemplates,
+    type ComputeProviderValue,
+  } from './compute-providers';
   import {
     type ComputeProviderOption,
     type CreateVersionFormData,
@@ -31,8 +35,7 @@
     computeProviders?: readonly ComputeProviderOption[];
     initialProvider?: ComputeProviderOption['value'];
     gcpRegions?: string[];
-    terraformTemplate?: string;
-    cloudRunTerraformTemplate?: string;
+    templates?: Record<ComputeProviderValue, ComputeProviderTemplates>;
   }
 
   let {
@@ -43,8 +46,7 @@
     computeProviders,
     initialProvider,
     gcpRegions,
-    terraformTemplate,
-    cloudRunTerraformTemplate,
+    templates,
   }: Props = $props();
 
   const superform = superForm(
@@ -147,8 +149,7 @@
           bind:scaleUpBacklogThreshold={$form.scaleUpBacklogThreshold}
           bind:maxWorkerLifetimeMs={$form.maxWorkerLifetimeMs}
           bind:metricsPollIntervalMs={$form.metricsPollIntervalMs}
-          {terraformTemplate}
-          {cloudRunTerraformTemplate}
+          {templates}
           errors={$errors}
         />
       </ComputeProviderPicker>
diff --git a/src/lib/components/workers/serverless-worker-form/edit-version-form.svelte b/src/lib/components/workers/serverless-worker-form/edit-version-form.svelte
index dec7fab086..2e78977163 100644
--- a/src/lib/components/workers/serverless-worker-form/edit-version-form.svelte
+++ b/src/lib/components/workers/serverless-worker-form/edit-version-form.svelte
@@ -8,6 +8,7 @@
   import Card from '$lib/holocene/card.svelte';
   import { translate } from '$lib/i18n/translate';
 
+  import { type ComputeProviderTemplates } from './compute-providers';
   import {
     type ComputeProviderOption,
     type ComputeProviderValue,
@@ -47,8 +48,7 @@
     error?: string;
     computeProviders?: readonly ComputeProviderOption[];
     gcpRegions?: string[];
-    terraformTemplate?: string;
-    cloudRunTerraformTemplate?: string;
+    templates?: Record<ComputeProviderValue, ComputeProviderTemplates>;
   }
 
   let {
@@ -59,8 +59,7 @@
     error,
     computeProviders,
     gcpRegions,
-    terraformTemplate,
-    cloudRunTerraformTemplate,
+    templates,
   }: Props = $props();
 
   const superform = superForm(
@@ -141,8 +140,7 @@
         bind:scaleUpBacklogThreshold={$form.scaleUpBacklogThreshold}
         bind:maxWorkerLifetimeMs={$form.maxWorkerLifetimeMs}
         bind:metricsPollIntervalMs={$form.metricsPollIntervalMs}
-        {terraformTemplate}
-        {cloudRunTerraformTemplate}
+        {templates}
         errors={$errors}
       />
     </Card>
diff --git a/src/lib/components/workers/serverless-worker-form/serverless-worker-create-form.svelte b/src/lib/components/workers/serverless-worker-form/serverless-worker-create-form.svelte
index 29fe25fc17..f8e50035ae 100644
--- a/src/lib/components/workers/serverless-worker-form/serverless-worker-create-form.svelte
+++ b/src/lib/components/workers/serverless-worker-form/serverless-worker-create-form.svelte
@@ -9,6 +9,10 @@
   import Input from '$lib/holocene/input/input.svelte';
   import { translate } from '$lib/i18n/translate';
 
+  import {
+    type ComputeProviderTemplates,
+    type ComputeProviderValue,
+  } from './compute-providers';
   import {
     type ComputeProviderOption,
     type CreateDeploymentFormData,
@@ -33,12 +37,7 @@
     ) => Promise<SubmitFieldErrors | void>;
     onSuccess: () => void;
     cancelHref: string;
-    agentCoreCfnTemplateUrl?: string;
-    agentCoreCfnTemplate?: string;
-    cfnTemplateUrl?: string;
-    cfnTemplate?: string;
-    terraformTemplate?: string;
-    cloudRunTerraformTemplate?: string;
+    templates?: Record<ComputeProviderValue, ComputeProviderTemplates>;
     computeProviders?: readonly ComputeProviderOption[];
     gcpRegions?: string[];
   }
@@ -47,12 +46,7 @@
     onSubmit,
     onSuccess,
     cancelHref,
-    agentCoreCfnTemplateUrl,
-    agentCoreCfnTemplate,
-    cfnTemplateUrl,
-    cfnTemplate,
-    terraformTemplate,
-    cloudRunTerraformTemplate,
+    templates,
     computeProviders,
     gcpRegions,
   }: Props = $props();
@@ -184,12 +178,7 @@
         bind:scaleUpBacklogThreshold={$form.scaleUpBacklogThreshold}
         bind:maxWorkerLifetimeMs={$form.maxWorkerLifetimeMs}
         bind:metricsPollIntervalMs={$form.metricsPollIntervalMs}
-        {agentCoreCfnTemplateUrl}
-        {agentCoreCfnTemplate}
-        {cfnTemplateUrl}
-        {cfnTemplate}
-        {terraformTemplate}
-        {cloudRunTerraformTemplate}
+        {templates}
         errors={$errors}
       />
     </Card>
diff --git a/src/lib/components/workers/serverless-worker-form/shared.ts b/src/lib/components/workers/serverless-worker-form/shared.ts
index 73c148561c..a81b295987 100644
--- a/src/lib/components/workers/serverless-worker-form/shared.ts
+++ b/src/lib/components/workers/serverless-worker-form/shared.ts
@@ -14,6 +14,12 @@ import {
 } from '$lib/services/deployments-service';
 import type { ComputeConfig } from '$lib/types/deployments';
 
+import {
+  COMPUTE_PROVIDERS,
+  type ComputeProviderReleaseStage,
+  type ComputeProviderValue,
+} from './compute-providers';
+
 const scalingFields = {
   scaleUpCooloffMs: z.number().int().min(0).optional(),
   scaleUpBacklogThreshold: z.number().int().min(0).optional(),
@@ -271,13 +277,6 @@ export const buildComputeConfigFromForm = (
   );
 };
 
-export type ComputeProviderValue = 'lambda' | 'agentcore' | 'cloud-run';
-
-export type ComputeProviderReleaseStage =
-  | 'public-preview'
-  | 'pre-release'
-  | 'generally-available';
-
 export type ComputeProviderOption = {
   value: ComputeProviderValue;
   disabled?: boolean;
@@ -286,13 +285,23 @@ export type ComputeProviderOption = {
   releaseStage?: ComputeProviderReleaseStage;
 };
 
+/**
+ * Re-exported so the many modules already importing these from here keep
+ * working. COMPUTE_PROVIDERS is the source.
+ */
+export type {
+  ComputeProviderReleaseStage,
+  ComputeProviderValue,
+} from './compute-providers';
+
+/** Stated once, in the registry. Spelled out so the annotation checks every provider. */
 export const defaultReleaseStage: Record<
   ComputeProviderValue,
   ComputeProviderReleaseStage
 > = {
-  lambda: 'public-preview',
-  agentcore: 'pre-release',
-  'cloud-run': 'public-preview',
+  lambda: COMPUTE_PROVIDERS.lambda.releaseStage,
+  agentcore: COMPUTE_PROVIDERS.agentcore.releaseStage,
+  'cloud-run': COMPUTE_PROVIDERS['cloud-run'].releaseStage,
 };
 
 interface InitialComputeProviderOptions {
diff --git a/src/lib/pages/serverless-worker-create.svelte b/src/lib/pages/serverless-worker-create.svelte
index ab7b88af71..c617e31226 100644
--- a/src/lib/pages/serverless-worker-create.svelte
+++ b/src/lib/pages/serverless-worker-create.svelte
@@ -1,4 +1,8 @@
 <script lang="ts">
+  import {
+    type ComputeProviderTemplates,
+    type ComputeProviderValue,
+  } from '$lib/components/workers/serverless-worker-form/compute-providers';
   import ServerlessWorkerCreateForm from '$lib/components/workers/serverless-worker-form/serverless-worker-create-form.svelte';
   import type {
     ComputeProviderOption,
@@ -20,12 +24,7 @@
   interface Props {
     namespace: string;
     onSuccess: () => void;
-    agentCoreCfnTemplateUrl?: string;
-    agentCoreCfnTemplate?: string;
-    cfnTemplateUrl?: string;
-    cfnTemplate?: string;
-    terraformTemplate?: string;
-    cloudRunTerraformTemplate?: string;
+    templates?: Record<ComputeProviderValue, ComputeProviderTemplates>;
     computeProviders?: readonly ComputeProviderOption[];
     gcpRegions?: string[];
   }
@@ -35,18 +34,8 @@
     iamRoleArn?: string[];
   }
 
-  let {
-    namespace,
-    onSuccess,
-    agentCoreCfnTemplateUrl,
-    agentCoreCfnTemplate,
-    cfnTemplateUrl,
-    cfnTemplate,
-    terraformTemplate,
-    cloudRunTerraformTemplate,
-    computeProviders,
-    gcpRegions,
-  }: Props = $props();
+  let { namespace, onSuccess, templates, computeProviders, gcpRegions }: Props =
+    $props();
 
   async function rollbackDeployment(
     deploymentName: string,
@@ -194,12 +183,7 @@
   cancelHref={routeForWorkers({ namespace })}
   {onSuccess}
   onSubmit={handleCreate}
-  {agentCoreCfnTemplateUrl}
-  {agentCoreCfnTemplate}
-  {cfnTemplateUrl}
-  {cfnTemplate}
-  {terraformTemplate}
-  {cloudRunTerraformTemplate}
+  {templates}
   {computeProviders}
   {gcpRegions}
 />
diff --git a/src/lib/pages/worker-deployment-version-create.svelte b/src/lib/pages/worker-deployment-version-create.svelte
index 75564fb30c..779dcfb751 100644
--- a/src/lib/pages/worker-deployment-version-create.svelte
+++ b/src/lib/pages/worker-deployment-version-create.svelte
@@ -1,4 +1,8 @@
 <script lang="ts">
+  import {
+    type ComputeProviderTemplates,
+    type ComputeProviderValue,
+  } from '$lib/components/workers/serverless-worker-form/compute-providers';
   import CreateVersionForm from '$lib/components/workers/serverless-worker-form/create-version-form.svelte';
   import type { ComputeProviderOption } from '$lib/components/workers/serverless-worker-form/shared';
   import { buildComputeConfigFromForm } from '$lib/components/workers/serverless-worker-form/shared';
@@ -22,8 +26,7 @@
     onSuccess: () => void;
     computeProviders?: readonly ComputeProviderOption[];
     gcpRegions?: string[];
-    terraformTemplate?: string;
-    cloudRunTerraformTemplate?: string;
+    templates?: Record<ComputeProviderValue, ComputeProviderTemplates>;
   }
 
   let {
@@ -32,8 +35,7 @@
     onSuccess,
     computeProviders,
     gcpRegions,
-    terraformTemplate,
-    cloudRunTerraformTemplate,
+    templates,
   }: Props = $props();
 
   let error = $state<string | undefined>();
@@ -100,8 +102,7 @@
       computeProviders={lockedProvider?.providers ?? computeProviders}
       initialProvider={lockedProvider?.provider}
       {gcpRegions}
-      {terraformTemplate}
-      {cloudRunTerraformTemplate}
+      {templates}
       cancelHref={backHref}
       onSubmit={async (data) => {
         error = undefined;
diff --git a/src/lib/pages/worker-deployment-version-edit.svelte b/src/lib/pages/worker-deployment-version-edit.svelte
index a75a43fa69..eb32374716 100644
--- a/src/lib/pages/worker-deployment-version-edit.svelte
+++ b/src/lib/pages/worker-deployment-version-edit.svelte
@@ -2,6 +2,10 @@
   import { goto } from '$app/navigation';
 
   import DeleteWorkerModal from '$lib/components/workers/delete-worker-modal.svelte';
+  import {
+    type ComputeProviderTemplates,
+    type ComputeProviderValue,
+  } from '$lib/components/workers/serverless-worker-form/compute-providers';
   import EditVersionForm from '$lib/components/workers/serverless-worker-form/edit-version-form.svelte';
   import type { ComputeProviderOption } from '$lib/components/workers/serverless-worker-form/shared';
   import {
@@ -32,8 +36,7 @@
     buildId: string;
     computeProviders?: readonly ComputeProviderOption[];
     gcpRegions?: string[];
-    terraformTemplate?: string;
-    cloudRunTerraformTemplate?: string;
+    templates?: Record<ComputeProviderValue, ComputeProviderTemplates>;
   }
 
   let {
@@ -42,8 +45,7 @@
     buildId,
     computeProviders,
     gcpRegions,
-    terraformTemplate,
-    cloudRunTerraformTemplate,
+    templates,
   }: Props = $props();
 
   let error = $state<string | undefined>();
@@ -83,8 +85,7 @@
       {error}
       computeProviders={lockProvidersTo(configuredProvider, computeProviders)}
       {gcpRegions}
-      {terraformTemplate}
-      {cloudRunTerraformTemplate}
+      {templates}
       initialData={{
         provider: configuredProvider,
         lambdaArn: providerDetails.lambdaArn ?? '',
diff --git a/src/lib/utilities/lock-compute-provider.ts b/src/lib/utilities/lock-compute-provider.ts
index 4b6d4e6ae0..45095082ec 100644
--- a/src/lib/utilities/lock-compute-provider.ts
+++ b/src/lib/utilities/lock-compute-provider.ts
@@ -1,3 +1,7 @@
+import {
+  COMPUTE_PROVIDER_VALUES,
+  computeProviderFromType,
+} from '$lib/components/workers/serverless-worker-form/compute-providers';
 import type {
   ComputeProviderOption,
   ComputeProviderValue,
@@ -12,11 +16,7 @@ export type LockedComputeProvider = {
   providers: readonly ComputeProviderOption[];
 };
 
-const providerValue = (type?: string): ComputeProviderValue | undefined => {
-  if (type === 'aws-lambda' || type === 'lambda') return 'lambda';
-  if (type === 'aws-agentcore' || type === 'agentcore') return 'agentcore';
-  if (type === 'gcp-cloud-run' || type === 'cloud-run') return 'cloud-run';
-};
+const providerValue = computeProviderFromType;
 
 const computeConfigOf = (summary?: { computeConfig?: ComputeConfig }) =>
   summary?.computeConfig;
@@ -34,11 +34,8 @@ const providersInConfig = (
   return providers as ComputeProviderValue[];
 };
 
-const DEFAULT_PROVIDERS: readonly ComputeProviderOption[] = [
-  { value: 'lambda' },
-  { value: 'agentcore' },
-  { value: 'cloud-run' },
-];
+const DEFAULT_PROVIDERS: readonly ComputeProviderOption[] =
+  COMPUTE_PROVIDER_VALUES.map((value) => ({ value }));
 
 /**
  * Ungates the provider a Version already uses, leaving the alternatives alone.