diff --git a/.github/workflows/ministack.yml b/.github/workflows/ministack.yml
index ec7db7a1de..451b80e7b0 100644
--- a/.github/workflows/ministack.yml
+++ b/.github/workflows/ministack.yml
@@ -53,6 +53,7 @@ jobs:
           - default
           - ephemeral
           - multi-runner
+          - multi-runner-v2
           - termination-watcher
         terraform:
           - "1.4.0"
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index 8eba6fb5b7..33462199ea 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -155,6 +155,7 @@ jobs:
             "ephemeral",
             "termination-watcher",
             "multi-runner",
+            "multi-runner-v2",
             "external-managed-ssm-secrets"
           ]
     defaults:
diff --git a/docs/examples/index.md b/docs/examples/index.md
index aee1d868b0..f0558966bd 100644
--- a/docs/examples/index.md
+++ b/docs/examples/index.md
@@ -5,6 +5,7 @@ Examples are located in the [examples](https://github.com/github-aws-runners/ter
 - _[Default](default.md)_: The default example of the module
 - _[Ephemeral](ephemeral.md)_: Example usages of ephemeral runners based on the default example.
 - _[Multi Runner](multi-runner.md)_ : Example usage of creating a multi runner which creates multiple runners/ configurations with a single deployment. The examples including: "arm64", "windows", and "ubuntu" runners.
+- _[Multi Runner v2](multi-runner-v2.md)_ : Example usage of the experimental v2 multi-runner configuration interface with shared defaults and per-lane overrides.
 - _[Permissions boundary](permissions-boundary.md)_: Example usages of permissions boundaries.
 - _[Prebuilt Images](prebuilt.md)_: Example usages of deploying runners with a custom prebuilt image.
 - _[Termination watcher](termination-watcher.md)_: Example usages of termination watcher.
diff --git a/docs/examples/multi-runner-v2.md b/docs/examples/multi-runner-v2.md
new file mode 100644
index 0000000000..565b601ecb
--- /dev/null
+++ b/docs/examples/multi-runner-v2.md
@@ -0,0 +1 @@
+--8<-- "examples/multi-runner-v2/README.md"
diff --git a/examples/multi-runner-v2/.terraform.lock.hcl b/examples/multi-runner-v2/.terraform.lock.hcl
new file mode 100644
index 0000000000..877f39a156
--- /dev/null
+++ b/examples/multi-runner-v2/.terraform.lock.hcl
@@ -0,0 +1,89 @@
+# This file is maintained automatically by "terraform init".
+# Manual edits may be lost in future updates.
+
+provider "registry.terraform.io/hashicorp/aws" {
+  version     = "6.63.0"
+  constraints = ">= 5.0.0, >= 6.21.0, >= 6.33.0"
+  hashes = [
+    "h1:dRlYHkc+r6fgzF57WC7Zjcmb6sF/6TTGDEgwGK+LAZY=",
+    "zh:005d56736afd17d963998c405cee6f434dbc23a415109f9435ff1542879ae611",
+    "zh:026ef126321a86ad7080b5d858e2527f96f5289678cbcd8856296e229c43339d",
+    "zh:06e0b58b2d1eddb5137fc86bee7ad2d07953c0bc3f57cccfc5ae0d2456068a3a",
+    "zh:07221735d61ababed84734e5ffcfc5bd59d01f29f029166ba5f2175895dceed1",
+    "zh:1a72db00583112bdb8c19b213a78a3f5de754fffc08f07e061f4e326289fab7d",
+    "zh:32968e74a53b03e97a084dc7050c22ef661fb5b3ea8a44f5a63e47bc45ad0e7c",
+    "zh:4b357dfe4b820e3e4acd2881cff8288b2186491e63416751f0d12692ba478ceb",
+    "zh:81e30884d7de686265e7d87bb92527e802878c65a378470ede2a1e9f4e40ccc9",
+    "zh:82e137297f6a5a08b9ce2138f7aabea245ad99495d9d9eff502f752d6ca90dbd",
+    "zh:8eb83b67099f0ea9df238a979dff933ff50ce06a2e3ff05a48556a10f10dd204",
+    "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425",
+    "zh:d0ba30886cbe41850fee689f51ef9088578f323cfd21817bb409951d43c465eb",
+    "zh:dd48e7089784454bc03d713e9057f5ca0ea1613bd402125054a51894957b7925",
+    "zh:f250fa81e54cf60fcb0e9c0fc4ac043f1ecc2ac24967f628b3609364fcab3d04",
+    "zh:f38fc09fc25a8d2cf89a4d4cd6a5ef7cb1aad72798dbdcad58b8876b6a551a54",
+    "zh:f7c7380fdf126e1901f2084588dbfd724c76cb131ccfa795a541219111103c06",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/local" {
+  version     = "2.9.0"
+  constraints = "~> 2.0"
+  hashes = [
+    "h1:m24fjcInWvTVZ1XSo2MaNuKPe+X/gfG8SIi09rA7a7M=",
+    "zh:0baa4566cf77f1ff52f4293d1c8536202dd23edc197c3196413a28343c3ac3a0",
+    "zh:16b5559c3c07088ddad11a9bb9e9c0799999363c2958e9a5be2bcbbf2cd9ca64",
+    "zh:197c79015a10d1cce904a8ea722cbc750c42aeae2da53f44a6a0751d9fd1aa90",
+    "zh:29d0b03e5343a80677ebfeb2e2c31cbe4b1f65e736e53417454a4277fec2544c",
+    "zh:4896bfa6cf1d2fd562b47ef2e87f47862ae92a04f8ad5d764380f0c6653473b8",
+    "zh:531f8529cbca49f681883e57761a05a8398afaef6d1ab0d205d26bf12f4428e8",
+    "zh:6aaf5011d83161c86d2bfb80c0923ec934e578288758da2f37acb7aec129004b",
+    "zh:7430275253d3d3c40aa6179e0ec0d63212874dbbc06c5a51b9d07ec590f9756c",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:be17dc611e95e26cdf6cad79dfccf1064f0e32032a2efeb939a9bbe7fb1cbfe9",
+    "zh:f0e3b0aa644202e1d79d2000dca91f6019425da71e9800fa23f27e51c034f195",
+    "zh:f62bae4519e4ead49182ddc8afe8cf61e2a4c3ba3973b0fbba967736a2696aa3",
+    "zh:fcafa360a5b0b96244f26f4e3a6d642b716a376557142c2442ff2fb12d11da18",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/null" {
+  version     = "3.3.1"
+  constraints = "~> 3.0, ~> 3.2"
+  hashes = [
+    "h1:m5FqidbIgh+E9OigiZh8/xbkvpUQFSj3hZo/jqNLCLQ=",
+    "zh:08c59776542ea16e5a8545752787b17ff412922182b4cfabe16139197be8ac44",
+    "zh:123109cc7e5ed6d515787fbc212f2a3fd5e75647bb24ab7c801ccd4d4ed42451",
+    "zh:14b3fa4372754b54844b41d5dbd4671a292d8d6828b90169061feb4d7b15dd05",
+    "zh:56a4daaa3212f57b764bf3d1f333141c6610c5f21abb240e0111221f7c7fa4d4",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:7e888a026dbacd2474a42264227ae35f639780f0f0c613529d10a95cd61988b3",
+    "zh:85a53646267e87d600df7124e4767ffde9bba3b6356d45d961618bdd68131cc7",
+    "zh:8ffa0e9c7c39b2ab0905b472465d6e35ef0b776b3f6273bb34c150340b61bff1",
+    "zh:9846510a1841530d4403f4818e233f91e3b3bade7441047599fbf800742f65be",
+    "zh:afa98d44860875f037c6def0a7e6ff208e042712ba771f620482b143cd336891",
+    "zh:bdca130d9ef27488ae0b13bc8fd8019e8bbdd4f2ceff29da066bd333165d68c5",
+    "zh:cb3b94cbca88210dd0d1f11e2b8a89333f48c3857faf8f70f589072ce7c28610",
+    "zh:f0c0ba87925fe32f84b80f7513b1efb1b0866f51f899ba825e95ad59ff09b018",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/random" {
+  version     = "3.9.0"
+  constraints = "~> 3.0"
+  hashes = [
+    "h1:OO+IuvQJSPmWdN8AyyIEvPJbLvDQpgX/zbktoa9KsJE=",
+    "zh:161ad0bd9a75768c82f53fb6e7172a9d8be2d4889b012645a34795031aaf1bf1",
+    "zh:19dc9a5b17729725ccfc4f45b0500af0ee5bc6b6b160c7adb8f2bf617d2c80ea",
+    "zh:269eda8fe42daa7974d5a34d166c3ba9defe80cde86c01e4dadcfdf2e1f05e5f",
+    "zh:373f7c65566f8f2cc7f45d698654feb9d988996957e1266a69ca00c52d6d16d0",
+    "zh:5599d16804c41c83009ec621b6d6b6f74e102f5827678a4750f8809055546b61",
+    "zh:583be0440469a22bff70dcfa56593b01566860b29607437264adb51060cf46fc",
+    "zh:5f211d8ec3f2e1f414870d9584bfe26e6995560ef81c748f8447a48164767398",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:7b547fd16216761ef86efc3ed516ac5ac0c5c42b7c7eb24a08cef2d93f69ed5e",
+    "zh:7e7c0679daf2a382151d05068c8c3f0dae6b7b7dccf818827b73dd08638df2ef",
+    "zh:8089dec888a8038b9b4fb23b3df7e1057293dbc5b60b42cc47ff690d69d4b61b",
+    "zh:c51f15a031edfd6f23ce8ced3446ca7f8d8d647e2499890d7d5d10d5016d7257",
+    "zh:c94784f005708890dc6895afd53636ec00ec1e430b15d41e5aebfb1d4b39bd04",
+  ]
+}
diff --git a/examples/multi-runner-v2/README.md b/examples/multi-runner-v2/README.md
new file mode 100644
index 0000000000..f8cea507ec
--- /dev/null
+++ b/examples/multi-runner-v2/README.md
@@ -0,0 +1,74 @@
+# Multi-runner v2 example
+
+This example demonstrates the experimental multi-runner v2 interface. Shared
+defaults are configured with `global_config*` variables, while
+each runner lane uses `multi_runner_config` for its matcher,
+runner lifecycle, and compute-provider settings.
+
+The example creates three lanes from one deployment:
+
+- Linux ARM64 Amazon Linux runners.
+- Ephemeral Linux x64 Amazon Linux runners with job retry enabled.
+- Windows x64 Server Core 2022 runners.
+
+The v2 interface keeps provider-owned settings inside the selected provider
+configuration. For example, VPC and subnet settings are under
+`global_config_compute_provider.aws.ec2`, while the per-lane
+instance types and AMI filter are under each lane's compute provider block.
+
+Configure the GitHub App variables before applying:
+
+```bash
+terraform init
+terraform apply \
+  -var='github_app={id="123456",key_base64="..."}'
+```
+
+The `github_app` value is sensitive and should be supplied through a secure
+variable source in real deployments rather than committed to configuration.
+
+<!-- BEGIN_TF_DOCS -->
+## Requirements
+
+| Name | Version |
+|------|---------|
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.4.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.33 |
+| <a name="requirement_local"></a> [local](#requirement\_local) | ~> 2.0 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.0 |
+
+## Providers
+
+| Name | Version |
+|------|---------|
+| <a name="provider_random"></a> [random](#provider\_random) | 3.9.0 |
+
+## Modules
+
+| Name | Source | Version |
+|------|--------|---------|
+| <a name="module_base"></a> [base](#module\_base) | ../base | n/a |
+| <a name="module_runners"></a> [runners](#module\_runners) | ../../modules/multi-runner | n/a |
+| <a name="module_webhook_github_app"></a> [webhook\_github\_app](#module\_webhook\_github\_app) | ../../modules/webhook-github-app | n/a |
+
+## Resources
+
+| Name | Type |
+|------|------|
+| [random_id.random](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/id) | resource |
+
+## Inputs
+
+| Name | Description | Type | Default | Required |
+|------|-------------|------|---------|:--------:|
+| <a name="input_aws_region"></a> [aws\_region](#input\_aws\_region) | AWS region to deploy to. | `string` | `"eu-west-1"` | no |
+| <a name="input_environment"></a> [environment](#input\_environment) | Environment name, used as prefix. | `string` | `null` | no |
+| <a name="input_github_app"></a> [github\_app](#input\_github\_app) | GitHub App ID and base64-encoded private key. | <pre>object({<br/>    id         = string<br/>    key_base64 = string<br/>  })</pre> | n/a | yes |
+
+## Outputs
+
+| Name | Description |
+|------|-------------|
+| <a name="output_webhook_endpoint"></a> [webhook\_endpoint](#output\_webhook\_endpoint) | n/a |
+| <a name="output_webhook_secret"></a> [webhook\_secret](#output\_webhook\_secret) | n/a |
+<!-- END_TF_DOCS -->
diff --git a/examples/multi-runner-v2/main.tf b/examples/multi-runner-v2/main.tf
new file mode 100644
index 0000000000..ca740ca078
--- /dev/null
+++ b/examples/multi-runner-v2/main.tf
@@ -0,0 +1,173 @@
+locals {
+  environment = var.environment != null ? var.environment : "multi-runner-v2"
+  aws_region  = var.aws_region
+}
+
+resource "random_id" "random" {
+  byte_length = 20
+}
+
+module "base" {
+  source = "../base"
+
+  prefix     = local.environment
+  aws_region = local.aws_region
+}
+
+module "runners" {
+  source = "../../modules/multi-runner"
+
+  prefix     = local.environment
+  aws_region = local.aws_region
+
+  global_config = {
+    tags = {
+      Example = local.environment
+      Project = "ProjectX"
+    }
+    runner = {
+      os           = "linux"
+      architecture = "x64"
+      extra_labels = ["v2"]
+    }
+  }
+
+  global_config_github = {
+    app = {
+      key_base64     = var.github_app.key_base64
+      id             = var.github_app.id
+      webhook_secret = random_id.random.hex
+    }
+  }
+
+  global_config_lambda = {
+    architecture = "arm64"
+  }
+
+  global_config_orchestration_provider = {
+    webhook = {
+      eventbridge = {
+        enabled       = true
+        accept_events = ["workflow_job"]
+      }
+    }
+  }
+
+  global_config_compute_provider = {
+    aws = {
+      ec2 = {
+        vpc_id      = module.base.vpc.vpc_id
+        subnet_ids  = module.base.vpc.private_subnets
+        ssm_enabled = true
+        runner_binaries = {
+          enabled = true
+        }
+      }
+    }
+  }
+
+  multi_runner_config = {
+    linux-arm64 = {
+      runner = {
+        architecture = "arm64"
+        name_prefix  = "amazon-arm64-"
+        extra_labels = ["amazon"]
+      }
+      orchestration_provider = {
+        webhook = {
+          runner = {
+            maximum_count = 1
+          }
+          matcherConfig = {
+            exactMatch    = true
+            labelMatchers = [["self-hosted", "linux", "arm64", "amazon"]]
+          }
+        }
+      }
+      compute_provider = {
+        aws = {
+          ec2 = {
+            instance_types = ["t4g.large", "c6g.large"]
+          }
+        }
+      }
+    }
+
+    linux-x64 = {
+      runner = {
+        name_prefix  = "amazon-x64-"
+        extra_labels = ["amazon"]
+      }
+      orchestration_provider = {
+        webhook = {
+          runner = {
+            ephemeral     = true
+            maximum_count = 1
+          }
+          matcherConfig = {
+            labelMatchers = [["self-hosted", "linux", "x64", "amazon"]]
+            exactMatch    = false
+            priority      = 1
+          }
+          queue = {
+            delay_webhook_event = 0
+          }
+          job_retry = {
+            enabled = true
+          }
+        }
+      }
+      compute_provider = {
+        aws = {
+          ec2 = {
+            instance_types = ["m5a.large", "m5ad.large"]
+          }
+        }
+      }
+    }
+
+    windows-x64 = {
+      runner = {
+        os          = "windows"
+        name_prefix = "windows-x64-"
+      }
+      orchestration_provider = {
+        webhook = {
+          runner = {
+            boot_time_in_minutes = 20
+            maximum_count        = 1
+          }
+          matcherConfig = {
+            exactMatch    = true
+            labelMatchers = [["self-hosted", "windows", "x64", "servercore-2022"]]
+          }
+        }
+      }
+      compute_provider = {
+        aws = {
+          ec2 = {
+            instance_types = ["m5.large", "c5.large"]
+            ami = {
+              filter = {
+                name  = ["Windows_Server-2022-English-Full-ECS_Optimized-*"]
+                state = ["available"]
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+module "webhook_github_app" {
+  source     = "../../modules/webhook-github-app"
+  depends_on = [module.runners]
+
+  github_app = {
+    key_base64     = var.github_app.key_base64
+    id             = var.github_app.id
+    webhook_secret = random_id.random.hex
+  }
+  webhook_endpoint = module.runners.webhook.endpoint
+}
diff --git a/examples/multi-runner-v2/outputs.tf b/examples/multi-runner-v2/outputs.tf
new file mode 100644
index 0000000000..1feaf2e671
--- /dev/null
+++ b/examples/multi-runner-v2/outputs.tf
@@ -0,0 +1,8 @@
+output "webhook_endpoint" {
+  value = module.runners.webhook.endpoint
+}
+
+output "webhook_secret" {
+  sensitive = true
+  value     = random_id.random.hex
+}
diff --git a/examples/multi-runner-v2/providers.tf b/examples/multi-runner-v2/providers.tf
new file mode 100644
index 0000000000..eca2fe96a7
--- /dev/null
+++ b/examples/multi-runner-v2/providers.tf
@@ -0,0 +1,9 @@
+provider "aws" {
+  region = local.aws_region
+
+  default_tags {
+    tags = {
+      Example = local.environment
+    }
+  }
+}
diff --git a/examples/multi-runner-v2/variables.tf b/examples/multi-runner-v2/variables.tf
new file mode 100644
index 0000000000..2a7f7eda54
--- /dev/null
+++ b/examples/multi-runner-v2/variables.tf
@@ -0,0 +1,23 @@
+variable "github_app" {
+  description = "GitHub App ID and base64-encoded private key."
+
+  type = object({
+    id         = string
+    key_base64 = string
+  })
+  sensitive = true
+}
+
+variable "environment" {
+  description = "Environment name, used as prefix."
+
+  type    = string
+  default = null
+}
+
+variable "aws_region" {
+  description = "AWS region to deploy to."
+
+  type    = string
+  default = "eu-west-1"
+}
diff --git a/examples/multi-runner-v2/versions.tf b/examples/multi-runner-v2/versions.tf
new file mode 100644
index 0000000000..1dfb3e5774
--- /dev/null
+++ b/examples/multi-runner-v2/versions.tf
@@ -0,0 +1,17 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 6.33"
+    }
+    local = {
+      source  = "hashicorp/local"
+      version = "~> 2.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "~> 3.0"
+    }
+  }
+  required_version = ">= 1.4.0"
+}
diff --git a/mkdocs.yaml b/mkdocs.yaml
index 849b9a53dc..f9680b9d2b 100644
--- a/mkdocs.yaml
+++ b/mkdocs.yaml
@@ -77,6 +77,7 @@ nav:
     - Overview: examples/index.md
     - Default: examples/default.md
     - Multi Runner: examples/multi-runner.md
+    - Multi Runner v2: examples/multi-runner-v2.md
     - Ephemeral: examples/ephemeral.md
     - External managed secrets: examples/external-managed-ssm-secrets.md
     - Custom AMI: examples/prebuilt.md
diff --git a/tests/ministack/README.md b/tests/ministack/README.md
index b6442194ff..12f5b4809e 100644
--- a/tests/ministack/README.md
+++ b/tests/ministack/README.md
@@ -1,14 +1,15 @@
 # MiniStack example tests
 
 The MiniStack workflow runs the `base`, `prebuilt`, `default`, `ephemeral`,
-`multi-runner`, and `termination-watcher` examples directly with Terraform
-1.4.0 and the latest Terraform release.
+`multi-runner`, `multi-runner-v2`, and `termination-watcher` examples directly
+with Terraform 1.4.0 and the latest Terraform release.
 The examples with input variables get their inputs from their own tfvars files
 in this directory. The `termination-watcher` example has no input variables
 and uses the configuration checked into the example itself. No override files,
-setup module, or checked-in Terraform fixture configuration is used. The
-helper creates and removes a temporary AMI override for `default` and
-`ephemeral`, and temporary SSM parameters for `multi-runner`.
+setup module, or Terraform fixture configuration is checked in. The helper
+creates and removes a temporary AMI override for `default` and
+`ephemeral`, temporary SSM parameters for `multi-runner`, and temporary AMI
+fixtures plus an override for `multi-runner-v2`.
 
 Start MiniStack, set the AWS endpoint and test credentials, then run:
 
@@ -23,6 +24,8 @@ tests/ministack/run-example.sh apply ephemeral
 # or
 tests/ministack/run-example.sh apply multi-runner
 # or
+tests/ministack/run-example.sh apply multi-runner-v2
+# or
 tests/ministack/run-example.sh apply termination-watcher
 ```
 
diff --git a/tests/ministack/multi-runner-v2.tfvars b/tests/ministack/multi-runner-v2.tfvars
new file mode 100644
index 0000000000..0d646a95f2
--- /dev/null
+++ b/tests/ministack/multi-runner-v2.tfvars
@@ -0,0 +1,7 @@
+environment = "ministack-multi-runner-v2"
+aws_region  = "eu-west-1"
+
+github_app = {
+  id         = "0"
+  key_base64 = "ministack-invalid-key"
+}
diff --git a/tests/ministack/run-example.sh b/tests/ministack/run-example.sh
index e1a1b6a813..3f8be94d19 100755
--- a/tests/ministack/run-example.sh
+++ b/tests/ministack/run-example.sh
@@ -14,14 +14,14 @@ example="${2:-}"
 tfvars_file="${3:-${MINISTACK_TFVARS_FILE:-}}"
 
 case "$example" in
-  base | prebuilt | default | ephemeral | multi-runner)
+  base | prebuilt | default | ephemeral | multi-runner | multi-runner-v2)
     use_tfvars=true
     ;;
   termination-watcher)
     use_tfvars=false
     ;;
   *)
-  echo "Supported examples for the runner are: base, prebuilt, default, ephemeral, multi-runner, termination-watcher" >&2
+  echo "Supported examples for the runner are: base, prebuilt, default, ephemeral, multi-runner, multi-runner-v2, termination-watcher" >&2
   exit 64
   ;;
 esac
@@ -29,7 +29,7 @@ esac
 case "$action" in
   init | plan | apply | destroy) ;;
   *)
-    echo "Usage: $0 {init|plan|apply|destroy} {base|prebuilt|default|ephemeral|multi-runner|termination-watcher} [TFVARS_FILE]" >&2
+    echo "Usage: $0 {init|plan|apply|destroy} {base|prebuilt|default|ephemeral|multi-runner|multi-runner-v2|termination-watcher} [TFVARS_FILE]" >&2
     exit 64
     ;;
 esac
@@ -195,6 +195,111 @@ create_multi_runner_override() {
 $override_file"
 }
 
+create_multi_runner_v2_override() {
+  override_file="$example_root/zz_ministack_override.tf"
+  printf '%s\n' \
+    'module "runners" {' \
+    '  global_config_compute_provider = {' \
+    '    aws = {' \
+    '      ec2 = {' \
+    '        vpc_id      = module.base.vpc.vpc_id' \
+    '        subnet_ids  = module.base.vpc.private_subnets' \
+    '        ssm_enabled = true' \
+    '        runner_binaries = {' \
+    '          enabled = false' \
+    '        }' \
+    '      }' \
+    '    }' \
+    '  }' \
+    '  multi_runner_config = {' \
+    '    linux-arm64 = {' \
+    '      runner = {' \
+    '        architecture = "arm64"' \
+    '        name_prefix  = "amazon-arm64-"' \
+    '        extra_labels = ["amazon"]' \
+    '      }' \
+    '      orchestration_provider = {' \
+    '        webhook = {' \
+    '          runner = { maximum_count = 1 }' \
+    '          matcherConfig = {' \
+    '            exactMatch    = true' \
+    '            labelMatchers = [["self-hosted", "linux", "arm64", "amazon"]]' \
+    '          }' \
+    '        }' \
+    '      }' \
+    '      compute_provider = {' \
+    '        aws = {' \
+    '          ec2 = {' \
+    '            instance_types = ["t4g.large", "c6g.large"]' \
+    '            ami = {' \
+    '              filter = { name = ["ministack-v2-linux-arm64"], state = ["available"] }' \
+    '              owners = ["self"]' \
+    '            }' \
+    '          }' \
+    '        }' \
+    '      }' \
+    '    }' \
+    '    linux-x64 = {' \
+    '      runner = {' \
+    '        name_prefix  = "amazon-x64-"' \
+    '        extra_labels = ["amazon"]' \
+    '      }' \
+    '      orchestration_provider = {' \
+    '        webhook = {' \
+    '          runner = { ephemeral = true, maximum_count = 1 }' \
+    '          matcherConfig = {' \
+    '            labelMatchers = [["self-hosted", "linux", "x64", "amazon"]]' \
+    '            exactMatch    = false' \
+    '            priority      = 1' \
+    '          }' \
+    '          queue     = { delay_webhook_event = 0 }' \
+    '          job_retry = { enabled = true }' \
+    '        }' \
+    '      }' \
+    '      compute_provider = {' \
+    '        aws = {' \
+    '          ec2 = {' \
+    '            instance_types = ["m5a.large", "m5ad.large"]' \
+    '            ami = {' \
+    '              filter = { name = ["ministack-v2-linux-x64"], state = ["available"] }' \
+    '              owners = ["self"]' \
+    '            }' \
+    '          }' \
+    '        }' \
+    '      }' \
+    '    }' \
+    '    windows-x64 = {' \
+    '      runner = {' \
+    '        os          = "windows"' \
+    '        name_prefix = "windows-x64-"' \
+    '      }' \
+    '      orchestration_provider = {' \
+    '        webhook = {' \
+    '          runner = { boot_time_in_minutes = 20, maximum_count = 1 }' \
+    '          matcherConfig = {' \
+    '            exactMatch    = true' \
+    '            labelMatchers = [["self-hosted", "windows", "x64", "servercore-2022"]]' \
+    '          }' \
+    '        }' \
+    '      }' \
+    '      compute_provider = {' \
+    '        aws = {' \
+    '          ec2 = {' \
+    '            instance_types = ["m5.large", "c5.large"]' \
+    '            ami = {' \
+    '              filter = { name = ["ministack-v2-windows-x64"], state = ["available"] }' \
+    '              owners = ["self"]' \
+    '            }' \
+    '          }' \
+    '        }' \
+    '      }' \
+    '    }' \
+    '  }' \
+    '}' > "$override_file"
+  override_created_paths="$override_created_paths
+$override_file"
+}
+
 create_ministack_fixtures() {
   if ! command -v aws >/dev/null 2>&1; then
     echo "AWS CLI is required to seed MiniStack API fixtures." >&2
@@ -245,6 +350,12 @@ $lambda_zip"
         "/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-6.1-arm64" \
         "ami-0abcdef1234567890"
       ;;
+    multi-runner-v2)
+      create_multi_runner_v2_override
+      create_ami_fixture "ministack-v2-linux-arm64" arm64 >/dev/null
+      create_ami_fixture "ministack-v2-linux-x64" x86_64 >/dev/null
+      create_ami_fixture "ministack-v2-windows-x64" x86_64 >/dev/null
+      ;;
   esac
 }