From 7db4d16951ff97cd489e92da1d81d006731f6bbe Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Wed, 10 Dec 2025 11:34:15 -0800
Subject: [PATCH 01/23] Initial commit for .NET 11 images

---
 .portal-docs/docker-hub/README.aspnet.md      |    2 +
 .../docker-hub/README.runtime-deps.md         |    2 +
 .portal-docs/docker-hub/README.runtime.md     |    2 +
 .portal-docs/docker-hub/README.sdk.md         |    2 +
 .portal-docs/mar/README.aspnet.portal.md      |    2 +
 .../mar/README.runtime-deps.portal.md         |    2 +
 .portal-docs/mar/README.runtime.portal.md     |    2 +
 .portal-docs/mar/README.sdk.portal.md         |    2 +
 README.aspnet.md                              |   64 +-
 README.runtime-deps.md                        |   50 +-
 README.runtime.md                             |   48 +-
 README.sdk.md                                 |   46 +-
 .../aspnet-tags.yml                           |   18 +
 .../runtime-deps-tags.yml                     |   10 +
 .../runtime-tags.yml                          |   12 +
 eng/mcr-tags-metadata-templates/sdk-tags.yml  |   12 +
 eng/readme-templates/FeaturedTags.md          |    4 +-
 manifest.json                                 | 8736 +++++++++++------
 manifest.versions.json                        |   39 +
 .../alpine3.22-composite/amd64/Dockerfile     |   29 +
 .../alpine3.22-composite/arm32v7/Dockerfile   |   29 +
 .../alpine3.22-composite/arm64v8/Dockerfile   |   29 +
 src/aspnet/11.0/alpine3.22/amd64/Dockerfile   |   25 +
 src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile |   25 +
 src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile |   25 +
 .../alpine3.23-composite/amd64/Dockerfile     |   29 +
 .../alpine3.23-composite/arm32v7/Dockerfile   |   29 +
 .../alpine3.23-composite/arm64v8/Dockerfile   |   29 +
 src/aspnet/11.0/alpine3.23/amd64/Dockerfile   |   25 +
 src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile |   25 +
 src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile |   25 +
 .../amd64/Dockerfile                          |   41 +
 .../arm64v8/Dockerfile                        |   41 +
 .../amd64/Dockerfile                          |   41 +
 .../arm64v8/Dockerfile                        |   41 +
 .../amd64/Dockerfile                          |   31 +
 .../arm64v8/Dockerfile                        |   31 +
 .../azurelinux3.0-distroless/amd64/Dockerfile |   31 +
 .../arm64v8/Dockerfile                        |   31 +
 .../11.0/azurelinux3.0/amd64/Dockerfile       |   29 +
 .../11.0/azurelinux3.0/arm64v8/Dockerfile     |   29 +
 .../11.0/nanoserver-ltsc2022/amd64/Dockerfile |   38 +
 .../11.0/nanoserver-ltsc2025/amd64/Dockerfile |   38 +
 .../amd64/Dockerfile                          |   35 +
 .../arm32v7/Dockerfile                        |   35 +
 .../arm64v8/Dockerfile                        |   35 +
 .../noble-chiseled-composite/amd64/Dockerfile |   35 +
 .../arm32v7/Dockerfile                        |   35 +
 .../arm64v8/Dockerfile                        |   35 +
 .../noble-chiseled-extra/amd64/Dockerfile     |   25 +
 .../noble-chiseled-extra/arm32v7/Dockerfile   |   25 +
 .../noble-chiseled-extra/arm64v8/Dockerfile   |   25 +
 .../11.0/noble-chiseled/amd64/Dockerfile      |   25 +
 .../11.0/noble-chiseled/arm32v7/Dockerfile    |   25 +
 .../11.0/noble-chiseled/arm64v8/Dockerfile    |   25 +
 src/aspnet/11.0/noble/amd64/Dockerfile        |   25 +
 src/aspnet/11.0/noble/arm32v7/Dockerfile      |   25 +
 src/aspnet/11.0/noble/arm64v8/Dockerfile      |   25 +
 .../amd64/Dockerfile                          |   38 +
 .../amd64/Dockerfile                          |   38 +
 .../11.0/alpine3.22-extra/amd64/Dockerfile    |   30 +
 .../11.0/alpine3.22-extra/arm32v7/Dockerfile  |   30 +
 .../11.0/alpine3.22-extra/arm64v8/Dockerfile  |   30 +
 .../11.0/alpine3.22/amd64/Dockerfile          |   29 +
 .../11.0/alpine3.22/arm32v7/Dockerfile        |   29 +
 .../11.0/alpine3.22/arm64v8/Dockerfile        |   29 +
 .../11.0/alpine3.23-extra/amd64/Dockerfile    |   30 +
 .../11.0/alpine3.23-extra/arm32v7/Dockerfile  |   30 +
 .../11.0/alpine3.23-extra/arm64v8/Dockerfile  |   30 +
 .../11.0/alpine3.23/amd64/Dockerfile          |   29 +
 .../11.0/alpine3.23/arm32v7/Dockerfile        |   29 +
 .../11.0/alpine3.23/arm64v8/Dockerfile        |   29 +
 .../amd64/Dockerfile                          |   73 +
 .../arm64v8/Dockerfile                        |   73 +
 .../azurelinux3.0-distroless/amd64/Dockerfile |   73 +
 .../arm64v8/Dockerfile                        |   73 +
 .../11.0/azurelinux3.0/amd64/Dockerfile       |   36 +
 .../11.0/azurelinux3.0/arm64v8/Dockerfile     |   36 +
 .../noble-chiseled-extra/amd64/Dockerfile     |   58 +
 .../noble-chiseled-extra/arm32v7/Dockerfile   |   58 +
 .../noble-chiseled-extra/arm64v8/Dockerfile   |   58 +
 .../11.0/noble-chiseled/amd64/Dockerfile      |   57 +
 .../11.0/noble-chiseled/arm32v7/Dockerfile    |   57 +
 .../11.0/noble-chiseled/arm64v8/Dockerfile    |   57 +
 src/runtime-deps/11.0/noble/amd64/Dockerfile  |   33 +
 .../11.0/noble/arm32v7/Dockerfile             |   33 +
 .../11.0/noble/arm64v8/Dockerfile             |   33 +
 src/runtime/11.0/alpine3.22/amd64/Dockerfile  |   27 +
 .../11.0/alpine3.22/arm32v7/Dockerfile        |   27 +
 .../11.0/alpine3.22/arm64v8/Dockerfile        |   27 +
 src/runtime/11.0/alpine3.23/amd64/Dockerfile  |   27 +
 .../11.0/alpine3.23/arm32v7/Dockerfile        |   27 +
 .../11.0/alpine3.23/arm64v8/Dockerfile        |   27 +
 .../amd64/Dockerfile                          |   38 +
 .../arm64v8/Dockerfile                        |   38 +
 .../azurelinux3.0-distroless/amd64/Dockerfile |   38 +
 .../arm64v8/Dockerfile                        |   38 +
 .../11.0/azurelinux3.0/amd64/Dockerfile       |   31 +
 .../11.0/azurelinux3.0/arm64v8/Dockerfile     |   31 +
 .../11.0/nanoserver-ltsc2022/amd64/Dockerfile |   46 +
 .../11.0/nanoserver-ltsc2025/amd64/Dockerfile |   46 +
 .../noble-chiseled-extra/amd64/Dockerfile     |   32 +
 .../noble-chiseled-extra/arm32v7/Dockerfile   |   32 +
 .../noble-chiseled-extra/arm64v8/Dockerfile   |   32 +
 .../11.0/noble-chiseled/amd64/Dockerfile      |   32 +
 .../11.0/noble-chiseled/arm32v7/Dockerfile    |   32 +
 .../11.0/noble-chiseled/arm64v8/Dockerfile    |   32 +
 src/runtime/11.0/noble/amd64/Dockerfile       |   27 +
 src/runtime/11.0/noble/arm32v7/Dockerfile     |   27 +
 src/runtime/11.0/noble/arm64v8/Dockerfile     |   27 +
 .../amd64/Dockerfile                          |   43 +
 .../amd64/Dockerfile                          |   43 +
 src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile  |    8 +
 .../11.0/alpine3.22-aot/arm64v8/Dockerfile    |    8 +
 src/sdk/11.0/alpine3.22/amd64/Dockerfile      |   67 +
 src/sdk/11.0/alpine3.22/arm32v7/Dockerfile    |   47 +
 src/sdk/11.0/alpine3.22/arm64v8/Dockerfile    |   47 +
 src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile  |    8 +
 .../11.0/alpine3.23-aot/arm64v8/Dockerfile    |    8 +
 src/sdk/11.0/alpine3.23/amd64/Dockerfile      |   67 +
 src/sdk/11.0/alpine3.23/arm32v7/Dockerfile    |   47 +
 src/sdk/11.0/alpine3.23/arm64v8/Dockerfile    |   47 +
 .../11.0/azurelinux3.0-aot/amd64/Dockerfile   |    9 +
 .../11.0/azurelinux3.0-aot/arm64v8/Dockerfile |    9 +
 src/sdk/11.0/azurelinux3.0/amd64/Dockerfile   |   65 +
 src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile |   65 +
 .../11.0/nanoserver-ltsc2022/amd64/Dockerfile |   95 +
 .../11.0/nanoserver-ltsc2025/amd64/Dockerfile |   95 +
 src/sdk/11.0/noble-aot/amd64/Dockerfile       |   10 +
 src/sdk/11.0/noble-aot/arm64v8/Dockerfile     |   10 +
 src/sdk/11.0/noble/amd64/Dockerfile           |   63 +
 src/sdk/11.0/noble/arm32v7/Dockerfile         |   63 +
 src/sdk/11.0/noble/arm64v8/Dockerfile         |   63 +
 .../amd64/Dockerfile                          |   92 +
 .../amd64/Dockerfile                          |   92 +
 ...0-alpine3.22-amd64-Dockerfile.approved.txt |   27 +
 ...alpine3.22-arm32v7-Dockerfile.approved.txt |   27 +
 ...alpine3.22-arm64v8-Dockerfile.approved.txt |   27 +
 ...22-composite-amd64-Dockerfile.approved.txt |   31 +
 ...-composite-arm32v7-Dockerfile.approved.txt |   31 +
 ...-composite-arm64v8-Dockerfile.approved.txt |   31 +
 ...0-alpine3.23-amd64-Dockerfile.approved.txt |   27 +
 ...alpine3.23-arm32v7-Dockerfile.approved.txt |   27 +
 ...alpine3.23-arm64v8-Dockerfile.approved.txt |   27 +
 ...23-composite-amd64-Dockerfile.approved.txt |   31 +
 ...-composite-arm32v7-Dockerfile.approved.txt |   31 +
 ...-composite-arm64v8-Dockerfile.approved.txt |   31 +
 ...zurelinux3.0-amd64-Dockerfile.approved.txt |   31 +
 ...relinux3.0-arm64v8-Dockerfile.approved.txt |   31 +
 ...0-distroless-amd64-Dockerfile.approved.txt |   33 +
 ...distroless-arm64v8-Dockerfile.approved.txt |   33 +
 ...ss-composite-amd64-Dockerfile.approved.txt |   43 +
 ...-composite-arm64v8-Dockerfile.approved.txt |   43 +
 ...posite-extra-amd64-Dockerfile.approved.txt |   43 +
 ...site-extra-arm64v8-Dockerfile.approved.txt |   43 +
 ...roless-extra-amd64-Dockerfile.approved.txt |   33 +
 ...less-extra-arm64v8-Dockerfile.approved.txt |   33 +
 ...ver-ltsc2022-amd64-Dockerfile.approved.txt |   44 +
 ...ver-ltsc2025-amd64-Dockerfile.approved.txt |   44 +
 ...t-11.0-noble-amd64-Dockerfile.approved.txt |   27 +
 ...11.0-noble-arm32v7-Dockerfile.approved.txt |   27 +
 ...11.0-noble-arm64v8-Dockerfile.approved.txt |   27 +
 ...ble-chiseled-amd64-Dockerfile.approved.txt |   27 +
 ...e-chiseled-arm32v7-Dockerfile.approved.txt |   27 +
 ...e-chiseled-arm64v8-Dockerfile.approved.txt |   27 +
 ...ed-composite-amd64-Dockerfile.approved.txt |   37 +
 ...-composite-arm32v7-Dockerfile.approved.txt |   37 +
 ...-composite-arm64v8-Dockerfile.approved.txt |   37 +
 ...posite-extra-amd64-Dockerfile.approved.txt |   37 +
 ...site-extra-arm32v7-Dockerfile.approved.txt |   37 +
 ...site-extra-arm64v8-Dockerfile.approved.txt |   37 +
 ...iseled-extra-amd64-Dockerfile.approved.txt |   27 +
 ...eled-extra-arm32v7-Dockerfile.approved.txt |   27 +
 ...eled-extra-arm64v8-Dockerfile.approved.txt |   27 +
 ...ore-ltsc2022-amd64-Dockerfile.approved.txt |   44 +
 ...ore-ltsc2025-amd64-Dockerfile.approved.txt |   44 +
 ...0-alpine3.22-amd64-Dockerfile.approved.txt |   29 +
 ...alpine3.22-arm32v7-Dockerfile.approved.txt |   29 +
 ...alpine3.22-arm64v8-Dockerfile.approved.txt |   29 +
 ...0-alpine3.23-amd64-Dockerfile.approved.txt |   29 +
 ...alpine3.23-arm32v7-Dockerfile.approved.txt |   29 +
 ...alpine3.23-arm64v8-Dockerfile.approved.txt |   29 +
 ...zurelinux3.0-amd64-Dockerfile.approved.txt |   33 +
 ...relinux3.0-arm64v8-Dockerfile.approved.txt |   33 +
 ...0-distroless-amd64-Dockerfile.approved.txt |   40 +
 ...distroless-arm64v8-Dockerfile.approved.txt |   40 +
 ...roless-extra-amd64-Dockerfile.approved.txt |   40 +
 ...less-extra-arm64v8-Dockerfile.approved.txt |   40 +
 ...ver-ltsc2022-amd64-Dockerfile.approved.txt |   52 +
 ...ver-ltsc2025-amd64-Dockerfile.approved.txt |   52 +
 ...e-11.0-noble-amd64-Dockerfile.approved.txt |   29 +
 ...11.0-noble-arm32v7-Dockerfile.approved.txt |   29 +
 ...11.0-noble-arm64v8-Dockerfile.approved.txt |   29 +
 ...ble-chiseled-amd64-Dockerfile.approved.txt |   34 +
 ...e-chiseled-arm32v7-Dockerfile.approved.txt |   34 +
 ...e-chiseled-arm64v8-Dockerfile.approved.txt |   34 +
 ...iseled-extra-amd64-Dockerfile.approved.txt |   34 +
 ...eled-extra-arm32v7-Dockerfile.approved.txt |   34 +
 ...eled-extra-arm64v8-Dockerfile.approved.txt |   34 +
 ...ore-ltsc2022-amd64-Dockerfile.approved.txt |   49 +
 ...ore-ltsc2025-amd64-Dockerfile.approved.txt |   49 +
 ...0-alpine3.22-amd64-Dockerfile.approved.txt |   29 +
 ...alpine3.22-arm32v7-Dockerfile.approved.txt |   29 +
 ...alpine3.22-arm64v8-Dockerfile.approved.txt |   29 +
 ...ne3.22-extra-amd64-Dockerfile.approved.txt |   30 +
 ...3.22-extra-arm32v7-Dockerfile.approved.txt |   30 +
 ...3.22-extra-arm64v8-Dockerfile.approved.txt |   30 +
 ...0-alpine3.23-amd64-Dockerfile.approved.txt |   29 +
 ...alpine3.23-arm32v7-Dockerfile.approved.txt |   29 +
 ...alpine3.23-arm64v8-Dockerfile.approved.txt |   29 +
 ...ne3.23-extra-amd64-Dockerfile.approved.txt |   30 +
 ...3.23-extra-arm32v7-Dockerfile.approved.txt |   30 +
 ...3.23-extra-arm64v8-Dockerfile.approved.txt |   30 +
 ...zurelinux3.0-amd64-Dockerfile.approved.txt |   36 +
 ...relinux3.0-arm64v8-Dockerfile.approved.txt |   36 +
 ...0-distroless-amd64-Dockerfile.approved.txt |   73 +
 ...distroless-arm64v8-Dockerfile.approved.txt |   73 +
 ...roless-extra-amd64-Dockerfile.approved.txt |   73 +
 ...less-extra-arm64v8-Dockerfile.approved.txt |   73 +
 ...s-11.0-noble-amd64-Dockerfile.approved.txt |   33 +
 ...11.0-noble-arm32v7-Dockerfile.approved.txt |   33 +
 ...11.0-noble-arm64v8-Dockerfile.approved.txt |   33 +
 ...ble-chiseled-amd64-Dockerfile.approved.txt |   57 +
 ...e-chiseled-arm32v7-Dockerfile.approved.txt |   57 +
 ...e-chiseled-arm64v8-Dockerfile.approved.txt |   57 +
 ...iseled-extra-amd64-Dockerfile.approved.txt |   58 +
 ...eled-extra-arm32v7-Dockerfile.approved.txt |   58 +
 ...eled-extra-arm64v8-Dockerfile.approved.txt |   58 +
 ...0-alpine3.22-amd64-Dockerfile.approved.txt |   69 +
 ...pine3.22-aot-amd64-Dockerfile.approved.txt |    8 +
 ...ne3.22-aot-arm64v8-Dockerfile.approved.txt |    8 +
 ...alpine3.22-arm32v7-Dockerfile.approved.txt |   49 +
 ...alpine3.22-arm64v8-Dockerfile.approved.txt |   49 +
 ...0-alpine3.23-amd64-Dockerfile.approved.txt |   69 +
 ...pine3.23-aot-amd64-Dockerfile.approved.txt |    8 +
 ...ne3.23-aot-arm64v8-Dockerfile.approved.txt |    8 +
 ...alpine3.23-arm32v7-Dockerfile.approved.txt |   49 +
 ...alpine3.23-arm64v8-Dockerfile.approved.txt |   49 +
 ...zurelinux3.0-amd64-Dockerfile.approved.txt |   67 +
 ...linux3.0-aot-amd64-Dockerfile.approved.txt |    9 +
 ...nux3.0-aot-arm64v8-Dockerfile.approved.txt |    9 +
 ...relinux3.0-arm64v8-Dockerfile.approved.txt |   67 +
 ...ver-ltsc2022-amd64-Dockerfile.approved.txt |  102 +
 ...ver-ltsc2025-amd64-Dockerfile.approved.txt |  102 +
 ...k-11.0-noble-amd64-Dockerfile.approved.txt |   65 +
 ....0-noble-aot-amd64-Dockerfile.approved.txt |   10 +
 ...-noble-aot-arm64v8-Dockerfile.approved.txt |   10 +
 ...11.0-noble-arm32v7-Dockerfile.approved.txt |   65 +
 ...11.0-noble-arm64v8-Dockerfile.approved.txt |   65 +
 ...ore-ltsc2022-amd64-Dockerfile.approved.txt |   99 +
 ...ore-ltsc2025-amd64-Dockerfile.approved.txt |   99 +
 .../ImageVersion.cs                           |    1 +
 .../Microsoft.DotNet.Docker.Tests/TestData.cs |   89 +
 253 files changed, 14901 insertions(+), 3120 deletions(-)
 create mode 100644 src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.22/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.23/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile
 create mode 100644 src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile
 create mode 100644 src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile
 create mode 100644 src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/noble-chiseled/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile
 create mode 100644 src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/noble/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/noble/arm32v7/Dockerfile
 create mode 100644 src/aspnet/11.0/noble/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.22-extra/amd64/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.22-extra/arm32v7/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.22-extra/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.22/amd64/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.22/arm32v7/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.22/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
 create mode 100644 src/runtime-deps/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/11.0/azurelinux3.0-distroless/amd64/Dockerfile
 create mode 100644 src/runtime-deps/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/11.0/azurelinux3.0/amd64/Dockerfile
 create mode 100644 src/runtime-deps/11.0/azurelinux3.0/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/11.0/noble-chiseled-extra/amd64/Dockerfile
 create mode 100644 src/runtime-deps/11.0/noble-chiseled-extra/arm32v7/Dockerfile
 create mode 100644 src/runtime-deps/11.0/noble-chiseled-extra/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/11.0/noble-chiseled/amd64/Dockerfile
 create mode 100644 src/runtime-deps/11.0/noble-chiseled/arm32v7/Dockerfile
 create mode 100644 src/runtime-deps/11.0/noble-chiseled/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/11.0/noble/amd64/Dockerfile
 create mode 100644 src/runtime-deps/11.0/noble/arm32v7/Dockerfile
 create mode 100644 src/runtime-deps/11.0/noble/arm64v8/Dockerfile
 create mode 100644 src/runtime/11.0/alpine3.22/amd64/Dockerfile
 create mode 100644 src/runtime/11.0/alpine3.22/arm32v7/Dockerfile
 create mode 100644 src/runtime/11.0/alpine3.22/arm64v8/Dockerfile
 create mode 100644 src/runtime/11.0/alpine3.23/amd64/Dockerfile
 create mode 100644 src/runtime/11.0/alpine3.23/arm32v7/Dockerfile
 create mode 100644 src/runtime/11.0/alpine3.23/arm64v8/Dockerfile
 create mode 100644 src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
 create mode 100644 src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
 create mode 100644 src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile
 create mode 100644 src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
 create mode 100644 src/runtime/11.0/azurelinux3.0/amd64/Dockerfile
 create mode 100644 src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile
 create mode 100644 src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile
 create mode 100644 src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile
 create mode 100644 src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile
 create mode 100644 src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile
 create mode 100644 src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile
 create mode 100644 src/runtime/11.0/noble-chiseled/amd64/Dockerfile
 create mode 100644 src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile
 create mode 100644 src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile
 create mode 100644 src/runtime/11.0/noble/amd64/Dockerfile
 create mode 100644 src/runtime/11.0/noble/arm32v7/Dockerfile
 create mode 100644 src/runtime/11.0/noble/arm64v8/Dockerfile
 create mode 100644 src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
 create mode 100644 src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
 create mode 100644 src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile
 create mode 100644 src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile
 create mode 100644 src/sdk/11.0/alpine3.22/amd64/Dockerfile
 create mode 100644 src/sdk/11.0/alpine3.22/arm32v7/Dockerfile
 create mode 100644 src/sdk/11.0/alpine3.22/arm64v8/Dockerfile
 create mode 100644 src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile
 create mode 100644 src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile
 create mode 100644 src/sdk/11.0/alpine3.23/amd64/Dockerfile
 create mode 100644 src/sdk/11.0/alpine3.23/arm32v7/Dockerfile
 create mode 100644 src/sdk/11.0/alpine3.23/arm64v8/Dockerfile
 create mode 100644 src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile
 create mode 100644 src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile
 create mode 100644 src/sdk/11.0/azurelinux3.0/amd64/Dockerfile
 create mode 100644 src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile
 create mode 100644 src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile
 create mode 100644 src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile
 create mode 100644 src/sdk/11.0/noble-aot/amd64/Dockerfile
 create mode 100644 src/sdk/11.0/noble-aot/arm64v8/Dockerfile
 create mode 100644 src/sdk/11.0/noble/amd64/Dockerfile
 create mode 100644 src/sdk/11.0/noble/arm32v7/Dockerfile
 create mode 100644 src/sdk/11.0/noble/arm64v8/Dockerfile
 create mode 100644 src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
 create mode 100644 src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-aot-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-aot-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-aot-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-aot-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-aot-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-aot-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-aot-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-aot-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt

diff --git a/.portal-docs/docker-hub/README.aspnet.md b/.portal-docs/docker-hub/README.aspnet.md
index abb3e1f3b0..08626fa305 100644
--- a/.portal-docs/docker-hub/README.aspnet.md
+++ b/.portal-docs/docker-hub/README.aspnet.md
@@ -4,6 +4,8 @@
 
 # Featured Tags
 
+* `11.0-preview` (Preview)
+  * `docker pull mcr.microsoft.com/dotnet/nightly/aspnet:11.0-preview`
 * `10.0` (Long-Term Support)
   * `docker pull mcr.microsoft.com/dotnet/nightly/aspnet:10.0`
 * `9.0` (Standard Support)
diff --git a/.portal-docs/docker-hub/README.runtime-deps.md b/.portal-docs/docker-hub/README.runtime-deps.md
index 3cb3508f4e..20e273c7a2 100644
--- a/.portal-docs/docker-hub/README.runtime-deps.md
+++ b/.portal-docs/docker-hub/README.runtime-deps.md
@@ -4,6 +4,8 @@
 
 # Featured Tags
 
+* `11.0-preview` (Preview)
+  * `docker pull mcr.microsoft.com/dotnet/nightly/runtime-deps:11.0-preview`
 * `10.0` (Long-Term Support)
   * `docker pull mcr.microsoft.com/dotnet/nightly/runtime-deps:10.0`
 * `9.0` (Standard Support)
diff --git a/.portal-docs/docker-hub/README.runtime.md b/.portal-docs/docker-hub/README.runtime.md
index 1266138cfb..070689f494 100644
--- a/.portal-docs/docker-hub/README.runtime.md
+++ b/.portal-docs/docker-hub/README.runtime.md
@@ -4,6 +4,8 @@
 
 # Featured Tags
 
+* `11.0-preview` (Preview)
+  * `docker pull mcr.microsoft.com/dotnet/nightly/runtime:11.0-preview`
 * `10.0` (Long-Term Support)
   * `docker pull mcr.microsoft.com/dotnet/nightly/runtime:10.0`
 * `9.0` (Standard Support)
diff --git a/.portal-docs/docker-hub/README.sdk.md b/.portal-docs/docker-hub/README.sdk.md
index 8abed80bd2..8904320240 100644
--- a/.portal-docs/docker-hub/README.sdk.md
+++ b/.portal-docs/docker-hub/README.sdk.md
@@ -4,6 +4,8 @@
 
 # Featured Tags
 
+* `11.0-preview` (Preview)
+  * `docker pull mcr.microsoft.com/dotnet/nightly/sdk:11.0-preview`
 * `10.0` (Long-Term Support)
   * `docker pull mcr.microsoft.com/dotnet/nightly/sdk:10.0`
 * `9.0` (Standard Support)
diff --git a/.portal-docs/mar/README.aspnet.portal.md b/.portal-docs/mar/README.aspnet.portal.md
index c57307b6e6..279aa14ce5 100644
--- a/.portal-docs/mar/README.aspnet.portal.md
+++ b/.portal-docs/mar/README.aspnet.portal.md
@@ -10,6 +10,8 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori
 
 ## Featured Tags
 
+* `11.0-preview` (Preview)
+  * `docker pull mcr.microsoft.com/dotnet/nightly/aspnet:11.0-preview`
 * `10.0` (Long-Term Support)
   * `docker pull mcr.microsoft.com/dotnet/nightly/aspnet:10.0`
 * `9.0` (Standard Support)
diff --git a/.portal-docs/mar/README.runtime-deps.portal.md b/.portal-docs/mar/README.runtime-deps.portal.md
index d007152d4d..7e77e65375 100644
--- a/.portal-docs/mar/README.runtime-deps.portal.md
+++ b/.portal-docs/mar/README.runtime-deps.portal.md
@@ -10,6 +10,8 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori
 
 ## Featured Tags
 
+* `11.0-preview` (Preview)
+  * `docker pull mcr.microsoft.com/dotnet/nightly/runtime-deps:11.0-preview`
 * `10.0` (Long-Term Support)
   * `docker pull mcr.microsoft.com/dotnet/nightly/runtime-deps:10.0`
 * `9.0` (Standard Support)
diff --git a/.portal-docs/mar/README.runtime.portal.md b/.portal-docs/mar/README.runtime.portal.md
index 2d56bed226..0dd0cfe56d 100644
--- a/.portal-docs/mar/README.runtime.portal.md
+++ b/.portal-docs/mar/README.runtime.portal.md
@@ -10,6 +10,8 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori
 
 ## Featured Tags
 
+* `11.0-preview` (Preview)
+  * `docker pull mcr.microsoft.com/dotnet/nightly/runtime:11.0-preview`
 * `10.0` (Long-Term Support)
   * `docker pull mcr.microsoft.com/dotnet/nightly/runtime:10.0`
 * `9.0` (Standard Support)
diff --git a/.portal-docs/mar/README.sdk.portal.md b/.portal-docs/mar/README.sdk.portal.md
index 3283f793ba..b1a259c899 100644
--- a/.portal-docs/mar/README.sdk.portal.md
+++ b/.portal-docs/mar/README.sdk.portal.md
@@ -16,6 +16,8 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori
 
 ## Featured Tags
 
+* `11.0-preview` (Preview)
+  * `docker pull mcr.microsoft.com/dotnet/nightly/sdk:11.0-preview`
 * `10.0` (Long-Term Support)
   * `docker pull mcr.microsoft.com/dotnet/nightly/sdk:10.0`
 * `9.0` (Standard Support)
diff --git a/README.aspnet.md b/README.aspnet.md
index c4aede77bf..f2bb35d92c 100644
--- a/README.aspnet.md
+++ b/README.aspnet.md
@@ -6,6 +6,8 @@
 
 ## Featured Tags
 
+* `11.0-preview` (Preview)
+  * `docker pull mcr.microsoft.com/dotnet/nightly/aspnet:11.0-preview`
 * `10.0` (Long-Term Support)
   * `docker pull mcr.microsoft.com/dotnet/nightly/aspnet:10.0`
 * `9.0` (Standard Support)
@@ -87,7 +89,20 @@ For more information, see the [composite images section in the Image Variants do
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-amd64, 10.0-noble-amd64, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/aspnet/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-composite-amd64, 11.0-preview-noble-chiseled-composite-amd64, 11.0.0-preview.1.00000.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-composite-extra-amd64, 11.0-preview-noble-chiseled-composite-extra-amd64, 11.0.0-preview.1.00000.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+11.0.0-preview.1.00000.1-alpine3.22-composite-amd64, 11.0-preview-alpine3.22-composite-amd64, 11.0-preview-alpine-composite-amd64, 11.0.0-preview.1.00000.1-alpine3.22-composite, 11.0-preview-alpine3.22-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile) | Alpine 3.22
+11.0.0-preview.1.00000.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/aspnet/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+11.0.0-preview.1.00000.1-alpine3.23-composite-amd64, 11.0-preview-alpine3.23-composite-amd64, 11.0.0-preview.1.00000.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
+11.0.0-preview.1.00000.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite-amd64, 11.0-preview-azurelinux3.0-distroless-composite-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite, 11.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite-extra-amd64, 11.0-preview-azurelinux3.0-distroless-composite-extra-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite-extra, 11.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0
+10.0.1-noble-amd64, 10.0-noble-amd64, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/aspnet/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-composite-amd64, 10.0-noble-chiseled-composite-amd64, 10.0.1-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
@@ -137,11 +152,30 @@ Tags | Dockerfile | OS Version
 8.0.22-azurelinux3.0-distroless-composite-amd64, 8.0-azurelinux3.0-distroless-composite-amd64, 8.0.22-azurelinux3.0-distroless-composite, 8.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0
 8.0.22-azurelinux3.0-distroless-composite-extra-amd64, 8.0-azurelinux3.0-distroless-composite-extra-amd64, 8.0.22-azurelinux3.0-distroless-composite-extra, 8.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0
 
+#### .NET 11 Preview Tags
+
+Tags | Dockerfile | OS Version
+-----------| -------------| -------------
+11.0.0-preview.1.00000.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-arm64v8, 10.0-noble-arm64v8, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/aspnet/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-composite-arm64v8, 11.0-preview-noble-chiseled-composite-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-composite-extra-arm64v8, 11.0-preview-noble-chiseled-composite-extra-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+11.0.0-preview.1.00000.1-alpine3.22-composite-arm64v8, 11.0-preview-alpine3.22-composite-arm64v8, 11.0-preview-alpine-composite-arm64v8, 11.0.0-preview.1.00000.1-alpine3.22-composite, 11.0-preview-alpine3.22-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile) | Alpine 3.22
+11.0.0-preview.1.00000.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-preview.1.00000.1-alpine3.23-composite-arm64v8, 11.0-preview-alpine3.23-composite-arm64v8, 11.0.0-preview.1.00000.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite-arm64v8, 11.0-preview-azurelinux3.0-distroless-composite-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite, 11.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-composite-extra-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite-extra, 11.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.1-noble-arm64v8, 10.0-noble-arm64v8, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/aspnet/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-composite-arm64v8, 10.0-noble-chiseled-composite-arm64v8, 10.0.1-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -191,11 +225,25 @@ Tags | Dockerfile | OS Version
 8.0.22-azurelinux3.0-distroless-composite-arm64v8, 8.0-azurelinux3.0-distroless-composite-arm64v8, 8.0.22-azurelinux3.0-distroless-composite, 8.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0
 8.0.22-azurelinux3.0-distroless-composite-extra-arm64v8, 8.0-azurelinux3.0-distroless-composite-extra-arm64v8, 8.0.22-azurelinux3.0-distroless-composite-extra, 8.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 
+#### .NET 11 Preview Tags
+
+Tags | Dockerfile | OS Version
+-----------| -------------| -------------
+11.0.0-preview.1.00000.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-arm32v7, 10.0-noble-arm32v7, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/aspnet/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-composite-arm32v7, 11.0-preview-noble-chiseled-composite-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-composite-extra-arm32v7, 11.0-preview-noble-chiseled-composite-extra-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+11.0.0-preview.1.00000.1-alpine3.22-composite-arm32v7, 11.0-preview-alpine3.22-composite-arm32v7, 11.0-preview-alpine-composite-arm32v7, 11.0.0-preview.1.00000.1-alpine3.22-composite, 11.0-preview-alpine3.22-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile) | Alpine 3.22
+11.0.0-preview.1.00000.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-preview.1.00000.1-alpine3.23-composite-arm32v7, 11.0-preview-alpine3.23-composite-arm32v7, 11.0.0-preview.1.00000.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
+10.0.1-noble-arm32v7, 10.0-noble-arm32v7, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/aspnet/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-composite-arm32v7, 10.0-noble-chiseled-composite-arm32v7, 10.0.1-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04
@@ -225,10 +273,17 @@ Tags | Dockerfile | OS Version
 8.0.22-jammy-chiseled-composite-arm32v7, 8.0-jammy-chiseled-composite-arm32v7, 8.0.22-jammy-chiseled-composite, 8.0-jammy-chiseled-composite | [Dockerfile](src/aspnet/8.0/jammy-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 22.04
 8.0.22-jammy-chiseled-composite-extra-arm32v7, 8.0-jammy-chiseled-composite-extra-arm32v7, 8.0.22-jammy-chiseled-composite-extra, 8.0-jammy-chiseled-composite-extra | [Dockerfile](src/aspnet/8.0/jammy-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 22.04
 
+#### .NET 11 Preview Tags
+
+Tags | Dockerfile | OS Version
+-----------| -------------| -------------
+11.0.0-preview.1.00000.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+
 ### Nano Server 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
+11.0.0-preview.1.00000.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile)
 10.0.1-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile)
 9.0.11-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
 8.0.22-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
@@ -237,6 +292,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
+11.0.0-preview.1.00000.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 10.0.1-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 9.0.11-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 8.0.22-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
@@ -245,6 +301,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
+11.0.0-preview.1.00000.1-nanoserver-ltsc2022, 11.0-preview-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile)
 10.0.1-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile)
 9.0.11-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
 8.0.22-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/8.0/nanoserver-ltsc2022/amd64/Dockerfile)
@@ -253,6 +310,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
+11.0.0-preview.1.00000.1-windowsservercore-ltsc2022, 11.0-preview-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 10.0.1-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 9.0.11-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 8.0.22-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)
diff --git a/README.runtime-deps.md b/README.runtime-deps.md
index 3387596e49..3cfb0e002f 100644
--- a/README.runtime-deps.md
+++ b/README.runtime-deps.md
@@ -6,6 +6,8 @@
 
 ## Featured Tags
 
+* `11.0-preview` (Preview)
+  * `docker pull mcr.microsoft.com/dotnet/nightly/runtime-deps:11.0-preview`
 * `10.0` (Long-Term Support)
   * `docker pull mcr.microsoft.com/dotnet/nightly/runtime-deps:10.0`
 * `9.0` (Standard Support)
@@ -69,7 +71,16 @@ They contain the following features:
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-amd64, 10.0-noble-amd64, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/runtime-deps/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+11.0.0-preview.1.00000.1-alpine3.22-extra-amd64, 11.0-preview-alpine3.22-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.1.00000.1-alpine3.22-extra, 11.0-preview-alpine3.22-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
+11.0.0-preview.1.00000.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+11.0.0-preview.1.00000.1-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0.0-preview.1.00000.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+11.0.0-preview.1.00000.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
+10.0.1-noble-amd64, 10.0-noble-amd64, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime-deps/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.1-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
@@ -105,11 +116,26 @@ Tags | Dockerfile | OS Version
 8.0.22-azurelinux3.0-distroless-amd64, 8.0-azurelinux3.0-distroless-amd64, 8.0.22-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
 8.0.22-azurelinux3.0-distroless-extra-amd64, 8.0-azurelinux3.0-distroless-extra-amd64, 8.0.22-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
 
+#### .NET 11 Preview Tags
+
+Tags | Dockerfile | OS Version
+-----------| -------------| -------------
+11.0.0-preview.1.00000.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-arm64v8, 10.0-noble-arm64v8, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/runtime-deps/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+11.0.0-preview.1.00000.1-alpine3.22-extra-arm64v8, 11.0-preview-alpine3.22-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.1.00000.1-alpine3.22-extra, 11.0-preview-alpine3.22-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
+11.0.0-preview.1.00000.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-preview.1.00000.1-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0.0-preview.1.00000.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.1-noble-arm64v8, 10.0-noble-arm64v8, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime-deps/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.1-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
@@ -145,11 +171,23 @@ Tags | Dockerfile | OS Version
 8.0.22-azurelinux3.0-distroless-arm64v8, 8.0-azurelinux3.0-distroless-arm64v8, 8.0.22-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
 8.0.22-azurelinux3.0-distroless-extra-arm64v8, 8.0-azurelinux3.0-distroless-extra-arm64v8, 8.0.22-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 
+#### .NET 11 Preview Tags
+
+Tags | Dockerfile | OS Version
+-----------| -------------| -------------
+11.0.0-preview.1.00000.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-arm32v7, 10.0-noble-arm32v7, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/runtime-deps/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+11.0.0-preview.1.00000.1-alpine3.22-extra-arm32v7, 11.0-preview-alpine3.22-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.1.00000.1-alpine3.22-extra, 11.0-preview-alpine3.22-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
+11.0.0-preview.1.00000.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-preview.1.00000.1-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0.0-preview.1.00000.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+10.0.1-noble-arm32v7, 10.0-noble-arm32v7, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime-deps/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.1-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
@@ -172,6 +210,12 @@ Tags | Dockerfile | OS Version
 8.0.22-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.22-jammy, 8.0-jammy | [Dockerfile](src/runtime-deps/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
 8.0.22-jammy-chiseled-arm32v7, 8.0-jammy-chiseled-arm32v7, 8.0.22-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile) | Ubuntu 22.04
 8.0.22-jammy-chiseled-extra-arm32v7, 8.0-jammy-chiseled-extra-arm32v7, 8.0.22-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 22.04
+
+#### .NET 11 Preview Tags
+
+Tags | Dockerfile | OS Version
+-----------| -------------| -------------
+11.0.0-preview.1.00000.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 <!--End of generated tags-->
 
 *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/nightly/runtime-deps/tags/list) for all supported and unsupported tags.*
diff --git a/README.runtime.md b/README.runtime.md
index d4d093dd6e..9f54729957 100644
--- a/README.runtime.md
+++ b/README.runtime.md
@@ -6,6 +6,8 @@
 
 ## Featured Tags
 
+* `11.0-preview` (Preview)
+  * `docker pull mcr.microsoft.com/dotnet/nightly/runtime:11.0-preview`
 * `10.0` (Long-Term Support)
   * `docker pull mcr.microsoft.com/dotnet/nightly/runtime:10.0`
 * `9.0` (Standard Support)
@@ -76,7 +78,14 @@ They contain the following features:
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-amd64, 10.0-noble-amd64, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/runtime/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+11.0.0-preview.1.00000.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+11.0.0-preview.1.00000.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
+10.0.1-noble-amd64, 10.0-noble-amd64, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.1-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
@@ -106,11 +115,24 @@ Tags | Dockerfile | OS Version
 8.0.22-azurelinux3.0-distroless-amd64, 8.0-azurelinux3.0-distroless-amd64, 8.0.22-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
 8.0.22-azurelinux3.0-distroless-extra-amd64, 8.0-azurelinux3.0-distroless-extra-amd64, 8.0.22-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
 
+#### .NET 11 Preview Tags
+
+Tags | Dockerfile | OS Version
+-----------| -------------| -------------
+11.0.0-preview.1.00000.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-arm64v8, 10.0-noble-arm64v8, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/runtime/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+11.0.0-preview.1.00000.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.1-noble-arm64v8, 10.0-noble-arm64v8, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.1-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
@@ -140,11 +162,21 @@ Tags | Dockerfile | OS Version
 8.0.22-azurelinux3.0-distroless-arm64v8, 8.0-azurelinux3.0-distroless-arm64v8, 8.0.22-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
 8.0.22-azurelinux3.0-distroless-extra-arm64v8, 8.0-azurelinux3.0-distroless-extra-arm64v8, 8.0.22-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 
+#### .NET 11 Preview Tags
+
+Tags | Dockerfile | OS Version
+-----------| -------------| -------------
+11.0.0-preview.1.00000.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-arm32v7, 10.0-noble-arm32v7, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/runtime/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-preview.1.00000.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+11.0.0-preview.1.00000.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+10.0.1-noble-arm32v7, 10.0-noble-arm32v7, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.1-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
@@ -162,10 +194,17 @@ Tags | Dockerfile | OS Version
 8.0.22-jammy-chiseled-arm32v7, 8.0-jammy-chiseled-arm32v7, 8.0.22-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime/8.0/jammy-chiseled/arm32v7/Dockerfile) | Ubuntu 22.04
 8.0.22-jammy-chiseled-extra-arm32v7, 8.0-jammy-chiseled-extra-arm32v7, 8.0.22-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime/8.0/jammy-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 22.04
 
+#### .NET 11 Preview Tags
+
+Tags | Dockerfile | OS Version
+-----------| -------------| -------------
+11.0.0-preview.1.00000.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+
 ### Nano Server 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
+11.0.0-preview.1.00000.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile)
 10.0.1-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile)
 9.0.11-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
 8.0.22-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
@@ -174,6 +213,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
+11.0.0-preview.1.00000.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 10.0.1-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 9.0.11-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 8.0.22-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
@@ -182,6 +222,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
+11.0.0-preview.1.00000.1-nanoserver-ltsc2022, 11.0-preview-nanoserver-ltsc2022 | [Dockerfile](src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile)
 10.0.1-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile)
 9.0.11-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
 8.0.22-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/8.0/nanoserver-ltsc2022/amd64/Dockerfile)
@@ -190,6 +231,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
+11.0.0-preview.1.00000.1-windowsservercore-ltsc2022, 11.0-preview-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 10.0.1-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 9.0.11-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 8.0.22-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)
diff --git a/README.sdk.md b/README.sdk.md
index 062e27f2e4..22b58dd746 100644
--- a/README.sdk.md
+++ b/README.sdk.md
@@ -6,6 +6,8 @@
 
 ## Featured Tags
 
+* `11.0-preview` (Preview)
+  * `docker pull mcr.microsoft.com/dotnet/nightly/sdk:11.0-preview`
 * `10.0` (Long-Term Support)
   * `docker pull mcr.microsoft.com/dotnet/nightly/sdk:10.0`
 * `9.0` (Standard Support)
@@ -72,7 +74,14 @@ The [Image Variants documentation](https://github.com/dotnet/dotnet-docker/blob/
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.101-noble-amd64, 10.0-noble-amd64, 10.0.101-noble, 10.0-noble, 10.0.101, 10.0, latest | [Dockerfile](src/sdk/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+11.0.100-preview.1-noble-aot-amd64, 11.0-preview-noble-aot-amd64, 11.0.100-preview.1-noble-aot, 11.0-preview-noble-aot, 11.0.100-preview.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/noble-aot/amd64/Dockerfile) | Ubuntu 24.04
+11.0.100-preview.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.100-preview.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+11.0.100-preview.1-alpine3.22-aot-amd64, 11.0-preview-alpine3.22-aot-amd64, 11.0-preview-alpine-aot-amd64, 11.0.100-preview.1-alpine3.22-aot, 11.0-preview-alpine3.22-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile) | Alpine 3.22
+11.0.100-preview.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.100-preview.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/sdk/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+11.0.100-preview.1-alpine3.23-aot-amd64, 11.0-preview-alpine3.23-aot-amd64, 11.0.100-preview.1-alpine3.23-aot, 11.0-preview-alpine3.23-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile) | Alpine 3.23
+11.0.100-preview.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.100-preview.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+11.0.100-preview.1-azurelinux3.0-aot-amd64, 11.0-preview-azurelinux3.0-aot-amd64, 11.0.100-preview.1-azurelinux3.0-aot, 11.0-preview-azurelinux3.0-aot | [Dockerfile](src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile) | Azure Linux 3.0
+10.0.101-noble-amd64, 10.0-noble-amd64, 10.0.101-noble, 10.0-noble, 10.0.101, 10.0 | [Dockerfile](src/sdk/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 10.0.101-noble-aot-amd64, 10.0-noble-aot-amd64, 10.0.101-noble-aot, 10.0-noble-aot, 10.0.101-aot, 10.0-aot | [Dockerfile](src/sdk/10.0/noble-aot/amd64/Dockerfile) | Ubuntu 24.04
 10.0.101-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.101-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
 10.0.101-alpine3.22-aot-amd64, 10.0-alpine3.22-aot-amd64, 10.0-alpine-aot-amd64, 10.0.101-alpine3.22-aot, 10.0-alpine3.22-aot, 10.0-alpine-aot | [Dockerfile](src/sdk/10.0/alpine3.22-aot/amd64/Dockerfile) | Alpine 3.22
@@ -92,11 +101,24 @@ Tags | Dockerfile | OS Version
 8.0.416-jammy-amd64, 8.0-jammy-amd64, 8.0.416-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04
 8.0.416-azurelinux3.0-amd64, 8.0-azurelinux3.0-amd64, 8.0.416-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/sdk/8.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 
+#### .NET 11 Preview Tags
+
+Tags | Dockerfile | OS Version
+-----------| -------------| -------------
+11.0.100-preview.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.100-preview.1-noble, 11.0-preview-noble, 11.0.100-preview.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.101-noble-arm64v8, 10.0-noble-arm64v8, 10.0.101-noble, 10.0-noble, 10.0.101, 10.0, latest | [Dockerfile](src/sdk/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.100-preview.1-noble-aot-arm64v8, 11.0-preview-noble-aot-arm64v8, 11.0.100-preview.1-noble-aot, 11.0-preview-noble-aot, 11.0.100-preview.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/noble-aot/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.100-preview.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.100-preview.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+11.0.100-preview.1-alpine3.22-aot-arm64v8, 11.0-preview-alpine3.22-aot-arm64v8, 11.0-preview-alpine-aot-arm64v8, 11.0.100-preview.1-alpine3.22-aot, 11.0-preview-alpine3.22-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile) | Alpine 3.22
+11.0.100-preview.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.100-preview.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/sdk/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+11.0.100-preview.1-alpine3.23-aot-arm64v8, 11.0-preview-alpine3.23-aot-arm64v8, 11.0.100-preview.1-alpine3.23-aot, 11.0-preview-alpine3.23-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile) | Alpine 3.23
+11.0.100-preview.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.100-preview.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.100-preview.1-azurelinux3.0-aot-arm64v8, 11.0-preview-azurelinux3.0-aot-arm64v8, 11.0.100-preview.1-azurelinux3.0-aot, 11.0-preview-azurelinux3.0-aot | [Dockerfile](src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.101-noble-arm64v8, 10.0-noble-arm64v8, 10.0.101-noble, 10.0-noble, 10.0.101, 10.0 | [Dockerfile](src/sdk/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.101-noble-aot-arm64v8, 10.0-noble-aot-arm64v8, 10.0.101-noble-aot, 10.0-noble-aot, 10.0.101-aot, 10.0-aot | [Dockerfile](src/sdk/10.0/noble-aot/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.101-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.101-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
 10.0.101-alpine3.22-aot-arm64v8, 10.0-alpine3.22-aot-arm64v8, 10.0-alpine-aot-arm64v8, 10.0.101-alpine3.22-aot, 10.0-alpine3.22-aot, 10.0-alpine-aot | [Dockerfile](src/sdk/10.0/alpine3.22-aot/arm64v8/Dockerfile) | Alpine 3.22
@@ -116,11 +138,19 @@ Tags | Dockerfile | OS Version
 8.0.416-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.416-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04
 8.0.416-azurelinux3.0-arm64v8, 8.0-azurelinux3.0-arm64v8, 8.0.416-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/sdk/8.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 
+#### .NET 11 Preview Tags
+
+Tags | Dockerfile | OS Version
+-----------| -------------| -------------
+11.0.100-preview.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.100-preview.1-noble, 11.0-preview-noble, 11.0.100-preview.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.101-noble-arm32v7, 10.0-noble-arm32v7, 10.0.101-noble, 10.0-noble, 10.0.101, 10.0, latest | [Dockerfile](src/sdk/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.100-preview.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.100-preview.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+11.0.100-preview.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.100-preview.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/sdk/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+10.0.101-noble-arm32v7, 10.0-noble-arm32v7, 10.0.101-noble, 10.0-noble, 10.0.101, 10.0 | [Dockerfile](src/sdk/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.101-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.101-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
 10.0.101-alpine3.23-arm32v7, 10.0-alpine3.23-arm32v7, 10.0.101-alpine3.23, 10.0-alpine3.23 | [Dockerfile](src/sdk/10.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
 9.0.308-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.308-bookworm-slim, 9.0-bookworm-slim, 9.0.308, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
@@ -132,10 +162,17 @@ Tags | Dockerfile | OS Version
 8.0.416-alpine3.23-arm32v7, 8.0-alpine3.23-arm32v7, 8.0.416-alpine3.23, 8.0-alpine3.23 | [Dockerfile](src/sdk/8.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
 8.0.416-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.416-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
 
+#### .NET 11 Preview Tags
+
+Tags | Dockerfile | OS Version
+-----------| -------------| -------------
+11.0.100-preview.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.100-preview.1-noble, 11.0-preview-noble, 11.0.100-preview.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+
 ### Nano Server 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
+11.0.100-preview.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile)
 10.0.101-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile)
 9.0.308-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
 8.0.416-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
@@ -144,6 +181,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
+11.0.100-preview.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 10.0.101-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 9.0.308-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 8.0.416-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
@@ -152,6 +190,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
+11.0.100-preview.1-nanoserver-ltsc2022, 11.0-preview-nanoserver-ltsc2022 | [Dockerfile](src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile)
 10.0.101-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile)
 9.0.308-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
 8.0.416-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/8.0/nanoserver-ltsc2022/amd64/Dockerfile)
@@ -160,6 +199,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
+11.0.100-preview.1-windowsservercore-ltsc2022, 11.0-preview-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 10.0.101-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 9.0.308-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 8.0.416-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)
diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
index 1adf2342ba..f66f2ad9ff 100644
--- a/eng/mcr-tags-metadata-templates/aspnet-tags.yml
+++ b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
@@ -1,4 +1,22 @@
 $(McrTagsYmlRepo:aspnet)
+$(McrTagsYmlTagGroup:11.0-preview-noble|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-extra)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-composite)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-composite-extra)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.22)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.22-composite)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-composite)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-extra)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-composite)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-composite-extra)
+$(McrTagsYmlTagGroup:11.0-preview-nanoserver-ltsc2025)
+$(McrTagsYmlTagGroup:11.0-preview-windowsservercore-ltsc2025)
+$(McrTagsYmlTagGroup:11.0-preview-nanoserver-ltsc2022)
+$(McrTagsYmlTagGroup:11.0-preview-windowsservercore-ltsc2022)
 $(McrTagsYmlTagGroup:10.0-noble)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled-extra)
diff --git a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml
index 37649a14fd..fb4e9d6911 100644
--- a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml
+++ b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml
@@ -1,4 +1,14 @@
 $(McrTagsYmlRepo:runtime-deps)
+$(McrTagsYmlTagGroup:11.0-preview-noble|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-extra)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.22)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.22-extra)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-extra)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-extra)
 $(McrTagsYmlTagGroup:10.0-noble)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled-extra)
diff --git a/eng/mcr-tags-metadata-templates/runtime-tags.yml b/eng/mcr-tags-metadata-templates/runtime-tags.yml
index 8e91480bf6..80efb039f2 100644
--- a/eng/mcr-tags-metadata-templates/runtime-tags.yml
+++ b/eng/mcr-tags-metadata-templates/runtime-tags.yml
@@ -1,4 +1,16 @@
 $(McrTagsYmlRepo:runtime)
+$(McrTagsYmlTagGroup:11.0-preview-noble|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-extra)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.22)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-extra)
+$(McrTagsYmlTagGroup:11.0-preview-nanoserver-ltsc2025)
+$(McrTagsYmlTagGroup:11.0-preview-windowsservercore-ltsc2025)
+$(McrTagsYmlTagGroup:11.0-preview-nanoserver-ltsc2022)
+$(McrTagsYmlTagGroup:11.0-preview-windowsservercore-ltsc2022)
 $(McrTagsYmlTagGroup:10.0-noble)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled-extra)
diff --git a/eng/mcr-tags-metadata-templates/sdk-tags.yml b/eng/mcr-tags-metadata-templates/sdk-tags.yml
index 6579cf946b..9ea66a6647 100644
--- a/eng/mcr-tags-metadata-templates/sdk-tags.yml
+++ b/eng/mcr-tags-metadata-templates/sdk-tags.yml
@@ -1,4 +1,16 @@
 $(McrTagsYmlRepo:sdk)
+$(McrTagsYmlTagGroup:11.0-preview-noble|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-noble-aot)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.22)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.22-aot)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-aot)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-aot)
+$(McrTagsYmlTagGroup:11.0-preview-nanoserver-ltsc2025)
+$(McrTagsYmlTagGroup:11.0-preview-windowsservercore-ltsc2025)
+$(McrTagsYmlTagGroup:11.0-preview-nanoserver-ltsc2022)
+$(McrTagsYmlTagGroup:11.0-preview-windowsservercore-ltsc2022)
 $(McrTagsYmlTagGroup:10.0-noble)
 $(McrTagsYmlTagGroup:10.0-noble-aot)
 $(McrTagsYmlTagGroup:10.0-alpine3.22)
diff --git a/eng/readme-templates/FeaturedTags.md b/eng/readme-templates/FeaturedTags.md
index c16bb0abc6..9befb9cf79 100644
--- a/eng/readme-templates/FeaturedTags.md
+++ b/eng/readme-templates/FeaturedTags.md
@@ -24,7 +24,9 @@ elif match(REPO, "aspire-dashboard"):* `13`
   * `docker pull {{FULL_REPO}}:13`^
 elif match(REPO, "yarp"):* `2.3-preview`
   * `docker pull {{FULL_REPO}}:2.3-preview`^
-else:* `10.0` (Long-Term Support)
+else:* `11.0-preview` (Preview)
+  * `docker pull {{FULL_REPO}}:11.0-preview`
+* `10.0` (Long-Term Support)
   * `docker pull {{FULL_REPO}}:10.0`
 * `9.0` (Standard Support)
   * `docker pull {{FULL_REPO}}:9.0`
diff --git a/manifest.json b/manifest.json
index 30e22451ec..d1d1b5467d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1829,8 +1829,7 @@
             "$(dotnet|10.0|fixed-tag)-noble": {},
             "$(dotnet|10.0|minor-tag)-noble": {},
             "$(dotnet|10.0|fixed-tag)": {},
-            "$(dotnet|10.0|minor-tag)": {},
-            "latest": {}
+            "$(dotnet|10.0|minor-tag)": {}
           },
           "platforms": [
             {
@@ -2385,276 +2384,281 @@
               ]
             }
           ]
-        }
-      ]
-    },
-    {
-      "id": "runtime",
-      "name": "dotnet/nightly/runtime",
-      "readmes": [
-        {
-          "path": "README.runtime.md",
-          "templatePath": "eng/readme-templates/README.github.md"
-        },
-        {
-          "path": ".portal-docs/docker-hub/README.runtime.md",
-          "templatePath": "eng/readme-templates/README.dockerhub.md"
         },
         {
-          "path": ".portal-docs/mar/README.runtime.portal.md",
-          "templatePath": "eng/readme-templates/README.mcr.md"
-        }
-      ],
-      "mcrTagsMetadataTemplate": "eng/mcr-tags-metadata-templates/runtime-tags.yml",
-      "images": [
-        {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-bookworm-slim": {},
-            "$(dotnet|8.0|minor-tag)-bookworm-slim": {},
-            "$(dotnet|8.0|fixed-tag)": {},
-            "$(dotnet|8.0|minor-tag)": {}
+            "$(dotnet|11.0|fixed-tag)-noble": {},
+            "$(dotnet|11.0|minor-tag)-noble": {},
+            "$(dotnet|11.0|fixed-tag)": {},
+            "$(dotnet|11.0|minor-tag)": {},
+            "latest": {}
           },
           "platforms": [
             {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/bookworm-slim/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/noble/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
               "os": "linux",
-              "osVersion": "bookworm-slim",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-bookworm-slim-amd64": {},
-                "$(dotnet|8.0|minor-tag)-bookworm-slim-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-noble-amd64": {},
+                "$(dotnet|11.0|minor-tag)-noble-amd64": {}
               }
             },
             {
               "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/bookworm-slim/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/noble/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
               "os": "linux",
-              "osVersion": "bookworm-slim",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-bookworm-slim-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-bookworm-slim-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-noble-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-noble-arm32v7": {}
               },
               "variant": "v7"
             },
             {
               "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/bookworm-slim/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/noble/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
               "os": "linux",
-              "osVersion": "bookworm-slim",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-bookworm-slim-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-bookworm-slim-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-noble-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-noble-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|8.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|8.0|minor-tag)-alpine": {}
+            "$(dotnet|11.0|fixed-tag)-alpine3.22": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.22": {},
+            "$(dotnet|11.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/alpine3.22/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/alpine3.22/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.22-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.22-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
               "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/alpine3.22/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/alpine3.22/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
             {
               "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/alpine3.22/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/alpine3.22/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-alpine3.23": {},
-            "$(dotnet|8.0|minor-tag)-alpine3.23": {}
+            "$(dotnet|11.0|fixed-tag)-alpine3.22-extra": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.22-extra": {},
+            "$(dotnet|11.0|minor-tag)-alpine-extra": {}
           },
           "platforms": [
             {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/alpine3.23/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/alpine3.22-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-amd64": {}
-              }
+                "$(dotnet|11.0|fixed-tag)-alpine3.22-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.22-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.22-amd64"
+                  ]
+                }
+              ]
             },
             {
               "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/alpine3.23/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/alpine3.22-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.22-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.22-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-extra-arm32v7": {}
               },
-              "variant": "v7"
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.22-arm32v7"
+                  ]
+                }
+              ]
             },
             {
               "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/alpine3.23/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/alpine3.22-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.22-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.22-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine-extra-arm64v8": {}
               },
-              "variant": "v8"
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.22-arm64v8"
+                  ]
+                }
+              ]
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-noble": {},
-            "$(dotnet|8.0|minor-tag)-noble": {}
+            "$(dotnet|11.0|fixed-tag)-alpine3.23": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.23": {}
           },
           "platforms": [
             {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/noble/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/alpine3.23/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-amd64": {},
-                "$(dotnet|8.0|minor-tag)-noble-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.23-amd64": {}
               }
             },
             {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+              "architecture": "arm",
+              "dockerfile": "src/runtime-deps/11.0/alpine3.23/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.23-arm32v7": {}
               },
-              "dockerfile": "src/runtime/8.0/noble/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "dockerfile": "src/runtime-deps/11.0/alpine3.23/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-noble-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.23-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-noble-chiseled": {},
-            "$(dotnet|8.0|minor-tag)-noble-chiseled": {}
+            "$(dotnet|11.0|fixed-tag)-alpine3.23-extra": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.23-extra": {}
           },
           "platforms": [
             {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+              "dockerfile": "src/runtime-deps/11.0/alpine3.23-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.23-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.23-extra-amd64": {}
               },
-              "dockerfile": "src/runtime/8.0/noble-chiseled/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm",
+              "dockerfile": "src/runtime-deps/11.0/alpine3.23-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-chiseled-amd64": {},
-                "$(dotnet|8.0|minor-tag)-noble-chiseled-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.23-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.23-extra-arm32v7": {}
               },
+              "variant": "v7",
               "customBuildLegGroups": [
                 {
-                  "name": "pr-build",
-                  "type": "Supplemental",
+                  "name": "test-dependencies",
+                  "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm32v7"
                   ]
                 }
               ]
             },
             {
               "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/noble-chiseled/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/alpine3.23-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-chiseled-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-noble-chiseled-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.23-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.23-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
                 {
-                  "name": "pr-build",
-                  "type": "Supplemental",
+                  "name": "test-dependencies",
+                  "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm64v8"
                   ]
                 }
               ]
@@ -2662,53 +2666,71 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-noble-chiseled-extra": {},
-            "$(dotnet|8.0|minor-tag)-noble-chiseled-extra": {}
+            "$(dotnet|11.0|fixed-tag)-azurelinux3.0": {},
+            "$(dotnet|11.0|minor-tag)-azurelinux3.0": {}
           },
           "platforms": [
             {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/noble-chiseled-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "dockerfile": "src/runtime-deps/11.0/azurelinux3.0/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-chiseled-extra-amd64": {},
-                "$(dotnet|8.0|minor-tag)-noble-chiseled-extra-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-amd64": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm64",
+              "dockerfile": "src/runtime-deps/11.0/azurelinux3.0/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-arm64v8": {}
               },
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-amd64"
-                  ]
-                },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless": {},
+            "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless": {}
+          },
+          "platforms": [
+            {
+              "dockerfile": "src/runtime-deps/11.0/azurelinux3.0-distroless/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-mariner",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
+              },
+              "customBuildLegGroups": [
                 {
-                  "name": "test-dependencies",
-                  "type": "Integral",
+                  "name": "pr-build",
+                  "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:runtime):8.0-noble-chiseled-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 }
               ]
             },
             {
               "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/noble-chiseled-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "dockerfile": "src/runtime-deps/11.0/azurelinux3.0-distroless/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-mariner",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -2716,14 +2738,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-arm64v8"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:runtime):8.0-noble-chiseled-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 }
               ]
@@ -2731,122 +2746,124 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-jammy": {},
-            "$(dotnet|8.0|minor-tag)-jammy": {}
+            "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-extra": {},
+            "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-extra": {}
           },
           "platforms": [
             {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/jammy/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "jammy",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-amd64": {},
-                "$(dotnet|8.0|minor-tag)-jammy-amd64": {}
-              }
-            },
-            {
-              "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/jammy/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/azurelinux3.0-distroless-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-mariner.extra",
               "os": "linux",
-              "osVersion": "jammy",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-jammy-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {}
               },
-              "variant": "v7"
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                }
+              ]
             },
             {
               "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/jammy/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/azurelinux3.0-distroless-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-mariner.extra",
               "os": "linux",
-              "osVersion": "jammy",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-jammy-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {}
               },
-              "variant": "v8"
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                }
+              ]
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-jammy-chiseled": {},
-            "$(dotnet|8.0|minor-tag)-jammy-chiseled": {}
+            "$(dotnet|11.0|fixed-tag)-noble-chiseled": {},
+            "$(dotnet|11.0|minor-tag)-noble-chiseled": {}
           },
           "platforms": [
             {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/jammy-chiseled/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/noble-chiseled/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-amd64": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-amd64": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-amd64": {}
               },
               "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-amd64"
+                  ]
+                },
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-amd64"
                   ]
                 }
               ]
             },
             {
               "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/jammy-chiseled/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/noble-chiseled/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm64v8"
+                  ]
+                },
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm64v8"
                   ]
                 }
               ]
             },
             {
               "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/jammy-chiseled/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime-deps/11.0/noble-chiseled/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -2854,7 +2871,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm32v7"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm32v7"
                   ]
                 }
               ]
@@ -2862,158 +2879,145 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra": {},
-            "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra": {}
+            "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra": {},
+            "$(dotnet|11.0|minor-tag)-noble-chiseled-extra": {}
           },
           "platforms": [
             {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/jammy-chiseled-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "dockerfile": "src/runtime-deps/11.0/noble-chiseled-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu.extra",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra-amd64": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-amd64": {}
               },
               "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-amd64"
-                  ]
-                },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:runtime):8.0-jammy-chiseled-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-amd64"
                   ]
                 }
               ]
             },
             {
               "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/jammy-chiseled-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "dockerfile": "src/runtime-deps/11.0/noble-chiseled-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu.extra",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm64v8"
-                  ]
-                },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:runtime):8.0-jammy-chiseled-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm64v8"
                   ]
                 }
               ]
             },
             {
               "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/8.0/jammy-chiseled-extra/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "dockerfile": "src/runtime-deps/11.0/noble-chiseled-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu.extra",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm32v7"
-                  ]
-                },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:runtime):8.0-jammy-chiseled-arm32v7"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm32v7"
                   ]
                 }
               ]
             }
           ]
+        }
+      ]
+    },
+    {
+      "id": "runtime",
+      "name": "dotnet/nightly/runtime",
+      "readmes": [
+        {
+          "path": "README.runtime.md",
+          "templatePath": "eng/readme-templates/README.github.md"
+        },
+        {
+          "path": ".portal-docs/docker-hub/README.runtime.md",
+          "templatePath": "eng/readme-templates/README.dockerhub.md"
         },
+        {
+          "path": ".portal-docs/mar/README.runtime.portal.md",
+          "templatePath": "eng/readme-templates/README.mcr.md"
+        }
+      ],
+      "mcrTagsMetadataTemplate": "eng/mcr-tags-metadata-templates/runtime-tags.yml",
+      "images": [
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0": {
-              "docType": "Undocumented"
-            },
-            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0": {
-              "docType": "Undocumented"
-            },
-            "$(dotnet|8.0|minor-tag)-cbl-mariner": {
-              "docType": "Undocumented"
-            }
+            "$(dotnet|8.0|fixed-tag)-bookworm-slim": {},
+            "$(dotnet|8.0|minor-tag)-bookworm-slim": {},
+            "$(dotnet|8.0|fixed-tag)": {},
+            "$(dotnet|8.0|minor-tag)": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/8.0/cbl-mariner2.0/amd64",
+              "dockerfile": "src/runtime/8.0/bookworm-slim/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "cbl-mariner2.0",
+              "osVersion": "bookworm-slim",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner-amd64": {
-                  "docType": "Undocumented"
-                }
+                "$(dotnet|8.0|fixed-tag)-bookworm-slim-amd64": {},
+                "$(dotnet|8.0|minor-tag)-bookworm-slim-amd64": {}
               }
             },
             {
-              "architecture": "arm64",
+              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/8.0/cbl-mariner2.0/arm64v8",
+              "dockerfile": "src/runtime/8.0/bookworm-slim/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "cbl-mariner2.0",
+              "osVersion": "bookworm-slim",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner-arm64v8": {
-                  "docType": "Undocumented"
-                }
+                "$(dotnet|8.0|fixed-tag)-bookworm-slim-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-bookworm-slim-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/8.0/bookworm-slim/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "bookworm-slim",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-bookworm-slim-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-bookworm-slim-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -3022,164 +3026,129 @@
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless": {
-              "docType": "Undocumented"
-            },
-            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless": {
-              "docType": "Undocumented"
-            },
-            "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless": {
-              "docType": "Undocumented"
-            }
+            "$(dotnet|8.0|fixed-tag)-alpine3.22": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.22": {},
+            "$(dotnet|8.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/8.0/cbl-mariner2.0-distroless/amd64",
+              "dockerfile": "src/runtime/8.0/alpine3.22/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "cbl-mariner2.0-distroless",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-amd64": {
-                  "docType": "Undocumented"
-                }
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-amd64"
-                  ]
-                }
-              ]
+              "dockerfile": "src/runtime/8.0/alpine3.22/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine-arm32v7": {}
+              },
+              "variant": "v7"
             },
             {
               "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/8.0/cbl-mariner2.0-distroless/arm64v8",
+              "dockerfile": "src/runtime/8.0/alpine3.22/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "cbl-mariner2.0-distroless",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-arm64v8": {
-                  "docType": "Undocumented"
-                }
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine-arm64v8": {}
               },
-              "variant": "v8",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-arm64v8"
-                  ]
-                }
-              ]
+              "variant": "v8"
             }
           ]
         },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-extra": {
-              "docType": "Undocumented"
-            },
-            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-extra": {
-              "docType": "Undocumented"
-            }
+            "$(dotnet|8.0|fixed-tag)-alpine3.23": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.23": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/8.0/cbl-mariner2.0-distroless-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "dockerfile": "src/runtime/8.0/alpine3.23/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "cbl-mariner2.0-distroless",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-extra-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-extra-amd64": {
-                  "docType": "Undocumented"
-                }
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-amd64"
-                  ]
-                }
-              ]
+              "dockerfile": "src/runtime/8.0/alpine3.23/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-arm32v7": {}
+              },
+              "variant": "v7"
             },
             {
               "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/8.0/cbl-mariner2.0-distroless-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "dockerfile": "src/runtime/8.0/alpine3.23/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "cbl-mariner2.0-distroless",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-extra-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-extra-arm64v8": {
-                  "docType": "Undocumented"
-                }
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-arm64v8": {}
               },
-              "variant": "v8",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-arm64v8"
-                  ]
-                }
-              ]
+              "variant": "v8"
             }
           ]
         },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-azurelinux3.0": {},
-            "$(dotnet|8.0|minor-tag)-azurelinux3.0": {}
+            "$(dotnet|8.0|fixed-tag)-noble": {},
+            "$(dotnet|8.0|minor-tag)-noble": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/8.0/azurelinux3.0/amd64",
+              "dockerfile": "src/runtime/8.0/noble/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-amd64": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-noble-amd64": {},
+                "$(dotnet|8.0|minor-tag)-noble-amd64": {}
               }
             },
             {
@@ -3187,13 +3156,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/8.0/azurelinux3.0/arm64v8",
+              "dockerfile": "src/runtime/8.0/noble/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-noble-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-noble-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -3202,28 +3171,28 @@
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless": {},
-            "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless": {}
+            "$(dotnet|8.0|fixed-tag)-noble-chiseled": {},
+            "$(dotnet|8.0|minor-tag)-noble-chiseled": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/8.0/azurelinux3.0-distroless/amd64",
+              "dockerfile": "src/runtime/8.0/noble-chiseled/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-noble-chiseled-amd64": {},
+                "$(dotnet|8.0|minor-tag)-noble-chiseled-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-amd64"
                   ]
                 }
               ]
@@ -3233,13 +3202,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/8.0/azurelinux3.0-distroless/arm64v8",
+              "dockerfile": "src/runtime/8.0/noble-chiseled/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-noble-chiseled-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-noble-chiseled-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -3247,7 +3216,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-arm64v8"
                   ]
                 }
               ]
@@ -3257,28 +3226,35 @@
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra": {},
-            "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra": {}
+            "$(dotnet|8.0|fixed-tag)-noble-chiseled-extra": {},
+            "$(dotnet|8.0|minor-tag)-noble-chiseled-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/8.0/azurelinux3.0-distroless-extra/amd64",
+              "dockerfile": "src/runtime/8.0/noble-chiseled-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-noble-chiseled-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-noble-chiseled-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:runtime):8.0-noble-chiseled-amd64"
                   ]
                 }
               ]
@@ -3288,13 +3264,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8",
+              "dockerfile": "src/runtime/8.0/noble-chiseled-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -3302,123 +3278,38 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-arm64v8"
                   ]
-                }
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:runtime):8.0-noble-chiseled-arm64v8"
+                  ]
+                }
               ]
             }
           ]
         },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
-          "platforms": [
-            {
-              "dockerfile": "src/runtime/8.0/nanoserver-1809/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "nanoserver-1809",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-nanoserver-1809": {},
-                "$(dotnet|8.0|minor-tag)-nanoserver-1809": {}
-              }
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|8.0|product-version)",
-          "platforms": [
-            {
-              "dockerfile": "src/runtime/8.0/nanoserver-ltsc2022/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "nanoserver-ltsc2022",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-nanoserver-ltsc2022": {},
-                "$(dotnet|8.0|minor-tag)-nanoserver-ltsc2022": {}
-              }
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|8.0|product-version)",
-          "platforms": [
-            {
-              "dockerfile": "src/runtime/8.0/nanoserver-ltsc2025/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "nanoserver-ltsc2025",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-nanoserver-ltsc2025": {},
-                "$(dotnet|8.0|minor-tag)-nanoserver-ltsc2025": {}
-              }
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|8.0|product-version)",
-          "platforms": [
-            {
-              "dockerfile": "src/runtime/8.0/windowsservercore-ltsc2019/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "windowsservercore-ltsc2019",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-windowsservercore-ltsc2019": {},
-                "$(dotnet|8.0|minor-tag)-windowsservercore-ltsc2019": {}
-              }
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|8.0|product-version)",
-          "platforms": [
-            {
-              "dockerfile": "src/runtime/8.0/windowsservercore-ltsc2022/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "windowsservercore-ltsc2022",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-windowsservercore-ltsc2022": {},
-                "$(dotnet|8.0|minor-tag)-windowsservercore-ltsc2022": {}
-              }
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|8.0|product-version)",
-          "platforms": [
-            {
-              "dockerfile": "src/runtime/8.0/windowsservercore-ltsc2025/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "windowsservercore-ltsc2025",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-windowsservercore-ltsc2025": {},
-                "$(dotnet|8.0|minor-tag)-windowsservercore-ltsc2025": {}
-              }
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-bookworm-slim": {},
-            "$(dotnet|9.0|minor-tag)-bookworm-slim": {},
-            "$(dotnet|9.0|fixed-tag)": {},
-            "$(dotnet|9.0|minor-tag)": {}
+            "$(dotnet|8.0|fixed-tag)-jammy": {},
+            "$(dotnet|8.0|minor-tag)-jammy": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/bookworm-slim/amd64",
+              "dockerfile": "src/runtime/8.0/jammy/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "bookworm-slim",
+              "osVersion": "jammy",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-bookworm-slim-amd64": {},
-                "$(dotnet|9.0|minor-tag)-bookworm-slim-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-amd64": {},
+                "$(dotnet|8.0|minor-tag)-jammy-amd64": {}
               }
             },
             {
@@ -3426,13 +3317,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/bookworm-slim/arm32v7",
+              "dockerfile": "src/runtime/8.0/jammy/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "bookworm-slim",
+              "osVersion": "jammy",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-bookworm-slim-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-bookworm-slim-arm32v7": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-jammy-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -3441,203 +3332,294 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/bookworm-slim/arm64v8",
+              "dockerfile": "src/runtime/8.0/jammy/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "bookworm-slim",
+              "osVersion": "jammy",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-bookworm-slim-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-bookworm-slim-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-jammy-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|9.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|9.0|minor-tag)-alpine": {}
+            "$(dotnet|8.0|fixed-tag)-jammy-chiseled": {},
+            "$(dotnet|8.0|minor-tag)-jammy-chiseled": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/alpine3.22/amd64",
+              "dockerfile": "src/runtime/8.0/jammy-chiseled/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine-amd64": {}
-              }
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-amd64": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-amd64"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm",
+              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/alpine3.22/arm32v7",
+              "dockerfile": "src/runtime/8.0/jammy-chiseled/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine-arm32v7": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-arm64v8": {}
               },
-              "variant": "v7"
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm64v8"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm64",
+              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/alpine3.22/arm64v8",
+              "dockerfile": "src/runtime/8.0/jammy-chiseled/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-arm32v7": {}
               },
-              "variant": "v8"
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm32v7"
+                  ]
+                }
+              ]
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-alpine3.23": {},
-            "$(dotnet|9.0|minor-tag)-alpine3.23": {}
+            "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra": {},
+            "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/alpine3.23/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "alpine3.23",
-              "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-amd64": {}
-              }
-            },
-            {
-              "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/9.0/alpine3.23/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime/8.0/jammy-chiseled-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra-amd64": {}
               },
-              "variant": "v7"
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:runtime):8.0-jammy-chiseled-amd64"
+                  ]
+                }
+              ]
             },
             {
               "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/alpine3.23/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime/8.0/jammy-chiseled-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra-arm64v8": {}
               },
-              "variant": "v8"
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:runtime):8.0-jammy-chiseled-arm64v8"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/8.0/jammy-chiseled-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "jammy-chiseled",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra-arm32v7": {}
+              },
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm32v7"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:runtime):8.0-jammy-chiseled-arm32v7"
+                  ]
+                }
+              ]
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-noble": {},
-            "$(dotnet|9.0|minor-tag)-noble": {}
+            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0": {
+              "docType": "Undocumented"
+            },
+            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0": {
+              "docType": "Undocumented"
+            },
+            "$(dotnet|8.0|minor-tag)-cbl-mariner": {
+              "docType": "Undocumented"
+            }
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/noble/amd64",
+              "dockerfile": "src/runtime/8.0/cbl-mariner2.0/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "cbl-mariner2.0",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-amd64": {},
-                "$(dotnet|9.0|minor-tag)-noble-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner-amd64": {
+                  "docType": "Undocumented"
+                }
               }
             },
-            {
-              "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/9.0/noble/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "noble",
-              "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-noble-arm32v7": {}
-              },
-              "variant": "v7"
-            },
             {
               "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/noble/arm64v8",
+              "dockerfile": "src/runtime/8.0/cbl-mariner2.0/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "cbl-mariner2.0",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-noble-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner-arm64v8": {
+                  "docType": "Undocumented"
+                }
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-noble-chiseled": {},
-            "$(dotnet|9.0|minor-tag)-noble-chiseled": {}
+            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless": {
+              "docType": "Undocumented"
+            },
+            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless": {
+              "docType": "Undocumented"
+            },
+            "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless": {
+              "docType": "Undocumented"
+            }
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/noble-chiseled/amd64",
+              "dockerfile": "src/runtime/8.0/cbl-mariner2.0-distroless/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "cbl-mariner2.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-amd64": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-amd64": {
+                  "docType": "Undocumented"
+                }
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-amd64"
                   ]
                 }
               ]
@@ -3647,45 +3629,28 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/noble-chiseled/arm64v8",
+              "dockerfile": "src/runtime/8.0/cbl-mariner2.0-distroless/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "cbl-mariner2.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-arm64v8": {}
-              },
-              "variant": "v8",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm64v8"
-                  ]
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-arm64v8": {
+                  "docType": "Undocumented"
                 }
-              ]
-            },
-            {
-              "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/9.0/noble-chiseled/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "noble-chiseled",
-              "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-arm32v7": {}
               },
-              "variant": "v7",
+              "variant": "v8",
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm32v7"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-arm64v8"
                   ]
                 }
               ]
@@ -3693,37 +3658,38 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra": {},
-            "$(dotnet|9.0|minor-tag)-noble-chiseled-extra": {}
+            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-extra": {
+              "docType": "Undocumented"
+            },
+            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-extra": {
+              "docType": "Undocumented"
+            }
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/noble-chiseled-extra/amd64",
+              "dockerfile": "src/runtime/8.0/cbl-mariner2.0-distroless-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "cbl-mariner2.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra-amd64": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-extra-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-extra-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-extra-amd64": {
+                  "docType": "Undocumented"
+                }
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-amd64"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:runtime):$(dotnet|9.0|minor-tag)-noble-chiseled-amd64"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-amd64"
                   ]
                 }
               ]
@@ -3733,13 +3699,17 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/noble-chiseled-extra/arm64v8",
+              "dockerfile": "src/runtime/8.0/cbl-mariner2.0-distroless-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "cbl-mariner2.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-extra-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-extra-arm64v8": {
+                  "docType": "Undocumented"
+                }
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -3747,69 +3717,31 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm64v8"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:runtime):$(dotnet|9.0|minor-tag)-noble-chiseled-arm64v8"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-arm64v8"
                   ]
                 }
               ]
-            },
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-azurelinux3.0": {},
+            "$(dotnet|8.0|minor-tag)-azurelinux3.0": {}
+          },
+          "platforms": [
             {
-              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/noble-chiseled-extra/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "dockerfile": "src/runtime/8.0/azurelinux3.0/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-extra-arm32v7": {}
-              },
-              "variant": "v7",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm32v7"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:runtime):$(dotnet|9.0|minor-tag)-noble-chiseled-arm32v7"
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|9.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-azurelinux3.0": {},
-            "$(dotnet|9.0|minor-tag)-azurelinux3.0": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/9.0/azurelinux3.0/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "azurelinux3.0",
-              "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-amd64": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-amd64": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-amd64": {}
               }
             },
             {
@@ -3817,43 +3749,43 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/azurelinux3.0/arm64v8",
+              "dockerfile": "src/runtime/8.0/azurelinux3.0/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless": {},
-            "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless": {}
+            "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless": {},
+            "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/azurelinux3.0-distroless/amd64",
+              "dockerfile": "src/runtime/8.0/azurelinux3.0-distroless/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 }
               ]
@@ -3863,13 +3795,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/azurelinux3.0-distroless/arm64v8",
+              "dockerfile": "src/runtime/8.0/azurelinux3.0-distroless/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -3877,7 +3809,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 }
               ]
@@ -3885,37 +3817,30 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-extra": {},
-            "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-extra": {}
+            "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra": {},
+            "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/azurelinux3.0-distroless-extra/amd64",
+              "dockerfile": "src/runtime/8.0/azurelinux3.0-distroless-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:runtime):$(dotnet|9.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 }
               ]
@@ -3925,13 +3850,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/azurelinux3.0-distroless-extra/arm64v8",
+              "dockerfile": "src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -3939,14 +3864,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:runtime):$(dotnet|9.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 }
               ]
@@ -3954,116 +3872,115 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "platforms": [
             {
-              "dockerfile": "src/runtime/9.0/nanoserver-1809/amd64",
+              "dockerfile": "src/runtime/8.0/nanoserver-1809/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
               "os": "windows",
               "osVersion": "nanoserver-1809",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-nanoserver-1809": {},
-                "$(dotnet|9.0|minor-tag)-nanoserver-1809": {}
+                "$(dotnet|8.0|fixed-tag)-nanoserver-1809": {},
+                "$(dotnet|8.0|minor-tag)-nanoserver-1809": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "platforms": [
             {
-              "dockerfile": "src/runtime/9.0/nanoserver-ltsc2022/amd64",
+              "dockerfile": "src/runtime/8.0/nanoserver-ltsc2022/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
               "os": "windows",
               "osVersion": "nanoserver-ltsc2022",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-nanoserver-ltsc2022": {},
-                "$(dotnet|9.0|minor-tag)-nanoserver-ltsc2022": {}
+                "$(dotnet|8.0|fixed-tag)-nanoserver-ltsc2022": {},
+                "$(dotnet|8.0|minor-tag)-nanoserver-ltsc2022": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "platforms": [
             {
-              "dockerfile": "src/runtime/9.0/nanoserver-ltsc2025/amd64",
+              "dockerfile": "src/runtime/8.0/nanoserver-ltsc2025/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
               "os": "windows",
               "osVersion": "nanoserver-ltsc2025",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-nanoserver-ltsc2025": {},
-                "$(dotnet|9.0|minor-tag)-nanoserver-ltsc2025": {}
+                "$(dotnet|8.0|fixed-tag)-nanoserver-ltsc2025": {},
+                "$(dotnet|8.0|minor-tag)-nanoserver-ltsc2025": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "platforms": [
             {
-              "dockerfile": "src/runtime/9.0/windowsservercore-ltsc2019/amd64",
+              "dockerfile": "src/runtime/8.0/windowsservercore-ltsc2019/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
               "os": "windows",
               "osVersion": "windowsservercore-ltsc2019",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-windowsservercore-ltsc2019": {},
-                "$(dotnet|9.0|minor-tag)-windowsservercore-ltsc2019": {}
+                "$(dotnet|8.0|fixed-tag)-windowsservercore-ltsc2019": {},
+                "$(dotnet|8.0|minor-tag)-windowsservercore-ltsc2019": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "platforms": [
             {
-              "dockerfile": "src/runtime/9.0/windowsservercore-ltsc2022/amd64",
+              "dockerfile": "src/runtime/8.0/windowsservercore-ltsc2022/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
               "os": "windows",
               "osVersion": "windowsservercore-ltsc2022",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-windowsservercore-ltsc2022": {},
-                "$(dotnet|9.0|minor-tag)-windowsservercore-ltsc2022": {}
+                "$(dotnet|8.0|fixed-tag)-windowsservercore-ltsc2022": {},
+                "$(dotnet|8.0|minor-tag)-windowsservercore-ltsc2022": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "platforms": [
             {
-              "dockerfile": "src/runtime/9.0/windowsservercore-ltsc2025/amd64",
+              "dockerfile": "src/runtime/8.0/windowsservercore-ltsc2025/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
               "os": "windows",
               "osVersion": "windowsservercore-ltsc2025",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-windowsservercore-ltsc2025": {},
-                "$(dotnet|9.0|minor-tag)-windowsservercore-ltsc2025": {}
+                "$(dotnet|8.0|fixed-tag)-windowsservercore-ltsc2025": {},
+                "$(dotnet|8.0|minor-tag)-windowsservercore-ltsc2025": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-noble": {},
-            "$(dotnet|10.0|minor-tag)-noble": {},
-            "$(dotnet|10.0|fixed-tag)": {},
-            "$(dotnet|10.0|minor-tag)": {},
-            "latest": {}
+            "$(dotnet|9.0|fixed-tag)-bookworm-slim": {},
+            "$(dotnet|9.0|minor-tag)-bookworm-slim": {},
+            "$(dotnet|9.0|fixed-tag)": {},
+            "$(dotnet|9.0|minor-tag)": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/noble/amd64",
+              "dockerfile": "src/runtime/9.0/bookworm-slim/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "bookworm-slim",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-amd64": {},
-                "$(dotnet|10.0|minor-tag)-noble-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-bookworm-slim-amd64": {},
+                "$(dotnet|9.0|minor-tag)-bookworm-slim-amd64": {}
               }
             },
             {
@@ -4071,13 +3988,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/noble/arm32v7",
+              "dockerfile": "src/runtime/9.0/bookworm-slim/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "bookworm-slim",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-noble-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-bookworm-slim-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-bookworm-slim-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -4086,38 +4003,38 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/noble/arm64v8",
+              "dockerfile": "src/runtime/9.0/bookworm-slim/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "bookworm-slim",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-noble-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-bookworm-slim-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-bookworm-slim-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|10.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|10.0|minor-tag)-alpine": {}
+            "$(dotnet|9.0|fixed-tag)-alpine3.22": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.22": {},
+            "$(dotnet|9.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/alpine3.22/amd64",
+              "dockerfile": "src/runtime/9.0/alpine3.22/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -4125,14 +4042,14 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/alpine3.22/arm32v7",
+              "dockerfile": "src/runtime/9.0/alpine3.22/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -4141,37 +4058,37 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/alpine3.22/arm64v8",
+              "dockerfile": "src/runtime/9.0/alpine3.22/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-alpine3.23": {},
-            "$(dotnet|10.0|minor-tag)-alpine3.23": {}
+            "$(dotnet|9.0|fixed-tag)-alpine3.23": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.23": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/alpine3.23/amd64",
+              "dockerfile": "src/runtime/9.0/alpine3.23/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-amd64": {}
               }
             },
             {
@@ -4179,13 +4096,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/alpine3.23/arm32v7",
+              "dockerfile": "src/runtime/9.0/alpine3.23/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -4194,80 +4111,95 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/alpine3.23/arm64v8",
+              "dockerfile": "src/runtime/9.0/alpine3.23/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-azurelinux3.0": {},
-            "$(dotnet|10.0|minor-tag)-azurelinux3.0": {}
+            "$(dotnet|9.0|fixed-tag)-noble": {},
+            "$(dotnet|9.0|minor-tag)-noble": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/azurelinux3.0/amd64",
+              "dockerfile": "src/runtime/9.0/noble/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-amd64": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-noble-amd64": {},
+                "$(dotnet|9.0|minor-tag)-noble-amd64": {}
               }
             },
             {
-              "architecture": "arm64",
+              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/azurelinux3.0/arm64v8",
+              "dockerfile": "src/runtime/9.0/noble/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-noble-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-noble-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/noble/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-noble-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-noble-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless": {},
-            "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless": {}
+            "$(dotnet|9.0|fixed-tag)-noble-chiseled": {},
+            "$(dotnet|9.0|minor-tag)-noble-chiseled": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/azurelinux3.0-distroless/amd64",
+              "dockerfile": "src/runtime/9.0/noble-chiseled/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-amd64": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-amd64"
                   ]
                 }
               ]
@@ -4277,13 +4209,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/azurelinux3.0-distroless/arm64v8",
+              "dockerfile": "src/runtime/9.0/noble-chiseled/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -4291,7 +4223,31 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm64v8"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/noble-chiseled/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-arm32v7": {}
+              },
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm32v7"
                   ]
                 }
               ]
@@ -4299,37 +4255,37 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-extra": {},
-            "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-extra": {}
+            "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra": {},
+            "$(dotnet|9.0|minor-tag)-noble-chiseled-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/azurelinux3.0-distroless-extra/amd64",
+              "dockerfile": "src/runtime/9.0/noble-chiseled-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-amd64"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:runtime):$(dotnet|10.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:runtime):$(dotnet|9.0|minor-tag)-noble-chiseled-amd64"
                   ]
                 }
               ]
@@ -4339,13 +4295,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/azurelinux3.0-distroless-extra/arm64v8",
+              "dockerfile": "src/runtime/9.0/noble-chiseled-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -4353,93 +4309,137 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm64v8"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:runtime):$(dotnet|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:runtime):$(dotnet|9.0|minor-tag)-noble-chiseled-arm64v8"
                   ]
                 }
               ]
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|10.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-noble-chiseled": {},
-            "$(dotnet|10.0|minor-tag)-noble-chiseled": {}
-          },
-          "platforms": [
+            },
             {
+              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/noble-chiseled/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime/9.0/noble-chiseled-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-amd64": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-extra-arm32v7": {}
               },
+              "variant": "v7",
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm32v7"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:runtime):$(dotnet|9.0|minor-tag)-noble-chiseled-arm32v7"
                   ]
                 }
               ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-azurelinux3.0": {},
+            "$(dotnet|9.0|minor-tag)-azurelinux3.0": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/azurelinux3.0/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-amd64": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-amd64": {}
+              }
             },
             {
               "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/noble-chiseled/arm64v8",
+              "dockerfile": "src/runtime/9.0/azurelinux3.0/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless": {},
+            "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/azurelinux3.0-distroless/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
               },
-              "variant": "v8",
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm64v8"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 }
               ]
             },
             {
-              "architecture": "arm",
+              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/noble-chiseled/arm32v7",
+              "dockerfile": "src/runtime/9.0/azurelinux3.0-distroless/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
               },
-              "variant": "v7",
+              "variant": "v8",
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm32v7"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 }
               ]
@@ -4447,37 +4447,37 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra": {},
-            "$(dotnet|10.0|minor-tag)-noble-chiseled-extra": {}
+            "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-extra": {},
+            "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/noble-chiseled-extra/amd64",
+              "dockerfile": "src/runtime/9.0/azurelinux3.0-distroless-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra-amd64": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-extra-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:runtime):$(dotnet|10.0|minor-tag)-noble-chiseled-amd64"
+                    "$(Repo:runtime):$(dotnet|9.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 }
               ]
@@ -4487,13 +4487,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/noble-chiseled-extra/arm64v8",
+              "dockerfile": "src/runtime/9.0/azurelinux3.0-distroless-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -4501,262 +4501,184 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm64v8"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:runtime):$(dotnet|10.0|minor-tag)-noble-chiseled-arm64v8"
+                    "$(Repo:runtime):$(dotnet|9.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 }
               ]
-            },
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "platforms": [
             {
-              "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/10.0/noble-chiseled-extra/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
-              "os": "linux",
-              "osVersion": "noble-chiseled",
+              "dockerfile": "src/runtime/9.0/nanoserver-1809/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "nanoserver-1809",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-extra-arm32v7": {}
-              },
-              "variant": "v7",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm32v7"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:runtime):$(dotnet|10.0|minor-tag)-noble-chiseled-arm32v7"
-                  ]
-                }
-              ]
+                "$(dotnet|9.0|fixed-tag)-nanoserver-1809": {},
+                "$(dotnet|9.0|minor-tag)-nanoserver-1809": {}
+              }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "platforms": [
             {
-              "dockerfile": "src/runtime/10.0/nanoserver-ltsc2022/amd64",
+              "dockerfile": "src/runtime/9.0/nanoserver-ltsc2022/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
               "os": "windows",
               "osVersion": "nanoserver-ltsc2022",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-nanoserver-ltsc2022": {},
-                "$(dotnet|10.0|minor-tag)-nanoserver-ltsc2022": {}
+                "$(dotnet|9.0|fixed-tag)-nanoserver-ltsc2022": {},
+                "$(dotnet|9.0|minor-tag)-nanoserver-ltsc2022": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "platforms": [
             {
-              "dockerfile": "src/runtime/10.0/nanoserver-ltsc2025/amd64",
+              "dockerfile": "src/runtime/9.0/nanoserver-ltsc2025/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
               "os": "windows",
               "osVersion": "nanoserver-ltsc2025",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-nanoserver-ltsc2025": {},
-                "$(dotnet|10.0|minor-tag)-nanoserver-ltsc2025": {}
+                "$(dotnet|9.0|fixed-tag)-nanoserver-ltsc2025": {},
+                "$(dotnet|9.0|minor-tag)-nanoserver-ltsc2025": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "platforms": [
             {
-              "dockerfile": "src/runtime/10.0/windowsservercore-ltsc2022/amd64",
+              "dockerfile": "src/runtime/9.0/windowsservercore-ltsc2019/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
               "os": "windows",
-              "osVersion": "windowsservercore-ltsc2022",
+              "osVersion": "windowsservercore-ltsc2019",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-windowsservercore-ltsc2022": {},
-                "$(dotnet|10.0|minor-tag)-windowsservercore-ltsc2022": {}
+                "$(dotnet|9.0|fixed-tag)-windowsservercore-ltsc2019": {},
+                "$(dotnet|9.0|minor-tag)-windowsservercore-ltsc2019": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "platforms": [
             {
-              "dockerfile": "src/runtime/10.0/windowsservercore-ltsc2025/amd64",
+              "dockerfile": "src/runtime/9.0/windowsservercore-ltsc2022/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
               "os": "windows",
-              "osVersion": "windowsservercore-ltsc2025",
+              "osVersion": "windowsservercore-ltsc2022",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-windowsservercore-ltsc2025": {},
-                "$(dotnet|10.0|minor-tag)-windowsservercore-ltsc2025": {}
+                "$(dotnet|9.0|fixed-tag)-windowsservercore-ltsc2022": {},
+                "$(dotnet|9.0|minor-tag)-windowsservercore-ltsc2022": {}
               }
             }
           ]
-        }
-      ]
-    },
-    {
-      "id": "aspnet",
-      "name": "dotnet/nightly/aspnet",
-      "readmes": [
-        {
-          "path": "README.aspnet.md",
-          "templatePath": "eng/readme-templates/README.github.md"
-        },
-        {
-          "path": ".portal-docs/docker-hub/README.aspnet.md",
-          "templatePath": "eng/readme-templates/README.dockerhub.md"
         },
         {
-          "path": ".portal-docs/mar/README.aspnet.portal.md",
-          "templatePath": "eng/readme-templates/README.mcr.md"
-        }
-      ],
-      "mcrTagsMetadataTemplate": "eng/mcr-tags-metadata-templates/aspnet-tags.yml",
-      "images": [
-        {
-          "productVersion": "$(dotnet|8.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-bookworm-slim": {},
-            "$(dotnet|8.0|minor-tag)-bookworm-slim": {},
-            "$(dotnet|8.0|fixed-tag)": {},
-            "$(dotnet|8.0|minor-tag)": {}
-          },
+          "productVersion": "$(dotnet|9.0|product-version)",
           "platforms": [
             {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/8.0/bookworm-slim/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "bookworm-slim",
+              "dockerfile": "src/runtime/9.0/windowsservercore-ltsc2025/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "windowsservercore-ltsc2025",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-bookworm-slim-amd64": {},
-                "$(dotnet|8.0|minor-tag)-bookworm-slim-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-windowsservercore-ltsc2025": {},
+                "$(dotnet|9.0|minor-tag)-windowsservercore-ltsc2025": {}
               }
-            },
-            {
-              "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/8.0/bookworm-slim/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "bookworm-slim",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-bookworm-slim-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-bookworm-slim-arm32v7": {}
-              },
-              "variant": "v7"
-            },
-            {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/8.0/bookworm-slim/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "bookworm-slim",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-bookworm-slim-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-bookworm-slim-arm64v8": {}
-              },
-              "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|8.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|8.0|minor-tag)-alpine": {}
+            "$(dotnet|10.0|fixed-tag)-noble": {},
+            "$(dotnet|10.0|minor-tag)-noble": {},
+            "$(dotnet|10.0|fixed-tag)": {},
+            "$(dotnet|10.0|minor-tag)": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/alpine3.22/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/10.0/noble/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine-amd64": {}
+                "$(dotnet|10.0|fixed-tag)-noble-amd64": {},
+                "$(dotnet|10.0|minor-tag)-noble-amd64": {}
               }
             },
             {
               "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/alpine3.22/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/10.0/noble/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine-arm32v7": {}
+                "$(dotnet|10.0|fixed-tag)-noble-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-noble-arm32v7": {}
               },
               "variant": "v7"
             },
             {
               "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/alpine3.22/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/10.0/noble/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-noble-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-noble-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-alpine3.22-composite": {},
-            "$(dotnet|8.0|minor-tag)-alpine3.22-composite": {},
-            "$(dotnet|8.0|minor-tag)-alpine-composite": {}
+            "$(dotnet|10.0|fixed-tag)-alpine3.22": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.22": {},
+            "$(dotnet|10.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/alpine3.22-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/runtime/10.0/alpine3.22/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-composite-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine-composite-amd64": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -4764,14 +4686,14 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/alpine3.22-composite/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/runtime/10.0/alpine3.22/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-composite-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine-composite-arm32v7": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -4780,185 +4702,133 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/alpine3.22-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/runtime/10.0/alpine3.22/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-composite-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine-composite-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-alpine3.23": {},
-            "$(dotnet|8.0|minor-tag)-alpine3.23": {}
+            "$(dotnet|10.0|fixed-tag)-alpine3.23": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.23": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/alpine3.23/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/10.0/alpine3.23/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-amd64": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-amd64": {}
               }
             },
             {
               "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/alpine3.23/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/10.0/alpine3.23/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-arm32v7": {}
               },
               "variant": "v7"
             },
             {
               "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/alpine3.23/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/10.0/alpine3.23/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-alpine3.23-composite": {},
-            "$(dotnet|8.0|minor-tag)-alpine3.23-composite": {}
+            "$(dotnet|10.0|fixed-tag)-azurelinux3.0": {},
+            "$(dotnet|10.0|minor-tag)-azurelinux3.0": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/alpine3.23-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
-              "os": "linux",
-              "osVersion": "alpine3.23",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.23-composite-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-composite-amd64": {}
-              }
-            },
-            {
-              "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/aspnet/8.0/alpine3.23-composite/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
-              "os": "linux",
-              "osVersion": "alpine3.23",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.23-composite-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-composite-arm32v7": {}
-              },
-              "variant": "v7"
-            },
-            {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/aspnet/8.0/alpine3.23-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
-              "os": "linux",
-              "osVersion": "alpine3.23",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-composite-arm64v8": {}
-              },
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|8.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-noble": {},
-            "$(dotnet|8.0|minor-tag)-noble": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/8.0/noble/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/10.0/azurelinux3.0/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "azurelinux3.0",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-amd64": {},
-                "$(dotnet|8.0|minor-tag)-noble-amd64": {}
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-amd64": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-amd64": {}
               }
             },
             {
               "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/noble/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/10.0/azurelinux3.0/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "azurelinux3.0",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-noble-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-noble-chiseled": {},
-            "$(dotnet|8.0|minor-tag)-noble-chiseled": {}
+            "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless": {},
+            "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/noble-chiseled/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/10.0/azurelinux3.0-distroless/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-chiseled-amd64": {},
-                "$(dotnet|8.0|minor-tag)-noble-chiseled-amd64": {}
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 }
               ]
@@ -4966,15 +4836,15 @@
             {
               "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/noble-chiseled/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/10.0/azurelinux3.0-distroless/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-chiseled-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-noble-chiseled-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -4982,7 +4852,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-arm64v8"
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 }
               ]
@@ -4990,37 +4860,37 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-noble-chiseled-extra": {},
-            "$(dotnet|8.0|minor-tag)-noble-chiseled-extra": {}
+            "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-extra": {},
+            "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/noble-chiseled-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "dockerfile": "src/runtime/10.0/azurelinux3.0-distroless-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-chiseled-extra-amd64": {},
-                "$(dotnet|8.0|minor-tag)-noble-chiseled-extra-amd64": {}
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:aspnet):8.0-noble-chiseled-amd64"
+                    "$(Repo:runtime):$(dotnet|10.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 }
               ]
@@ -5028,15 +4898,15 @@
             {
               "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/noble-chiseled-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "dockerfile": "src/runtime/10.0/azurelinux3.0-distroless-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -5044,14 +4914,14 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-arm64v8"
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:aspnet):8.0-noble-chiseled-arm64v8"
+                    "$(Repo:runtime):$(dotnet|10.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 }
               ]
@@ -5059,328 +4929,425 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-noble-chiseled-composite-extra": {},
-            "$(dotnet|8.0|minor-tag)-noble-chiseled-composite-extra": {}
+            "$(dotnet|10.0|fixed-tag)-noble-chiseled": {},
+            "$(dotnet|10.0|minor-tag)-noble-chiseled": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/noble-chiseled-composite-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "dockerfile": "src/runtime/10.0/noble-chiseled/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-chiseled-composite-extra-amd64": {},
-                "$(dotnet|8.0|minor-tag)-noble-chiseled-composite-extra-amd64": {}
-              }
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-amd64": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-amd64"
+                  ]
+                }
+              ]
             },
             {
               "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/noble-chiseled-composite-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "dockerfile": "src/runtime/10.0/noble-chiseled/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-chiseled-composite-extra-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-noble-chiseled-composite-extra-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-arm64v8": {}
               },
-              "variant": "v8"
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm64v8"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/10.0/noble-chiseled/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-arm32v7": {}
+              },
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm32v7"
+                  ]
+                }
+              ]
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-noble-chiseled-composite": {},
-            "$(dotnet|8.0|minor-tag)-noble-chiseled-composite": {}
+            "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra": {},
+            "$(dotnet|10.0|minor-tag)-noble-chiseled-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/noble-chiseled-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/runtime/10.0/noble-chiseled-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-chiseled-composite-amd64": {},
-                "$(dotnet|8.0|minor-tag)-noble-chiseled-composite-amd64": {}
-              }
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:runtime):$(dotnet|10.0|minor-tag)-noble-chiseled-amd64"
+                  ]
+                }
+              ]
             },
             {
               "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/noble-chiseled-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/runtime/10.0/noble-chiseled-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-noble-chiseled-composite-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-noble-chiseled-composite-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
               },
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|8.0|product-version)",
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:runtime):$(dotnet|10.0|minor-tag)-noble-chiseled-arm64v8"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/10.0/noble-chiseled-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-extra-arm32v7": {}
+              },
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm32v7"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:runtime):$(dotnet|10.0|minor-tag)-noble-chiseled-arm32v7"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "platforms": [
+            {
+              "dockerfile": "src/runtime/10.0/nanoserver-ltsc2022/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "nanoserver-ltsc2022",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-nanoserver-ltsc2022": {},
+                "$(dotnet|10.0|minor-tag)-nanoserver-ltsc2022": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "platforms": [
+            {
+              "dockerfile": "src/runtime/10.0/nanoserver-ltsc2025/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "nanoserver-ltsc2025",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-nanoserver-ltsc2025": {},
+                "$(dotnet|10.0|minor-tag)-nanoserver-ltsc2025": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "platforms": [
+            {
+              "dockerfile": "src/runtime/10.0/windowsservercore-ltsc2022/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "windowsservercore-ltsc2022",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-windowsservercore-ltsc2022": {},
+                "$(dotnet|10.0|minor-tag)-windowsservercore-ltsc2022": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "platforms": [
+            {
+              "dockerfile": "src/runtime/10.0/windowsservercore-ltsc2025/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "windowsservercore-ltsc2025",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-windowsservercore-ltsc2025": {},
+                "$(dotnet|10.0|minor-tag)-windowsservercore-ltsc2025": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-jammy": {},
-            "$(dotnet|8.0|minor-tag)-jammy": {}
+            "$(dotnet|11.0|fixed-tag)-noble": {},
+            "$(dotnet|11.0|minor-tag)-noble": {},
+            "$(dotnet|11.0|fixed-tag)": {},
+            "$(dotnet|11.0|minor-tag)": {},
+            "latest": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/jammy/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/11.0/noble/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "jammy",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-amd64": {},
-                "$(dotnet|8.0|minor-tag)-jammy-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-noble-amd64": {},
+                "$(dotnet|11.0|minor-tag)-noble-amd64": {}
               }
             },
             {
               "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/jammy/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/11.0/noble/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "jammy",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-jammy-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-noble-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-noble-arm32v7": {}
               },
               "variant": "v7"
             },
             {
               "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/jammy/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/11.0/noble/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "jammy",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-jammy-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-noble-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-noble-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-jammy-chiseled": {},
-            "$(dotnet|8.0|minor-tag)-jammy-chiseled": {}
+            "$(dotnet|11.0|fixed-tag)-alpine3.22": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.22": {},
+            "$(dotnet|11.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/jammy-chiseled/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/11.0/alpine3.22/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-amd64": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-amd64": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-amd64"
-                  ]
-                }
-              ]
+                "$(dotnet|11.0|fixed-tag)-alpine3.22-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.22-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-amd64": {}
+              }
             },
             {
-              "architecture": "arm64",
+              "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/jammy-chiseled/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/11.0/alpine3.22/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm32v7": {}
               },
-              "variant": "v8",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm64v8"
-                  ]
-                }
-              ]
+              "variant": "v7"
             },
             {
-              "architecture": "arm",
+              "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/jammy-chiseled/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/11.0/alpine3.22/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm64v8": {}
               },
-              "variant": "v7",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm32v7"
-                  ]
-                }
-              ]
+              "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra": {},
-            "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra": {}
+            "$(dotnet|11.0|fixed-tag)-alpine3.23": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.23": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/jammy-chiseled-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "dockerfile": "src/runtime/11.0/alpine3.23/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra-amd64": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra-amd64": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-amd64"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:aspnet):8.0-jammy-chiseled-amd64"
-                  ]
-                }
-              ]
+                "$(dotnet|11.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.23-amd64": {}
+              }
             },
             {
-              "architecture": "arm64",
+              "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/jammy-chiseled-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "dockerfile": "src/runtime/11.0/alpine3.23/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.23-arm32v7": {}
               },
-              "variant": "v8",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm64v8"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:aspnet):8.0-jammy-chiseled-arm64v8"
-                  ]
-                }
-              ]
+              "variant": "v7"
             },
             {
-              "architecture": "arm",
+              "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/jammy-chiseled-extra/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "dockerfile": "src/runtime/11.0/alpine3.23/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.23-arm64v8": {}
               },
-              "variant": "v7",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm32v7"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:aspnet):8.0-jammy-chiseled-arm32v7"
-                  ]
-                }
-              ]
+              "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite-extra": {},
-            "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite-extra": {}
+            "$(dotnet|11.0|fixed-tag)-azurelinux3.0": {},
+            "$(dotnet|11.0|minor-tag)-azurelinux3.0": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/jammy-chiseled-composite-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "dockerfile": "src/runtime/11.0/azurelinux3.0/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "azurelinux3.0",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite-extra-amd64": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite-extra-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-amd64": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-amd64": {}
               }
             },
             {
@@ -5388,182 +5355,167 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/jammy-chiseled-composite-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "dockerfile": "src/runtime/11.0/azurelinux3.0/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "azurelinux3.0",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite-extra-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite-extra-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-arm64v8": {}
               },
               "variant": "v8"
-            },
-            {
-              "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/aspnet/8.0/jammy-chiseled-composite-extra/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
-              "os": "linux",
-              "osVersion": "jammy-chiseled",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite-extra-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite-extra-arm32v7": {}
-              },
-              "variant": "v7"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite": {},
-            "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite": {}
+            "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless": {},
+            "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/jammy-chiseled-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
-              "os": "linux",
-              "osVersion": "jammy-chiseled",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite-amd64": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite-amd64": {}
-              }
-            },
-            {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/aspnet/8.0/jammy-chiseled-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/runtime/11.0/azurelinux3.0-distroless/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
               },
-              "variant": "v8"
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm",
+              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/jammy-chiseled-composite/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/runtime/11.0/azurelinux3.0-distroless/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "jammy-chiseled",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
               },
-              "variant": "v7"
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                }
+              ]
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0": {
-              "docType": "Undocumented"
-            },
-            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0": {
-              "docType": "Undocumented"
-            },
-            "$(dotnet|8.0|minor-tag)-cbl-mariner": {
-              "docType": "Undocumented"
-            }
+            "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-extra": {},
+            "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/11.0/azurelinux3.0-distroless-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "cbl-mariner2.0",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-amd64": {
-                  "docType": "Undocumented"
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
                 },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner-amd64": {
-                  "docType": "Undocumented"
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:runtime):$(dotnet|11.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
                 }
-              }
+              ]
             },
             {
               "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "cbl-mariner2.0",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-arm64v8": {
-                  "docType": "Undocumented"
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
                 },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner-arm64v8": {
-                  "docType": "Undocumented"
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:runtime):$(dotnet|11.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
                 }
-              },
-              "variant": "v8"
+              ]
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless": {
-              "docType": "Undocumented"
-            },
-            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless": {
-              "docType": "Undocumented"
-            },
-            "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless": {
-              "docType": "Undocumented"
-            }
+            "$(dotnet|11.0|fixed-tag)-noble-chiseled": {},
+            "$(dotnet|11.0|minor-tag)-noble-chiseled": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/11.0/noble-chiseled/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "cbl-mariner2.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-amd64": {
-                  "docType": "Undocumented"
-                }
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-amd64": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-amd64"
                   ]
                 }
               ]
@@ -5571,22 +5523,15 @@
             {
               "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/runtime/11.0/noble-chiseled/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "cbl-mariner2.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-arm64v8": {
-                  "docType": "Undocumented"
-                }
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -5594,74 +5539,31 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm64v8"
                   ]
                 }
               ]
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|8.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-extra": {
-              "docType": "Undocumented"
             },
-            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-extra": {
-              "docType": "Undocumented"
-            }
-          },
-          "platforms": [
             {
+              "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
-              "os": "linux",
-              "osVersion": "cbl-mariner2.0-distroless",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-extra-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-extra-amd64": {
-                  "docType": "Undocumented"
-                }
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-amd64"
-                  ]
-                }
-              ]
-            },
-            {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "dockerfile": "src/runtime/11.0/noble-chiseled/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "cbl-mariner2.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-extra-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-extra-arm64v8": {
-                  "docType": "Undocumented"
-                }
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-arm32v7": {}
               },
-              "variant": "v8",
+              "variant": "v7",
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm32v7"
                   ]
                 }
               ]
@@ -5669,44 +5571,37 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|8.0|product-version)",
+          "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-composite": {
-              "docType": "Undocumented"
-            },
-            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-composite": {
-              "docType": "Undocumented"
-            },
-            "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-composite": {
-              "docType": "Undocumented"
-            }
+            "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra": {},
+            "$(dotnet|11.0|minor-tag)-noble-chiseled-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/runtime/11.0/noble-chiseled-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "cbl-mariner2.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-composite-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-composite-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-composite-amd64": {
-                  "docType": "Undocumented"
-                }
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:runtime):$(dotnet|11.0|minor-tag)-noble-chiseled-amd64"
                   ]
                 }
               ]
@@ -5716,20 +5611,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/runtime/11.0/noble-chiseled-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "cbl-mariner2.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-composite-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-composite-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-composite-arm64v8": {
-                  "docType": "Undocumented"
-                }
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -5737,121 +5625,181 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm64v8"
                   ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|8.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-composite-extra": {
-              "docType": "Undocumented"
-            },
-            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-composite-extra": {
-              "docType": "Undocumented"
-            },
-            "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-composite-extra": {
-              "docType": "Undocumented"
-            }
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
-              "os": "linux",
-              "osVersion": "cbl-mariner2.0-distroless",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-composite-extra-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-composite-extra-amd64": {
-                  "docType": "Undocumented"
                 },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-composite-extra-amd64": {
-                  "docType": "Undocumented"
-                }
-              },
-              "customBuildLegGroups": [
                 {
-                  "name": "pr-build",
-                  "type": "Supplemental",
+                  "name": "test-dependencies",
+                  "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-amd64"
+                    "$(Repo:runtime):$(dotnet|11.0|minor-tag)-noble-chiseled-arm64v8"
                   ]
                 }
               ]
             },
             {
-              "architecture": "arm64",
+              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "dockerfile": "src/runtime/11.0/noble-chiseled-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "cbl-mariner2.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-composite-extra-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-composite-extra-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-composite-extra-arm64v8": {
-                  "docType": "Undocumented"
-                }
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-arm32v7": {}
               },
-              "variant": "v8",
+              "variant": "v7",
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm32v7"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:runtime):$(dotnet|11.0|minor-tag)-noble-chiseled-arm32v7"
                   ]
                 }
               ]
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "platforms": [
+            {
+              "dockerfile": "src/runtime/11.0/nanoserver-ltsc2022/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "nanoserver-ltsc2022",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-nanoserver-ltsc2022": {},
+                "$(dotnet|11.0|minor-tag)-nanoserver-ltsc2022": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "platforms": [
+            {
+              "dockerfile": "src/runtime/11.0/nanoserver-ltsc2025/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "nanoserver-ltsc2025",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-nanoserver-ltsc2025": {},
+                "$(dotnet|11.0|minor-tag)-nanoserver-ltsc2025": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "platforms": [
+            {
+              "dockerfile": "src/runtime/11.0/windowsservercore-ltsc2022/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "windowsservercore-ltsc2022",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-windowsservercore-ltsc2022": {},
+                "$(dotnet|11.0|minor-tag)-windowsservercore-ltsc2022": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "platforms": [
+            {
+              "dockerfile": "src/runtime/11.0/windowsservercore-ltsc2025/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "windowsservercore-ltsc2025",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-windowsservercore-ltsc2025": {},
+                "$(dotnet|11.0|minor-tag)-windowsservercore-ltsc2025": {}
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "aspnet",
+      "name": "dotnet/nightly/aspnet",
+      "readmes": [
+        {
+          "path": "README.aspnet.md",
+          "templatePath": "eng/readme-templates/README.github.md"
+        },
+        {
+          "path": ".portal-docs/docker-hub/README.aspnet.md",
+          "templatePath": "eng/readme-templates/README.dockerhub.md"
+        },
+        {
+          "path": ".portal-docs/mar/README.aspnet.portal.md",
+          "templatePath": "eng/readme-templates/README.mcr.md"
+        }
+      ],
+      "mcrTagsMetadataTemplate": "eng/mcr-tags-metadata-templates/aspnet-tags.yml",
+      "images": [
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-azurelinux3.0": {},
-            "$(dotnet|8.0|minor-tag)-azurelinux3.0": {}
+            "$(dotnet|8.0|fixed-tag)-bookworm-slim": {},
+            "$(dotnet|8.0|minor-tag)-bookworm-slim": {},
+            "$(dotnet|8.0|fixed-tag)": {},
+            "$(dotnet|8.0|minor-tag)": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/8.0/azurelinux3.0/amd64",
+              "dockerfile": "src/aspnet/8.0/bookworm-slim/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0",
+              "osVersion": "bookworm-slim",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-amd64": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-bookworm-slim-amd64": {},
+                "$(dotnet|8.0|minor-tag)-bookworm-slim-amd64": {}
               }
             },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/8.0/bookworm-slim/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "bookworm-slim",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-bookworm-slim-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-bookworm-slim-arm32v7": {}
+              },
+              "variant": "v7"
+            },
             {
               "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/8.0/azurelinux3.0/arm64v8",
+              "dockerfile": "src/aspnet/8.0/bookworm-slim/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0",
+              "osVersion": "bookworm-slim",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-bookworm-slim-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-bookworm-slim-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -5860,351 +5808,472 @@
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless": {},
-            "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless": {}
+            "$(dotnet|8.0|fixed-tag)-alpine3.22": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.22": {},
+            "$(dotnet|8.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless/amd64",
+              "dockerfile": "src/aspnet/8.0/alpine3.22/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
               },
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64"
-                  ]
-                }
-              ]
+              "dockerfile": "src/aspnet/8.0/alpine3.22/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine-arm32v7": {}
+              },
+              "variant": "v7"
             },
             {
               "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless/arm64v8",
+              "dockerfile": "src/aspnet/8.0/alpine3.22/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine-arm64v8": {}
               },
-              "variant": "v8",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8"
-                  ]
-                }
-              ]
+              "variant": "v8"
             }
           ]
         },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra": {},
-            "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra": {}
+            "$(dotnet|8.0|fixed-tag)-alpine3.22-composite": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.22-composite": {},
+            "$(dotnet|8.0|minor-tag)-alpine-composite": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "dockerfile": "src/aspnet/8.0/alpine3.22-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-composite-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine-composite-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64"
-                  ]
-                }
-              ]
+              "dockerfile": "src/aspnet/8.0/alpine3.22-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-composite-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine-composite-arm32v7": {}
+              },
+              "variant": "v7"
             },
             {
               "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "dockerfile": "src/aspnet/8.0/alpine3.22-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-composite-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine-composite-arm64v8": {}
               },
-              "variant": "v8",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8"
-                  ]
-                }
-              ]
+              "variant": "v8"
             }
           ]
         },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite": {},
-            "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite": {}
+            "$(dotnet|8.0|fixed-tag)-alpine3.23": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.23": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/8.0/alpine3.23/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite-amd64": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
               },
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64"
-                  ]
-                }
-              ]
+              "dockerfile": "src/aspnet/8.0/alpine3.23/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-arm32v7": {}
+              },
+              "variant": "v7"
             },
             {
               "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/8.0/alpine3.23/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-arm64v8": {}
               },
-              "variant": "v8",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8"
-                  ]
-                }
-              ]
+              "variant": "v8"
             }
           ]
         },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite-extra": {},
-            "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite-extra": {}
+            "$(dotnet|8.0|fixed-tag)-alpine3.23-composite": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.23-composite": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "dockerfile": "src/aspnet/8.0/alpine3.23-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-amd64": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite-extra-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-composite-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-composite-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64"
-                  ]
-                }
-              ]
+              "dockerfile": "src/aspnet/8.0/alpine3.23-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-composite-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-composite-arm32v7": {}
+              },
+              "variant": "v7"
             },
             {
               "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "dockerfile": "src/aspnet/8.0/alpine3.23-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-composite-arm64v8": {}
               },
-              "variant": "v8",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8"
-                  ]
-                }
-              ]
+              "variant": "v8"
             }
           ]
         },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-noble": {},
+            "$(dotnet|8.0|minor-tag)-noble": {}
+          },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/8.0/nanoserver-1809/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "nanoserver-1809",
-              "tags": {
-                "$(dotnet|8.0|fixed-tag)-nanoserver-1809": {},
-                "$(dotnet|8.0|minor-tag)-nanoserver-1809": {}
+              "dockerfile": "src/aspnet/8.0/noble/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-noble-amd64": {},
+                "$(dotnet|8.0|minor-tag)-noble-amd64": {}
               }
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|8.0|product-version)",
-          "platforms": [
+            },
             {
+              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/8.0/nanoserver-ltsc2022/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "nanoserver-ltsc2022",
+              "dockerfile": "src/aspnet/8.0/noble/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-nanoserver-ltsc2022": {},
-                "$(dotnet|8.0|minor-tag)-nanoserver-ltsc2022": {}
-              }
+                "$(dotnet|8.0|fixed-tag)-noble-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-noble-arm64v8": {}
+              },
+              "variant": "v8"
             }
           ]
         },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-noble-chiseled": {},
+            "$(dotnet|8.0|minor-tag)-noble-chiseled": {}
+          },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/8.0/nanoserver-ltsc2025/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "nanoserver-ltsc2025",
+              "dockerfile": "src/aspnet/8.0/noble-chiseled/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-nanoserver-ltsc2025": {},
-                "$(dotnet|8.0|minor-tag)-nanoserver-ltsc2025": {}
-              }
+                "$(dotnet|8.0|fixed-tag)-noble-chiseled-amd64": {},
+                "$(dotnet|8.0|minor-tag)-noble-chiseled-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/8.0/noble-chiseled/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-noble-chiseled-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-noble-chiseled-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-arm64v8"
+                  ]
+                }
+              ]
             }
           ]
         },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-noble-chiseled-extra": {},
+            "$(dotnet|8.0|minor-tag)-noble-chiseled-extra": {}
+          },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/8.0/windowsservercore-ltsc2019/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "windowsservercore-ltsc2019",
+              "dockerfile": "src/aspnet/8.0/noble-chiseled-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-windowsservercore-ltsc2019": {},
-                "$(dotnet|8.0|minor-tag)-windowsservercore-ltsc2019": {}
-              }
+                "$(dotnet|8.0|fixed-tag)-noble-chiseled-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-noble-chiseled-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:aspnet):8.0-noble-chiseled-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/8.0/noble-chiseled-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-noble-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:aspnet):8.0-noble-chiseled-arm64v8"
+                  ]
+                }
+              ]
             }
           ]
         },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-noble-chiseled-composite-extra": {},
+            "$(dotnet|8.0|minor-tag)-noble-chiseled-composite-extra": {}
+          },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/windowsservercore-ltsc2022/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "windowsservercore-ltsc2022",
+              "dockerfile": "src/aspnet/8.0/noble-chiseled-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-windowsservercore-ltsc2022": {},
-                "$(dotnet|8.0|minor-tag)-windowsservercore-ltsc2022": {}
+                "$(dotnet|8.0|fixed-tag)-noble-chiseled-composite-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-noble-chiseled-composite-extra-amd64": {}
               }
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/noble-chiseled-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-noble-chiseled-composite-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-noble-chiseled-composite-extra-arm64v8": {}
+              },
+              "variant": "v8"
             }
           ]
         },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-noble-chiseled-composite": {},
+            "$(dotnet|8.0|minor-tag)-noble-chiseled-composite": {}
+          },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/8.0/windowsservercore-ltsc2025/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "windowsservercore-ltsc2025",
+              "dockerfile": "src/aspnet/8.0/noble-chiseled-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-windowsservercore-ltsc2025": {},
-                "$(dotnet|8.0|minor-tag)-windowsservercore-ltsc2025": {}
+                "$(dotnet|8.0|fixed-tag)-noble-chiseled-composite-amd64": {},
+                "$(dotnet|8.0|minor-tag)-noble-chiseled-composite-amd64": {}
               }
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/noble-chiseled-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-noble-chiseled-composite-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-noble-chiseled-composite-arm64v8": {}
+              },
+              "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-bookworm-slim": {},
-            "$(dotnet|9.0|minor-tag)-bookworm-slim": {},
-            "$(dotnet|9.0|fixed-tag)": {},
-            "$(dotnet|9.0|minor-tag)": {}
+            "$(dotnet|8.0|fixed-tag)-jammy": {},
+            "$(dotnet|8.0|minor-tag)-jammy": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/bookworm-slim/amd64",
+              "dockerfile": "src/aspnet/8.0/jammy/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "bookworm-slim",
+              "osVersion": "jammy",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-bookworm-slim-amd64": {},
-                "$(dotnet|9.0|minor-tag)-bookworm-slim-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-amd64": {},
+                "$(dotnet|8.0|minor-tag)-jammy-amd64": {}
               }
             },
             {
@@ -6212,13 +6281,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/bookworm-slim/arm32v7",
+              "dockerfile": "src/aspnet/8.0/jammy/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "bookworm-slim",
+              "osVersion": "jammy",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-bookworm-slim-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-bookworm-slim-arm32v7": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-jammy-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -6227,311 +6296,398 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/bookworm-slim/arm64v8",
+              "dockerfile": "src/aspnet/8.0/jammy/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "bookworm-slim",
+              "osVersion": "jammy",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-bookworm-slim-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-bookworm-slim-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-jammy-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|9.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|9.0|minor-tag)-alpine": {}
+            "$(dotnet|8.0|fixed-tag)-jammy-chiseled": {},
+            "$(dotnet|8.0|minor-tag)-jammy-chiseled": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22/amd64",
+              "dockerfile": "src/aspnet/8.0/jammy-chiseled/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine-amd64": {}
-              }
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-amd64": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-amd64"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm",
+              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22/arm32v7",
+              "dockerfile": "src/aspnet/8.0/jammy-chiseled/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine-arm32v7": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-arm64v8": {}
               },
-              "variant": "v7"
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm64v8"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm64",
+              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22/arm64v8",
+              "dockerfile": "src/aspnet/8.0/jammy-chiseled/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-arm32v7": {}
               },
-              "variant": "v8"
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm32v7"
+                  ]
+                }
+              ]
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-alpine3.22-composite": {},
-            "$(dotnet|9.0|minor-tag)-alpine3.22-composite": {},
-            "$(dotnet|9.0|minor-tag)-alpine-composite": {}
+            "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra": {},
+            "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/8.0/jammy-chiseled-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine-composite-amd64": {}
-              }
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:aspnet):8.0-jammy-chiseled-amd64"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm",
+              "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22-composite/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/8.0/jammy-chiseled-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine-composite-arm32v7": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra-arm64v8": {}
               },
-              "variant": "v7"
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:aspnet):8.0-jammy-chiseled-arm64v8"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm64",
+              "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/8.0/jammy-chiseled-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine-composite-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-extra-arm32v7": {}
               },
-              "variant": "v8"
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-jammy-arm32v7"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:aspnet):8.0-jammy-chiseled-arm32v7"
+                  ]
+                }
+              ]
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-alpine3.23": {},
-            "$(dotnet|9.0|minor-tag)-alpine3.23": {}
+            "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite-extra": {},
+            "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.23/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/aspnet/8.0/jammy-chiseled-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite-extra-amd64": {}
               }
             },
             {
-              "architecture": "arm",
+              "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.23/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/aspnet/8.0/jammy-chiseled-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite-extra-arm64v8": {}
               },
-              "variant": "v7"
+              "variant": "v8"
             },
             {
-              "architecture": "arm64",
+              "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.23/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/aspnet/8.0/jammy-chiseled-composite-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite-extra-arm32v7": {}
               },
-              "variant": "v8"
+              "variant": "v7"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-alpine3.23-composite": {},
-            "$(dotnet|9.0|minor-tag)-alpine3.23-composite": {}
+            "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite": {},
+            "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/amd64",
+              "dockerfile": "src/aspnet/8.0/jammy-chiseled-composite/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite-amd64": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite-amd64": {}
               }
             },
             {
-              "architecture": "arm",
+              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/arm32v7",
+              "dockerfile": "src/aspnet/8.0/jammy-chiseled-composite/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-arm32v7": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite-arm64v8": {}
               },
-              "variant": "v7"
+              "variant": "v8"
             },
             {
-              "architecture": "arm64",
+              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/arm64v8",
+              "dockerfile": "src/aspnet/8.0/jammy-chiseled-composite/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "jammy-chiseled",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-jammy-chiseled-composite-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-jammy-chiseled-composite-arm32v7": {}
               },
-              "variant": "v8"
+              "variant": "v7"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-noble": {},
-            "$(dotnet|9.0|minor-tag)-noble": {}
+            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0": {
+              "docType": "Undocumented"
+            },
+            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0": {
+              "docType": "Undocumented"
+            },
+            "$(dotnet|8.0|minor-tag)-cbl-mariner": {
+              "docType": "Undocumented"
+            }
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/noble/amd64",
+              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "cbl-mariner2.0",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-amd64": {},
-                "$(dotnet|9.0|minor-tag)-noble-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner-amd64": {
+                  "docType": "Undocumented"
+                }
               }
             },
-            {
-              "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/9.0/noble/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "noble",
-              "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-noble-arm32v7": {}
-              },
-              "variant": "v7"
-            },
             {
               "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/noble/arm64v8",
+              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "cbl-mariner2.0",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-noble-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner-arm64v8": {
+                  "docType": "Undocumented"
+                }
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-noble-chiseled": {},
-            "$(dotnet|9.0|minor-tag)-noble-chiseled": {}
+            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless": {
+              "docType": "Undocumented"
+            },
+            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless": {
+              "docType": "Undocumented"
+            },
+            "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless": {
+              "docType": "Undocumented"
+            }
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/noble-chiseled/amd64",
+              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "cbl-mariner2.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-amd64": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-amd64": {
+                  "docType": "Undocumented"
+                }
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-amd64"
                   ]
                 }
               ]
@@ -6541,13 +6697,20 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/noble-chiseled/arm64v8",
+              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "cbl-mariner2.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-arm64v8": {
+                  "docType": "Undocumented"
+                }
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -6555,131 +6718,150 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm64v8"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-arm64v8"
                   ]
                 }
               ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-extra": {
+              "docType": "Undocumented"
             },
+            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-extra": {
+              "docType": "Undocumented"
+            }
+          },
+          "platforms": [
             {
-              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/noble-chiseled/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "cbl-mariner2.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-arm32v7": {}
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-extra-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-extra-amd64": {
+                  "docType": "Undocumented"
+                }
               },
-              "variant": "v7",
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm32v7"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-amd64"
                   ]
                 }
               ]
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|9.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra": {},
-            "$(dotnet|9.0|minor-tag)-noble-chiseled-extra": {}
-          },
-          "platforms": [
+            },
             {
+              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/noble-chiseled-extra/amd64",
+              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "cbl-mariner2.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra-amd64": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-extra-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-extra-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-extra-arm64v8": {
+                  "docType": "Undocumented"
+                }
               },
+              "variant": "v8",
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-amd64"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:aspnet):$(dotnet|9.0|minor-tag)-noble-chiseled-amd64"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-arm64v8"
                   ]
                 }
               ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-composite": {
+              "docType": "Undocumented"
+            },
+            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-composite": {
+              "docType": "Undocumented"
             },
+            "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-composite": {
+              "docType": "Undocumented"
+            }
+          },
+          "platforms": [
             {
-              "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/noble-chiseled-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "cbl-mariner2.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-composite-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-composite-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-composite-amd64": {
+                  "docType": "Undocumented"
+                }
               },
-              "variant": "v8",
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm64v8"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:aspnet):$(dotnet|9.0|minor-tag)-noble-chiseled-arm64v8"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-amd64"
                   ]
                 }
               ]
             },
             {
-              "architecture": "arm",
+              "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/noble-chiseled-extra/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "cbl-mariner2.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-extra-arm32v7": {}
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-composite-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-composite-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-composite-arm64v8": {
+                  "docType": "Undocumented"
+                }
               },
-              "variant": "v7",
+              "variant": "v8",
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm32v7"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:aspnet):$(dotnet|9.0|minor-tag)-noble-chiseled-arm32v7"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-arm64v8"
                   ]
                 }
               ]
@@ -6687,127 +6869,99 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite-extra": {},
-            "$(dotnet|9.0|minor-tag)-noble-chiseled-composite-extra": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/aspnet/9.0/noble-chiseled-composite-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
-              "os": "linux",
-              "osVersion": "noble-chiseled",
-              "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite-extra-amd64": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-composite-extra-amd64": {}
-              }
+            "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-composite-extra": {
+              "docType": "Undocumented"
             },
-            {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/aspnet/9.0/noble-chiseled-composite-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
-              "os": "linux",
-              "osVersion": "noble-chiseled",
-              "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite-extra-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-composite-extra-arm64v8": {}
-              },
-              "variant": "v8"
+            "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-composite-extra": {
+              "docType": "Undocumented"
             },
-            {
-              "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/aspnet/9.0/noble-chiseled-composite-extra/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
-              "os": "linux",
-              "osVersion": "noble-chiseled",
-              "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite-extra-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-composite-extra-arm32v7": {}
-              },
-              "variant": "v7"
+            "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-composite-extra": {
+              "docType": "Undocumented"
             }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|9.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite": {},
-            "$(dotnet|9.0|minor-tag)-noble-chiseled-composite": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/noble-chiseled-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
-              "os": "linux",
-              "osVersion": "noble-chiseled",
-              "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite-amd64": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-composite-amd64": {}
-              }
-            },
-            {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/aspnet/9.0/noble-chiseled-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "cbl-mariner2.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-composite-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-composite-extra-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-composite-extra-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-composite-extra-amd64": {
+                  "docType": "Undocumented"
+                }
               },
-              "variant": "v8"
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-amd64"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm",
+              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/noble-chiseled-composite/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "cbl-mariner2.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-composite-arm32v7": {}
+                "$(dotnet|8.0|fixed-tag)-cbl-mariner2.0-distroless-composite-extra-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner2.0-distroless-composite-extra-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-cbl-mariner-distroless-composite-extra-arm64v8": {
+                  "docType": "Undocumented"
+                }
               },
-              "variant": "v7"
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-cbl-mariner2.0-arm64v8"
+                  ]
+                }
+              ]
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-azurelinux3.0": {},
-            "$(dotnet|9.0|minor-tag)-azurelinux3.0": {}
+            "$(dotnet|8.0|fixed-tag)-azurelinux3.0": {},
+            "$(dotnet|8.0|minor-tag)-azurelinux3.0": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/azurelinux3.0/amd64",
+              "dockerfile": "src/aspnet/8.0/azurelinux3.0/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-amd64": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-amd64": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-amd64": {}
               }
             },
             {
@@ -6815,50 +6969,43 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/azurelinux3.0/arm64v8",
+              "dockerfile": "src/aspnet/8.0/azurelinux3.0/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless": {},
-            "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless": {}
+            "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless": {},
+            "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless/amd64",
+              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 }
               ]
@@ -6868,13 +7015,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless/arm64v8",
+              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -6882,14 +7029,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 }
               ]
@@ -6897,37 +7037,30 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-extra": {},
-            "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-extra": {}
+            "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra": {},
+            "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless-extra/amd64",
+              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 }
               ]
@@ -6937,13 +7070,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless-extra/arm64v8",
+              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -6951,14 +7084,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 }
               ]
@@ -6966,37 +7092,30 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-composite": {},
-            "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-composite": {}
+            "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite": {},
+            "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless-composite/amd64",
+              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-composite-amd64": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-composite-amd64": {}
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite-amd64": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 }
               ]
@@ -7006,13 +7125,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless-composite/arm64v8",
+              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-composite-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-composite-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -7020,14 +7139,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 }
               ]
@@ -7035,37 +7147,30 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-composite-extra": {},
-            "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-composite-extra": {}
+            "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite-extra": {},
+            "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/amd64",
+              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-amd64": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-composite-extra-amd64": {}
-              },
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite-extra-amd64": {}
+              },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 }
               ]
@@ -7075,13 +7180,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/arm64v8",
+              "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
               "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -7089,14 +7194,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 }
               ]
@@ -7104,134 +7202,133 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/nanoserver-1809/amd64",
+              "dockerfile": "src/aspnet/8.0/nanoserver-1809/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
               "os": "windows",
               "osVersion": "nanoserver-1809",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-nanoserver-1809": {},
-                "$(dotnet|9.0|minor-tag)-nanoserver-1809": {}
+                "$(dotnet|8.0|fixed-tag)-nanoserver-1809": {},
+                "$(dotnet|8.0|minor-tag)-nanoserver-1809": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/nanoserver-ltsc2022/amd64",
+              "dockerfile": "src/aspnet/8.0/nanoserver-ltsc2022/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
               "os": "windows",
               "osVersion": "nanoserver-ltsc2022",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-nanoserver-ltsc2022": {},
-                "$(dotnet|9.0|minor-tag)-nanoserver-ltsc2022": {}
+                "$(dotnet|8.0|fixed-tag)-nanoserver-ltsc2022": {},
+                "$(dotnet|8.0|minor-tag)-nanoserver-ltsc2022": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/nanoserver-ltsc2025/amd64",
+              "dockerfile": "src/aspnet/8.0/nanoserver-ltsc2025/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
               "os": "windows",
               "osVersion": "nanoserver-ltsc2025",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-nanoserver-ltsc2025": {},
-                "$(dotnet|9.0|minor-tag)-nanoserver-ltsc2025": {}
+                "$(dotnet|8.0|fixed-tag)-nanoserver-ltsc2025": {},
+                "$(dotnet|8.0|minor-tag)-nanoserver-ltsc2025": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/windowsservercore-ltsc2019/amd64",
+              "dockerfile": "src/aspnet/8.0/windowsservercore-ltsc2019/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
               "os": "windows",
               "osVersion": "windowsservercore-ltsc2019",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-windowsservercore-ltsc2019": {},
-                "$(dotnet|9.0|minor-tag)-windowsservercore-ltsc2019": {}
+                "$(dotnet|8.0|fixed-tag)-windowsservercore-ltsc2019": {},
+                "$(dotnet|8.0|minor-tag)-windowsservercore-ltsc2019": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/windowsservercore-ltsc2022/amd64",
+              "dockerfile": "src/aspnet/8.0/windowsservercore-ltsc2022/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
               "os": "windows",
               "osVersion": "windowsservercore-ltsc2022",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-windowsservercore-ltsc2022": {},
-                "$(dotnet|9.0|minor-tag)-windowsservercore-ltsc2022": {}
+                "$(dotnet|8.0|fixed-tag)-windowsservercore-ltsc2022": {},
+                "$(dotnet|8.0|minor-tag)-windowsservercore-ltsc2022": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|9.0|product-version)",
+          "productVersion": "$(dotnet|8.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/windowsservercore-ltsc2025/amd64",
+              "dockerfile": "src/aspnet/8.0/windowsservercore-ltsc2025/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
               "os": "windows",
               "osVersion": "windowsservercore-ltsc2025",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-windowsservercore-ltsc2025": {},
-                "$(dotnet|9.0|minor-tag)-windowsservercore-ltsc2025": {}
+                "$(dotnet|8.0|fixed-tag)-windowsservercore-ltsc2025": {},
+                "$(dotnet|8.0|minor-tag)-windowsservercore-ltsc2025": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-noble": {},
-            "$(dotnet|10.0|minor-tag)-noble": {},
-            "$(dotnet|10.0|fixed-tag)": {},
-            "$(dotnet|10.0|minor-tag)": {},
-            "latest": {}
+            "$(dotnet|9.0|fixed-tag)-bookworm-slim": {},
+            "$(dotnet|9.0|minor-tag)-bookworm-slim": {},
+            "$(dotnet|9.0|fixed-tag)": {},
+            "$(dotnet|9.0|minor-tag)": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/noble/amd64",
+              "dockerfile": "src/aspnet/9.0/bookworm-slim/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "bookworm-slim",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-amd64": {},
-                "$(dotnet|10.0|minor-tag)-noble-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-bookworm-slim-amd64": {},
+                "$(dotnet|9.0|minor-tag)-bookworm-slim-amd64": {}
               }
             },
             {
@@ -7239,13 +7336,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/noble/arm32v7",
+              "dockerfile": "src/aspnet/9.0/bookworm-slim/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "bookworm-slim",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-noble-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-bookworm-slim-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-bookworm-slim-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -7254,38 +7351,38 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/noble/arm64v8",
+              "dockerfile": "src/aspnet/9.0/bookworm-slim/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "bookworm-slim",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-noble-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-bookworm-slim-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-bookworm-slim-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|10.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|10.0|minor-tag)-alpine": {}
+            "$(dotnet|9.0|fixed-tag)-alpine3.22": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.22": {},
+            "$(dotnet|9.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.22/amd64",
+              "dockerfile": "src/aspnet/9.0/alpine3.22/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -7293,14 +7390,14 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.22/arm32v7",
+              "dockerfile": "src/aspnet/9.0/alpine3.22/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -7309,39 +7406,39 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.22/arm64v8",
+              "dockerfile": "src/aspnet/9.0/alpine3.22/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-alpine3.22-composite": {},
-            "$(dotnet|10.0|minor-tag)-alpine3.22-composite": {},
-            "$(dotnet|10.0|minor-tag)-alpine-composite": {}
+            "$(dotnet|9.0|fixed-tag)-alpine3.22-composite": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.22-composite": {},
+            "$(dotnet|9.0|minor-tag)-alpine-composite": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.22-composite/amd64",
+              "dockerfile": "src/aspnet/9.0/alpine3.22-composite/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.22-composite-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-composite-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine-composite-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine-composite-amd64": {}
               }
             },
             {
@@ -7349,14 +7446,14 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.22-composite/arm32v7",
+              "dockerfile": "src/aspnet/9.0/alpine3.22-composite/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.22-composite-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-composite-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine-composite-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine-composite-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -7365,37 +7462,37 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.22-composite/arm64v8",
+              "dockerfile": "src/aspnet/9.0/alpine3.22-composite/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.22-composite-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-composite-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine-composite-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine-composite-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-alpine3.23": {},
-            "$(dotnet|10.0|minor-tag)-alpine3.23": {}
+            "$(dotnet|9.0|fixed-tag)-alpine3.23": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.23": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.23/amd64",
+              "dockerfile": "src/aspnet/9.0/alpine3.23/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-amd64": {}
               }
             },
             {
@@ -7403,13 +7500,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.23/arm32v7",
+              "dockerfile": "src/aspnet/9.0/alpine3.23/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -7418,36 +7515,36 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.23/arm64v8",
+              "dockerfile": "src/aspnet/9.0/alpine3.23/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-alpine3.23-composite": {},
-            "$(dotnet|10.0|minor-tag)-alpine3.23-composite": {}
+            "$(dotnet|9.0|fixed-tag)-alpine3.23-composite": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.23-composite": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.23-composite/amd64",
+              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-amd64": {}
               }
             },
             {
@@ -7455,13 +7552,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.23-composite/arm32v7",
+              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -7470,87 +7567,95 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.23-composite/arm64v8",
+              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-azurelinux3.0": {},
-            "$(dotnet|10.0|minor-tag)-azurelinux3.0": {}
+            "$(dotnet|9.0|fixed-tag)-noble": {},
+            "$(dotnet|9.0|minor-tag)-noble": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/azurelinux3.0/amd64",
+              "dockerfile": "src/aspnet/9.0/noble/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-amd64": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-noble-amd64": {},
+                "$(dotnet|9.0|minor-tag)-noble-amd64": {}
               }
             },
             {
-              "architecture": "arm64",
+              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/azurelinux3.0/arm64v8",
+              "dockerfile": "src/aspnet/9.0/noble/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-noble-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-noble-arm32v7": {}
               },
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|10.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless": {},
-            "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless": {}
-          },
-          "platforms": [
+              "variant": "v7"
+            },
             {
+              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless/amd64",
+              "dockerfile": "src/aspnet/9.0/noble/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-noble-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-noble-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-noble-chiseled": {},
+            "$(dotnet|9.0|minor-tag)-noble-chiseled": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/noble-chiseled/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-amd64": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-amd64"
                   ]
                 }
               ]
@@ -7560,13 +7665,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless/arm64v8",
+              "dockerfile": "src/aspnet/9.0/noble-chiseled/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -7574,152 +7679,131 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm64v8"
                   ]
                 }
               ]
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|10.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-extra": {},
-            "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-extra": {}
-          },
-          "platforms": [
+            },
             {
+              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "dockerfile": "src/aspnet/9.0/noble-chiseled/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-arm32v7": {}
               },
+              "variant": "v7",
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm32v7"
                   ]
                 }
               ]
-            },
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra": {},
+            "$(dotnet|9.0|minor-tag)-noble-chiseled-extra": {}
+          },
+          "platforms": [
             {
-              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless-extra/arm64v8",
+              "dockerfile": "src/aspnet/9.0/noble-chiseled-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-extra-amd64": {}
               },
-              "variant": "v8",
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-amd64"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:aspnet):$(dotnet|9.0|minor-tag)-noble-chiseled-amd64"
                   ]
                 }
               ]
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|10.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-composite": {},
-            "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-composite": {}
-          },
-          "platforms": [
+            },
             {
+              "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/9.0/noble-chiseled-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-composite-amd64": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-composite-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
               },
+              "variant": "v8",
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm64v8"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:aspnet):$(dotnet|9.0|minor-tag)-noble-chiseled-arm64v8"
                   ]
                 }
               ]
             },
             {
-              "architecture": "arm64",
+              "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/9.0/noble-chiseled-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-composite-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-composite-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-extra-arm32v7": {}
               },
-              "variant": "v8",
+              "variant": "v7",
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-noble-arm32v7"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                    "$(Repo:aspnet):$(dotnet|9.0|minor-tag)-noble-chiseled-arm32v7"
                   ]
                 }
               ]
@@ -7727,99 +7811,178 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-composite-extra": {},
-            "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-composite-extra": {}
+            "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite-extra": {},
+            "$(dotnet|9.0|minor-tag)-noble-chiseled-composite-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64",
+              "dockerfile": "src/aspnet/9.0/noble-chiseled-composite-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-amd64": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-composite-extra-amd64": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
-                  ]
-                }
-              ]
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-composite-extra-amd64": {}
+              }
             },
             {
               "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8",
+              "dockerfile": "src/aspnet/9.0/noble-chiseled-composite-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-composite-extra-arm64v8": {}
               },
-              "variant": "v8",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
-                  ]
-                }
-              ]
+              "variant": "v8"
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/9.0/noble-chiseled-composite-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-composite-extra-arm32v7": {}
+              },
+              "variant": "v7"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-noble-chiseled": {},
-            "$(dotnet|10.0|minor-tag)-noble-chiseled": {}
+            "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite": {},
+            "$(dotnet|9.0|minor-tag)-noble-chiseled-composite": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/10.0/noble-chiseled/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/aspnet/9.0/noble-chiseled-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-amd64": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-amd64": {}
-              },
-              "customBuildLegGroups": [
-                {
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite-amd64": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-composite-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/9.0/noble-chiseled-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/9.0/noble-chiseled-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-composite-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-composite-arm32v7": {}
+              },
+              "variant": "v7"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-azurelinux3.0": {},
+            "$(dotnet|9.0|minor-tag)-azurelinux3.0": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/azurelinux3.0/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-amd64": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/azurelinux3.0/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless": {},
+            "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 }
               ]
@@ -7829,13 +7992,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/noble-chiseled/arm64v8",
+              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -7843,31 +8006,83 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm64v8"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-extra": {},
+            "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 }
               ]
             },
             {
-              "architecture": "arm",
+              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/noble-chiseled/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {}
               },
-              "variant": "v7",
+              "variant": "v8",
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm32v7"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 }
               ]
@@ -7875,37 +8090,37 @@
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra": {},
-            "$(dotnet|10.0|minor-tag)-noble-chiseled-extra": {}
+            "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-composite": {},
+            "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-composite": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/10.0/noble-chiseled-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra-amd64": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-extra-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-composite-amd64": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-composite-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:aspnet):$(dotnet|10.0|minor-tag)-noble-chiseled-amd64"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
                   ]
                 }
               ]
@@ -7913,15 +8128,15 @@
             {
               "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/10.0/noble-chiseled-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-composite-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-composite-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -7929,268 +8144,2569 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm64v8"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:aspnet):$(dotnet|10.0|minor-tag)-noble-chiseled-arm64v8"
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
                   ]
                 }
               ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-composite-extra": {},
+            "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-composite-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-composite-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/nanoserver-1809/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "nanoserver-1809",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-nanoserver-1809": {},
+                "$(dotnet|9.0|minor-tag)-nanoserver-1809": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/nanoserver-ltsc2022/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "nanoserver-ltsc2022",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-nanoserver-ltsc2022": {},
+                "$(dotnet|9.0|minor-tag)-nanoserver-ltsc2022": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/nanoserver-ltsc2025/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "nanoserver-ltsc2025",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-nanoserver-ltsc2025": {},
+                "$(dotnet|9.0|minor-tag)-nanoserver-ltsc2025": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/windowsservercore-ltsc2019/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "windowsservercore-ltsc2019",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-windowsservercore-ltsc2019": {},
+                "$(dotnet|9.0|minor-tag)-windowsservercore-ltsc2019": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/windowsservercore-ltsc2022/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "windowsservercore-ltsc2022",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-windowsservercore-ltsc2022": {},
+                "$(dotnet|9.0|minor-tag)-windowsservercore-ltsc2022": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/windowsservercore-ltsc2025/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "windowsservercore-ltsc2025",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-windowsservercore-ltsc2025": {},
+                "$(dotnet|9.0|minor-tag)-windowsservercore-ltsc2025": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-noble": {},
+            "$(dotnet|10.0|minor-tag)-noble": {},
+            "$(dotnet|10.0|fixed-tag)": {},
+            "$(dotnet|10.0|minor-tag)": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/noble/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-amd64": {},
+                "$(dotnet|10.0|minor-tag)-noble-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/noble/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-noble-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/noble/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-noble-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-alpine3.22": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.22": {},
+            "$(dotnet|10.0|minor-tag)-alpine": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.22/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.22/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.22/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-alpine3.22-composite": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.22-composite": {},
+            "$(dotnet|10.0|minor-tag)-alpine-composite": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.22-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-composite-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-composite-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine-composite-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.22-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-composite-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-composite-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine-composite-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.22-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-composite-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-composite-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-alpine3.23": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.23": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.23/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.23/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.23/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-alpine3.23-composite": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.23-composite": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.23-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.23-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.23-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-azurelinux3.0": {},
+            "$(dotnet|10.0|minor-tag)-azurelinux3.0": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/azurelinux3.0/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-amd64": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/azurelinux3.0/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless": {},
+            "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-extra": {},
+            "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-composite": {},
+            "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-composite": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-composite-amd64": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-composite-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-composite-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-composite-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-composite-extra": {},
+            "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-composite-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-composite-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-noble-chiseled": {},
+            "$(dotnet|10.0|minor-tag)-noble-chiseled": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/noble-chiseled/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-amd64": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/noble-chiseled/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm64v8"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/noble-chiseled/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-arm32v7": {}
+              },
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm32v7"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra": {},
+            "$(dotnet|10.0|minor-tag)-noble-chiseled-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/noble-chiseled-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:aspnet):$(dotnet|10.0|minor-tag)-noble-chiseled-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/noble-chiseled-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:aspnet):$(dotnet|10.0|minor-tag)-noble-chiseled-arm64v8"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/noble-chiseled-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-extra-arm32v7": {}
+              },
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm32v7"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:aspnet):$(dotnet|10.0|minor-tag)-noble-chiseled-arm32v7"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite-extra": {},
+            "$(dotnet|10.0|minor-tag)-noble-chiseled-composite-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/noble-chiseled-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-composite-extra-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/noble-chiseled-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-composite-extra-arm64v8": {}
+              },
+              "variant": "v8"
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/noble-chiseled-composite-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-composite-extra-arm32v7": {}
+              },
+              "variant": "v7"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite": {},
+            "$(dotnet|10.0|minor-tag)-noble-chiseled-composite": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/noble-chiseled-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite-amd64": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-composite-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/noble-chiseled-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/noble-chiseled-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-noble-chiseled-composite-arm32v7": {}
+              },
+              "variant": "v7"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/nanoserver-ltsc2022/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "nanoserver-ltsc2022",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-nanoserver-ltsc2022": {},
+                "$(dotnet|10.0|minor-tag)-nanoserver-ltsc2022": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/nanoserver-ltsc2025/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "nanoserver-ltsc2025",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-nanoserver-ltsc2025": {},
+                "$(dotnet|10.0|minor-tag)-nanoserver-ltsc2025": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/windowsservercore-ltsc2022/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "windowsservercore-ltsc2022",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-windowsservercore-ltsc2022": {},
+                "$(dotnet|10.0|minor-tag)-windowsservercore-ltsc2022": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/windowsservercore-ltsc2025/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "windowsservercore-ltsc2025",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-windowsservercore-ltsc2025": {},
+                "$(dotnet|10.0|minor-tag)-windowsservercore-ltsc2025": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-noble": {},
+            "$(dotnet|11.0|minor-tag)-noble": {},
+            "$(dotnet|11.0|fixed-tag)": {},
+            "$(dotnet|11.0|minor-tag)": {},
+            "latest": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/noble/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-noble-amd64": {},
+                "$(dotnet|11.0|minor-tag)-noble-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/noble/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-noble-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-noble-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/noble/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-noble-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-noble-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-alpine3.22": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.22": {},
+            "$(dotnet|11.0|minor-tag)-alpine": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.22/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.22-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.22-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.22/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.22/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-alpine3.22-composite": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.22-composite": {},
+            "$(dotnet|11.0|minor-tag)-alpine-composite": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.22-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.22-composite-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.22-composite-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-composite-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.22-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.22-composite-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.22-composite-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-composite-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.22-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.22-composite-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.22-composite-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-alpine3.23": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.23": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.23/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.23-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.23/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.23-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.23/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.23-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-alpine3.23-composite": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.23-composite": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.23-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.23-composite-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.23-composite-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.23-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.23-composite-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.23-composite-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.23-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.23-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-azurelinux3.0": {},
+            "$(dotnet|11.0|minor-tag)-azurelinux3.0": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/azurelinux3.0/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-amd64": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/azurelinux3.0/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless": {},
+            "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/azurelinux3.0-distroless/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/azurelinux3.0-distroless/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-extra": {},
+            "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-composite": {},
+            "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-composite": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-composite-amd64": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-composite-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-composite-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-composite-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-composite-extra": {},
+            "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-composite-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-composite-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-azurelinux3.0-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-noble-chiseled": {},
+            "$(dotnet|11.0|minor-tag)-noble-chiseled": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/noble-chiseled/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-amd64": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/noble-chiseled/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm64v8"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/noble-chiseled/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-arm32v7": {}
+              },
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm32v7"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra": {},
+            "$(dotnet|11.0|minor-tag)-noble-chiseled-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/noble-chiseled-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-amd64"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:aspnet):$(dotnet|11.0|minor-tag)-noble-chiseled-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/noble-chiseled-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm64v8"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:aspnet):$(dotnet|11.0|minor-tag)-noble-chiseled-arm64v8"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/noble-chiseled-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-arm32v7": {}
+              },
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm32v7"
+                  ]
+                },
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:aspnet):$(dotnet|11.0|minor-tag)-noble-chiseled-arm32v7"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite-extra": {},
+            "$(dotnet|11.0|minor-tag)-noble-chiseled-composite-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/noble-chiseled-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-composite-extra-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-composite-extra-arm64v8": {}
+              },
+              "variant": "v8"
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-composite-extra-arm32v7": {}
+              },
+              "variant": "v7"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite": {},
+            "$(dotnet|11.0|minor-tag)-noble-chiseled-composite": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/noble-chiseled-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite-amd64": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-composite-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/noble-chiseled-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/noble-chiseled-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-noble-chiseled-composite-arm32v7": {}
+              },
+              "variant": "v7"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/nanoserver-ltsc2022/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "nanoserver-ltsc2022",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-nanoserver-ltsc2022": {},
+                "$(dotnet|11.0|minor-tag)-nanoserver-ltsc2022": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/nanoserver-ltsc2025/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "nanoserver-ltsc2025",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-nanoserver-ltsc2025": {},
+                "$(dotnet|11.0|minor-tag)-nanoserver-ltsc2025": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/windowsservercore-ltsc2022/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "windowsservercore-ltsc2022",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-windowsservercore-ltsc2022": {},
+                "$(dotnet|11.0|minor-tag)-windowsservercore-ltsc2022": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/windowsservercore-ltsc2025/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "windowsservercore-ltsc2025",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-windowsservercore-ltsc2025": {},
+                "$(dotnet|11.0|minor-tag)-windowsservercore-ltsc2025": {}
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "sdk",
+      "name": "dotnet/nightly/sdk",
+      "readmes": [
+        {
+          "path": "README.sdk.md",
+          "templatePath": "eng/readme-templates/README.github.md"
+        },
+        {
+          "path": ".portal-docs/docker-hub/README.sdk.md",
+          "templatePath": "eng/readme-templates/README.dockerhub.md"
+        },
+        {
+          "path": ".portal-docs/mar/README.sdk.portal.md",
+          "templatePath": "eng/readme-templates/README.mcr.md"
+        }
+      ],
+      "mcrTagsMetadataTemplate": "eng/mcr-tags-metadata-templates/sdk-tags.yml",
+      "images": [
+        {
+          "productVersion": "$(sdk|8.0|product-version)",
+          "sharedTags": {
+            "$(sdk|8.0|fixed-tag)-bookworm-slim": {},
+            "$(sdk|8.0|minor-tag)-bookworm-slim": {},
+            "$(sdk|8.0|fixed-tag)": {},
+            "$(sdk|8.0|minor-tag)": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "dockerfile": "src/sdk/8.0/bookworm-slim/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "bookworm-slim",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-bookworm-slim-amd64": {},
+                "$(sdk|8.0|minor-tag)-bookworm-slim-amd64": {}
+              }
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "architecture": "arm",
+              "dockerfile": "src/sdk/8.0/bookworm-slim/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "bookworm-slim",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-bookworm-slim-arm32v7": {},
+                "$(sdk|8.0|minor-tag)-bookworm-slim-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "architecture": "arm64",
+              "dockerfile": "src/sdk/8.0/bookworm-slim/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "bookworm-slim",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-bookworm-slim-arm64v8": {},
+                "$(sdk|8.0|minor-tag)-bookworm-slim-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(sdk|8.0|product-version)",
+          "sharedTags": {
+            "$(sdk|8.0|fixed-tag)-alpine3.22": {},
+            "$(sdk|8.0|minor-tag)-alpine3.22": {},
+            "$(sdk|8.0|minor-tag)-alpine": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "dockerfile": "src/sdk/8.0/alpine3.22/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-alpine3.22-amd64": {},
+                "$(sdk|8.0|minor-tag)-alpine3.22-amd64": {},
+                "$(sdk|8.0|minor-tag)-alpine-amd64": {}
+              }
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "architecture": "arm",
+              "dockerfile": "src/sdk/8.0/alpine3.22/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-alpine3.22-arm32v7": {},
+                "$(sdk|8.0|minor-tag)-alpine3.22-arm32v7": {},
+                "$(sdk|8.0|minor-tag)-alpine-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "architecture": "arm64",
+              "dockerfile": "src/sdk/8.0/alpine3.22/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-alpine3.22-arm64v8": {},
+                "$(sdk|8.0|minor-tag)-alpine3.22-arm64v8": {},
+                "$(sdk|8.0|minor-tag)-alpine-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(sdk|8.0|product-version)",
+          "sharedTags": {
+            "$(sdk|8.0|fixed-tag)-alpine3.23": {},
+            "$(sdk|8.0|minor-tag)-alpine3.23": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "dockerfile": "src/sdk/8.0/alpine3.23/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(sdk|8.0|minor-tag)-alpine3.23-amd64": {}
+              }
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "architecture": "arm",
+              "dockerfile": "src/sdk/8.0/alpine3.23/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(sdk|8.0|minor-tag)-alpine3.23-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "architecture": "arm64",
+              "dockerfile": "src/sdk/8.0/alpine3.23/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(sdk|8.0|minor-tag)-alpine3.23-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(sdk|8.0|product-version)",
+          "sharedTags": {
+            "$(sdk|8.0|fixed-tag)-noble": {},
+            "$(sdk|8.0|minor-tag)-noble": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "dockerfile": "src/sdk/8.0/noble/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-noble-amd64": {},
+                "$(sdk|8.0|minor-tag)-noble-amd64": {}
+              }
             },
             {
-              "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/aspnet/10.0/noble-chiseled-extra/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "architecture": "arm64",
+              "dockerfile": "src/sdk/8.0/noble/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "noble",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-extra-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-extra-arm32v7": {}
+                "$(sdk|8.0|fixed-tag)-noble-arm64v8": {},
+                "$(sdk|8.0|minor-tag)-noble-arm64v8": {}
               },
-              "variant": "v7",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-noble-arm32v7"
-                  ]
-                },
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:aspnet):$(dotnet|10.0|minor-tag)-noble-chiseled-arm32v7"
-                  ]
-                }
-              ]
+              "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(sdk|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite-extra": {},
-            "$(dotnet|10.0|minor-tag)-noble-chiseled-composite-extra": {}
+            "$(sdk|8.0|fixed-tag)-jammy": {},
+            "$(sdk|8.0|minor-tag)-jammy": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/aspnet/10.0/noble-chiseled-composite-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "dockerfile": "src/sdk/8.0/jammy/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "jammy",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite-extra-amd64": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-composite-extra-amd64": {}
+                "$(sdk|8.0|fixed-tag)-jammy-amd64": {},
+                "$(sdk|8.0|minor-tag)-jammy-amd64": {}
               }
             },
             {
-              "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/aspnet/10.0/noble-chiseled-composite-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "architecture": "arm",
+              "dockerfile": "src/sdk/8.0/jammy/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "jammy",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite-extra-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-composite-extra-arm64v8": {}
+                "$(sdk|8.0|fixed-tag)-jammy-arm32v7": {},
+                "$(sdk|8.0|minor-tag)-jammy-arm32v7": {}
               },
-              "variant": "v8"
+              "variant": "v7"
             },
             {
-              "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/aspnet/10.0/noble-chiseled-composite-extra/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "architecture": "arm64",
+              "dockerfile": "src/sdk/8.0/jammy/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "jammy",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite-extra-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-composite-extra-arm32v7": {}
+                "$(sdk|8.0|fixed-tag)-jammy-arm64v8": {},
+                "$(sdk|8.0|minor-tag)-jammy-arm64v8": {}
               },
-              "variant": "v7"
+              "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(sdk|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite": {},
-            "$(dotnet|10.0|minor-tag)-noble-chiseled-composite": {}
+            "$(sdk|8.0|fixed-tag)-cbl-mariner2.0": {
+              "docType": "Undocumented"
+            },
+            "$(sdk|8.0|minor-tag)-cbl-mariner2.0": {
+              "docType": "Undocumented"
+            },
+            "$(sdk|8.0|minor-tag)-cbl-mariner": {
+              "docType": "Undocumented"
+            }
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/aspnet/10.0/noble-chiseled-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/sdk/8.0/cbl-mariner2.0/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "cbl-mariner2.0",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite-amd64": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-composite-amd64": {}
+                "$(sdk|8.0|fixed-tag)-cbl-mariner2.0-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(sdk|8.0|minor-tag)-cbl-mariner2.0-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(sdk|8.0|minor-tag)-cbl-mariner-amd64": {
+                  "docType": "Undocumented"
+                }
               }
             },
             {
               "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/aspnet/10.0/noble-chiseled-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/sdk/8.0/cbl-mariner2.0/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "cbl-mariner2.0",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-composite-arm64v8": {}
+                "$(sdk|8.0|fixed-tag)-cbl-mariner2.0-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(sdk|8.0|minor-tag)-cbl-mariner2.0-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(sdk|8.0|minor-tag)-cbl-mariner-arm64v8": {
+                  "docType": "Undocumented"
+                }
               },
               "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(sdk|8.0|product-version)",
+          "sharedTags": {
+            "$(sdk|8.0|fixed-tag)-azurelinux3.0": {},
+            "$(sdk|8.0|minor-tag)-azurelinux3.0": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "dockerfile": "src/sdk/8.0/azurelinux3.0/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-azurelinux3.0-amd64": {},
+                "$(sdk|8.0|minor-tag)-azurelinux3.0-amd64": {}
+              }
             },
             {
-              "architecture": "arm",
+              "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/aspnet/10.0/noble-chiseled-composite/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/sdk/8.0/azurelinux3.0/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "azurelinux3.0",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-noble-chiseled-composite-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-noble-chiseled-composite-arm32v7": {}
+                "$(sdk|8.0|fixed-tag)-azurelinux3.0-arm64v8": {},
+                "$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8": {}
               },
-              "variant": "v7"
+              "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(sdk|8.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/aspnet/10.0/nanoserver-ltsc2022/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "dockerfile": "src/sdk/8.0/nanoserver-1809/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "nanoserver-1809",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-nanoserver-1809": {},
+                "$(sdk|8.0|minor-tag)-nanoserver-1809": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(sdk|8.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "dockerfile": "src/sdk/8.0/nanoserver-ltsc2022/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "nanoserver-ltsc2022",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-nanoserver-ltsc2022": {},
-                "$(dotnet|10.0|minor-tag)-nanoserver-ltsc2022": {}
+                "$(sdk|8.0|fixed-tag)-nanoserver-ltsc2022": {},
+                "$(sdk|8.0|minor-tag)-nanoserver-ltsc2022": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(sdk|8.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/aspnet/10.0/nanoserver-ltsc2025/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "dockerfile": "src/sdk/8.0/nanoserver-ltsc2025/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "nanoserver-ltsc2025",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-nanoserver-ltsc2025": {},
-                "$(dotnet|10.0|minor-tag)-nanoserver-ltsc2025": {}
+                "$(sdk|8.0|fixed-tag)-nanoserver-ltsc2025": {},
+                "$(sdk|8.0|minor-tag)-nanoserver-ltsc2025": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(sdk|8.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/aspnet/10.0/windowsservercore-ltsc2022/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "dockerfile": "src/sdk/8.0/windowsservercore-ltsc2019/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
+              "os": "windows",
+              "osVersion": "windowsservercore-ltsc2019",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-windowsservercore-ltsc2019": {},
+                "$(sdk|8.0|minor-tag)-windowsservercore-ltsc2019": {}
+              }
+            }
+          ]
+        },
+        {
+          "productVersion": "$(sdk|8.0|product-version)",
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "dockerfile": "src/sdk/8.0/windowsservercore-ltsc2022/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "windowsservercore-ltsc2022",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-windowsservercore-ltsc2022": {},
-                "$(dotnet|10.0|minor-tag)-windowsservercore-ltsc2022": {}
+                "$(sdk|8.0|fixed-tag)-windowsservercore-ltsc2022": {},
+                "$(sdk|8.0|minor-tag)-windowsservercore-ltsc2022": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(dotnet|10.0|product-version)",
+          "productVersion": "$(sdk|8.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/aspnet/10.0/windowsservercore-ltsc2025/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
+              "dockerfile": "src/sdk/8.0/windowsservercore-ltsc2025/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "windowsservercore-ltsc2025",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-windowsservercore-ltsc2025": {},
-                "$(dotnet|10.0|minor-tag)-windowsservercore-ltsc2025": {}
+                "$(sdk|8.0|fixed-tag)-windowsservercore-ltsc2025": {},
+                "$(sdk|8.0|minor-tag)-windowsservercore-ltsc2025": {}
               }
             }
           ]
-        }
-      ]
-    },
-    {
-      "id": "sdk",
-      "name": "dotnet/nightly/sdk",
-      "readmes": [
-        {
-          "path": "README.sdk.md",
-          "templatePath": "eng/readme-templates/README.github.md"
-        },
-        {
-          "path": ".portal-docs/docker-hub/README.sdk.md",
-          "templatePath": "eng/readme-templates/README.dockerhub.md"
         },
         {
-          "path": ".portal-docs/mar/README.sdk.portal.md",
-          "templatePath": "eng/readme-templates/README.mcr.md"
-        }
-      ],
-      "mcrTagsMetadataTemplate": "eng/mcr-tags-metadata-templates/sdk-tags.yml",
-      "images": [
-        {
-          "productVersion": "$(sdk|8.0|product-version)",
+          "productVersion": "$(sdk|9.0|product-version)",
           "sharedTags": {
-            "$(sdk|8.0|fixed-tag)-bookworm-slim": {},
-            "$(sdk|8.0|minor-tag)-bookworm-slim": {},
-            "$(sdk|8.0|fixed-tag)": {},
-            "$(sdk|8.0|minor-tag)": {}
+            "$(sdk|9.0|fixed-tag)-bookworm-slim": {},
+            "$(sdk|9.0|minor-tag)-bookworm-slim": {},
+            "$(sdk|9.0|fixed-tag)": {},
+            "$(sdk|9.0|minor-tag)": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/8.0/bookworm-slim/amd64",
+              "dockerfile": "src/sdk/9.0/bookworm-slim/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "bookworm-slim",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-bookworm-slim-amd64": {},
-                "$(sdk|8.0|minor-tag)-bookworm-slim-amd64": {}
+                "$(sdk|9.0|fixed-tag)-bookworm-slim-amd64": {},
+                "$(sdk|9.0|minor-tag)-bookworm-slim-amd64": {}
               }
             },
             {
@@ -8198,13 +10714,13 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm",
-              "dockerfile": "src/sdk/8.0/bookworm-slim/arm32v7",
+              "dockerfile": "src/sdk/9.0/bookworm-slim/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "bookworm-slim",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-bookworm-slim-arm32v7": {},
-                "$(sdk|8.0|minor-tag)-bookworm-slim-arm32v7": {}
+                "$(sdk|9.0|fixed-tag)-bookworm-slim-arm32v7": {},
+                "$(sdk|9.0|minor-tag)-bookworm-slim-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -8213,38 +10729,38 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/8.0/bookworm-slim/arm64v8",
+              "dockerfile": "src/sdk/9.0/bookworm-slim/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "bookworm-slim",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-bookworm-slim-arm64v8": {},
-                "$(sdk|8.0|minor-tag)-bookworm-slim-arm64v8": {}
+                "$(sdk|9.0|fixed-tag)-bookworm-slim-arm64v8": {},
+                "$(sdk|9.0|minor-tag)-bookworm-slim-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|8.0|product-version)",
+          "productVersion": "$(sdk|9.0|product-version)",
           "sharedTags": {
-            "$(sdk|8.0|fixed-tag)-alpine3.22": {},
-            "$(sdk|8.0|minor-tag)-alpine3.22": {},
-            "$(sdk|8.0|minor-tag)-alpine": {}
+            "$(sdk|9.0|fixed-tag)-alpine3.22": {},
+            "$(sdk|9.0|minor-tag)-alpine3.22": {},
+            "$(sdk|9.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/8.0/alpine3.22/amd64",
+              "dockerfile": "src/sdk/9.0/alpine3.22/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(sdk|8.0|minor-tag)-alpine3.22-amd64": {},
-                "$(sdk|8.0|minor-tag)-alpine-amd64": {}
+                "$(sdk|9.0|fixed-tag)-alpine3.22-amd64": {},
+                "$(sdk|9.0|minor-tag)-alpine3.22-amd64": {},
+                "$(sdk|9.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -8252,14 +10768,14 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm",
-              "dockerfile": "src/sdk/8.0/alpine3.22/arm32v7",
+              "dockerfile": "src/sdk/9.0/alpine3.22/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(sdk|8.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(sdk|8.0|minor-tag)-alpine-arm32v7": {}
+                "$(sdk|9.0|fixed-tag)-alpine3.22-arm32v7": {},
+                "$(sdk|9.0|minor-tag)-alpine3.22-arm32v7": {},
+                "$(sdk|9.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -8268,37 +10784,37 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/8.0/alpine3.22/arm64v8",
+              "dockerfile": "src/sdk/9.0/alpine3.22/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(sdk|8.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(sdk|8.0|minor-tag)-alpine-arm64v8": {}
+                "$(sdk|9.0|fixed-tag)-alpine3.22-arm64v8": {},
+                "$(sdk|9.0|minor-tag)-alpine3.22-arm64v8": {},
+                "$(sdk|9.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|8.0|product-version)",
+          "productVersion": "$(sdk|9.0|product-version)",
           "sharedTags": {
-            "$(sdk|8.0|fixed-tag)-alpine3.23": {},
-            "$(sdk|8.0|minor-tag)-alpine3.23": {}
+            "$(sdk|9.0|fixed-tag)-alpine3.23": {},
+            "$(sdk|9.0|minor-tag)-alpine3.23": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/8.0/alpine3.23/amd64",
+              "dockerfile": "src/sdk/9.0/alpine3.23/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(sdk|8.0|minor-tag)-alpine3.23-amd64": {}
+                "$(sdk|9.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(sdk|9.0|minor-tag)-alpine3.23-amd64": {}
               }
             },
             {
@@ -8306,13 +10822,13 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm",
-              "dockerfile": "src/sdk/8.0/alpine3.23/arm32v7",
+              "dockerfile": "src/sdk/9.0/alpine3.23/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(sdk|8.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(sdk|9.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(sdk|9.0|minor-tag)-alpine3.23-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -8321,73 +10837,36 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/8.0/alpine3.23/arm64v8",
+              "dockerfile": "src/sdk/9.0/alpine3.23/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(sdk|8.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(sdk|9.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(sdk|9.0|minor-tag)-alpine3.23-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|8.0|product-version)",
+          "productVersion": "$(sdk|9.0|product-version)",
           "sharedTags": {
-            "$(sdk|8.0|fixed-tag)-noble": {},
-            "$(sdk|8.0|minor-tag)-noble": {}
+            "$(sdk|9.0|fixed-tag)-noble": {},
+            "$(sdk|9.0|minor-tag)-noble": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/8.0/noble/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "noble",
-              "tags": {
-                "$(sdk|8.0|fixed-tag)-noble-amd64": {},
-                "$(sdk|8.0|minor-tag)-noble-amd64": {}
-              }
-            },
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "architecture": "arm64",
-              "dockerfile": "src/sdk/8.0/noble/arm64v8",
+              "dockerfile": "src/sdk/9.0/noble/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "noble",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-noble-arm64v8": {},
-                "$(sdk|8.0|minor-tag)-noble-arm64v8": {}
-              },
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "productVersion": "$(sdk|8.0|product-version)",
-          "sharedTags": {
-            "$(sdk|8.0|fixed-tag)-jammy": {},
-            "$(sdk|8.0|minor-tag)-jammy": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "dockerfile": "src/sdk/8.0/jammy/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "jammy",
-              "tags": {
-                "$(sdk|8.0|fixed-tag)-jammy-amd64": {},
-                "$(sdk|8.0|minor-tag)-jammy-amd64": {}
+                "$(sdk|9.0|fixed-tag)-noble-amd64": {},
+                "$(sdk|9.0|minor-tag)-noble-amd64": {}
               }
             },
             {
@@ -8395,13 +10874,13 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm",
-              "dockerfile": "src/sdk/8.0/jammy/arm32v7",
+              "dockerfile": "src/sdk/9.0/noble/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "jammy",
+              "osVersion": "noble",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-jammy-arm32v7": {},
-                "$(sdk|8.0|minor-tag)-jammy-arm32v7": {}
+                "$(sdk|9.0|fixed-tag)-noble-arm32v7": {},
+                "$(sdk|9.0|minor-tag)-noble-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -8410,94 +10889,36 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/8.0/jammy/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "jammy",
-              "tags": {
-                "$(sdk|8.0|fixed-tag)-jammy-arm64v8": {},
-                "$(sdk|8.0|minor-tag)-jammy-arm64v8": {}
-              },
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "productVersion": "$(sdk|8.0|product-version)",
-          "sharedTags": {
-            "$(sdk|8.0|fixed-tag)-cbl-mariner2.0": {
-              "docType": "Undocumented"
-            },
-            "$(sdk|8.0|minor-tag)-cbl-mariner2.0": {
-              "docType": "Undocumented"
-            },
-            "$(sdk|8.0|minor-tag)-cbl-mariner": {
-              "docType": "Undocumented"
-            }
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "dockerfile": "src/sdk/8.0/cbl-mariner2.0/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "cbl-mariner2.0",
-              "tags": {
-                "$(sdk|8.0|fixed-tag)-cbl-mariner2.0-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(sdk|8.0|minor-tag)-cbl-mariner2.0-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(sdk|8.0|minor-tag)-cbl-mariner-amd64": {
-                  "docType": "Undocumented"
-                }
-              }
-            },
-            {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "dockerfile": "src/sdk/8.0/cbl-mariner2.0/arm64v8",
+              "dockerfile": "src/sdk/9.0/noble/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "cbl-mariner2.0",
+              "osVersion": "noble",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-cbl-mariner2.0-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(sdk|8.0|minor-tag)-cbl-mariner2.0-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(sdk|8.0|minor-tag)-cbl-mariner-arm64v8": {
-                  "docType": "Undocumented"
-                }
+                "$(sdk|9.0|fixed-tag)-noble-arm64v8": {},
+                "$(sdk|9.0|minor-tag)-noble-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|8.0|product-version)",
+          "productVersion": "$(sdk|9.0|product-version)",
           "sharedTags": {
-            "$(sdk|8.0|fixed-tag)-azurelinux3.0": {},
-            "$(sdk|8.0|minor-tag)-azurelinux3.0": {}
+            "$(sdk|9.0|fixed-tag)-azurelinux3.0": {},
+            "$(sdk|9.0|minor-tag)-azurelinux3.0": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/8.0/azurelinux3.0/amd64",
+              "dockerfile": "src/sdk/9.0/azurelinux3.0/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-azurelinux3.0-amd64": {},
-                "$(sdk|8.0|minor-tag)-azurelinux3.0-amd64": {}
+                "$(sdk|9.0|fixed-tag)-azurelinux3.0-amd64": {},
+                "$(sdk|9.0|minor-tag)-azurelinux3.0-amd64": {}
               }
             },
             {
@@ -8505,146 +10926,146 @@
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/8.0/azurelinux3.0/arm64v8",
+              "dockerfile": "src/sdk/9.0/azurelinux3.0/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "azurelinux3.0",
-              "tags": {
-                "$(sdk|8.0|fixed-tag)-azurelinux3.0-arm64v8": {},
-                "$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8": {}
+              "tags": {
+                "$(sdk|9.0|fixed-tag)-azurelinux3.0-arm64v8": {},
+                "$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|8.0|product-version)",
+          "productVersion": "$(sdk|9.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/8.0/nanoserver-1809/amd64",
+              "dockerfile": "src/sdk/9.0/nanoserver-1809/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "nanoserver-1809",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-nanoserver-1809": {},
-                "$(sdk|8.0|minor-tag)-nanoserver-1809": {}
+                "$(sdk|9.0|fixed-tag)-nanoserver-1809": {},
+                "$(sdk|9.0|minor-tag)-nanoserver-1809": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(sdk|8.0|product-version)",
+          "productVersion": "$(sdk|9.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/8.0/nanoserver-ltsc2022/amd64",
+              "dockerfile": "src/sdk/9.0/nanoserver-ltsc2022/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "nanoserver-ltsc2022",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-nanoserver-ltsc2022": {},
-                "$(sdk|8.0|minor-tag)-nanoserver-ltsc2022": {}
+                "$(sdk|9.0|fixed-tag)-nanoserver-ltsc2022": {},
+                "$(sdk|9.0|minor-tag)-nanoserver-ltsc2022": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(sdk|8.0|product-version)",
+          "productVersion": "$(sdk|9.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/8.0/nanoserver-ltsc2025/amd64",
+              "dockerfile": "src/sdk/9.0/nanoserver-ltsc2025/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "nanoserver-ltsc2025",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-nanoserver-ltsc2025": {},
-                "$(sdk|8.0|minor-tag)-nanoserver-ltsc2025": {}
+                "$(sdk|9.0|fixed-tag)-nanoserver-ltsc2025": {},
+                "$(sdk|9.0|minor-tag)-nanoserver-ltsc2025": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(sdk|8.0|product-version)",
+          "productVersion": "$(sdk|9.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/8.0/windowsservercore-ltsc2019/amd64",
+              "dockerfile": "src/sdk/9.0/windowsservercore-ltsc2019/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "windowsservercore-ltsc2019",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-windowsservercore-ltsc2019": {},
-                "$(sdk|8.0|minor-tag)-windowsservercore-ltsc2019": {}
+                "$(sdk|9.0|fixed-tag)-windowsservercore-ltsc2019": {},
+                "$(sdk|9.0|minor-tag)-windowsservercore-ltsc2019": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(sdk|8.0|product-version)",
+          "productVersion": "$(sdk|9.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/8.0/windowsservercore-ltsc2022/amd64",
+              "dockerfile": "src/sdk/9.0/windowsservercore-ltsc2022/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "windowsservercore-ltsc2022",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-windowsservercore-ltsc2022": {},
-                "$(sdk|8.0|minor-tag)-windowsservercore-ltsc2022": {}
+                "$(sdk|9.0|fixed-tag)-windowsservercore-ltsc2022": {},
+                "$(sdk|9.0|minor-tag)-windowsservercore-ltsc2022": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(sdk|8.0|product-version)",
+          "productVersion": "$(sdk|9.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/8.0/windowsservercore-ltsc2025/amd64",
+              "dockerfile": "src/sdk/9.0/windowsservercore-ltsc2025/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "windowsservercore-ltsc2025",
               "tags": {
-                "$(sdk|8.0|fixed-tag)-windowsservercore-ltsc2025": {},
-                "$(sdk|8.0|minor-tag)-windowsservercore-ltsc2025": {}
+                "$(sdk|9.0|fixed-tag)-windowsservercore-ltsc2025": {},
+                "$(sdk|9.0|minor-tag)-windowsservercore-ltsc2025": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(sdk|9.0|product-version)",
+          "productVersion": "$(sdk|10.0|product-version)",
           "sharedTags": {
-            "$(sdk|9.0|fixed-tag)-bookworm-slim": {},
-            "$(sdk|9.0|minor-tag)-bookworm-slim": {},
-            "$(sdk|9.0|fixed-tag)": {},
-            "$(sdk|9.0|minor-tag)": {}
+            "$(sdk|10.0|fixed-tag)-noble": {},
+            "$(sdk|10.0|minor-tag)-noble": {},
+            "$(sdk|10.0|fixed-tag)": {},
+            "$(sdk|10.0|minor-tag)": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/9.0/bookworm-slim/amd64",
+              "dockerfile": "src/sdk/10.0/noble/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "bookworm-slim",
+              "osVersion": "noble",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-bookworm-slim-amd64": {},
-                "$(sdk|9.0|minor-tag)-bookworm-slim-amd64": {}
+                "$(sdk|10.0|fixed-tag)-noble-amd64": {},
+                "$(sdk|10.0|minor-tag)-noble-amd64": {}
               }
             },
             {
@@ -8652,13 +11073,13 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm",
-              "dockerfile": "src/sdk/9.0/bookworm-slim/arm32v7",
+              "dockerfile": "src/sdk/10.0/noble/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "bookworm-slim",
+              "osVersion": "noble",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-bookworm-slim-arm32v7": {},
-                "$(sdk|9.0|minor-tag)-bookworm-slim-arm32v7": {}
+                "$(sdk|10.0|fixed-tag)-noble-arm32v7": {},
+                "$(sdk|10.0|minor-tag)-noble-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -8667,38 +11088,77 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/9.0/bookworm-slim/arm64v8",
+              "dockerfile": "src/sdk/10.0/noble/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "bookworm-slim",
+              "osVersion": "noble",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-bookworm-slim-arm64v8": {},
-                "$(sdk|9.0|minor-tag)-bookworm-slim-arm64v8": {}
+                "$(sdk|10.0|fixed-tag)-noble-arm64v8": {},
+                "$(sdk|10.0|minor-tag)-noble-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|9.0|product-version)",
+          "productVersion": "$(sdk|10.0|product-version)",
           "sharedTags": {
-            "$(sdk|9.0|fixed-tag)-alpine3.22": {},
-            "$(sdk|9.0|minor-tag)-alpine3.22": {},
-            "$(sdk|9.0|minor-tag)-alpine": {}
+            "$(sdk|10.0|fixed-tag)-noble-aot": {},
+            "$(sdk|10.0|minor-tag)-noble-aot": {},
+            "$(sdk|10.0|fixed-tag)-aot": {},
+            "$(sdk|10.0|minor-tag)-aot": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:sdk)"
+              },
+              "dockerfile": "src/sdk/10.0/noble-aot/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
+              "os": "linux",
+              "osVersion": "noble",
+              "tags": {
+                "$(sdk|10.0|fixed-tag)-noble-aot-amd64": {},
+                "$(sdk|10.0|minor-tag)-noble-aot-amd64": {}
+              }
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:sdk)"
+              },
+              "architecture": "arm64",
+              "dockerfile": "src/sdk/10.0/noble-aot/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
+              "os": "linux",
+              "osVersion": "noble",
+              "tags": {
+                "$(sdk|10.0|fixed-tag)-noble-aot-arm64v8": {},
+                "$(sdk|10.0|minor-tag)-noble-aot-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(sdk|10.0|product-version)",
+          "sharedTags": {
+            "$(sdk|10.0|fixed-tag)-alpine3.22": {},
+            "$(sdk|10.0|minor-tag)-alpine3.22": {},
+            "$(sdk|10.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/9.0/alpine3.22/amd64",
+              "dockerfile": "src/sdk/10.0/alpine3.22/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(sdk|9.0|minor-tag)-alpine3.22-amd64": {},
-                "$(sdk|9.0|minor-tag)-alpine-amd64": {}
+                "$(sdk|10.0|fixed-tag)-alpine3.22-amd64": {},
+                "$(sdk|10.0|minor-tag)-alpine3.22-amd64": {},
+                "$(sdk|10.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -8706,14 +11166,14 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm",
-              "dockerfile": "src/sdk/9.0/alpine3.22/arm32v7",
+              "dockerfile": "src/sdk/10.0/alpine3.22/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(sdk|9.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(sdk|9.0|minor-tag)-alpine-arm32v7": {}
+                "$(sdk|10.0|fixed-tag)-alpine3.22-arm32v7": {},
+                "$(sdk|10.0|minor-tag)-alpine3.22-arm32v7": {},
+                "$(sdk|10.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -8722,37 +11182,95 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/9.0/alpine3.22/arm64v8",
+              "dockerfile": "src/sdk/10.0/alpine3.22/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(sdk|9.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(sdk|9.0|minor-tag)-alpine-arm64v8": {}
+                "$(sdk|10.0|fixed-tag)-alpine3.22-arm64v8": {},
+                "$(sdk|10.0|minor-tag)-alpine3.22-arm64v8": {},
+                "$(sdk|10.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|9.0|product-version)",
+          "productVersion": "$(sdk|10.0|product-version)",
           "sharedTags": {
-            "$(sdk|9.0|fixed-tag)-alpine3.23": {},
-            "$(sdk|9.0|minor-tag)-alpine3.23": {}
+            "$(sdk|10.0|fixed-tag)-alpine3.22-aot": {},
+            "$(sdk|10.0|minor-tag)-alpine3.22-aot": {},
+            "$(sdk|10.0|minor-tag)-alpine-aot": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:sdk)"
+              },
+              "dockerfile": "src/sdk/10.0/alpine3.22-aot/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(sdk|10.0|fixed-tag)-alpine3.22-aot-amd64": {},
+                "$(sdk|10.0|minor-tag)-alpine3.22-aot-amd64": {},
+                "$(sdk|10.0|minor-tag)-alpine-aot-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.22-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:sdk)"
+              },
+              "architecture": "arm64",
+              "dockerfile": "src/sdk/10.0/alpine3.22-aot/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(sdk|10.0|fixed-tag)-alpine3.22-aot-arm64v8": {},
+                "$(sdk|10.0|minor-tag)-alpine3.22-aot-arm64v8": {},
+                "$(sdk|10.0|minor-tag)-alpine-aot-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.22-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(sdk|10.0|product-version)",
+          "sharedTags": {
+            "$(sdk|10.0|fixed-tag)-alpine3.23": {},
+            "$(sdk|10.0|minor-tag)-alpine3.23": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/9.0/alpine3.23/amd64",
+              "dockerfile": "src/sdk/10.0/alpine3.23/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(sdk|9.0|minor-tag)-alpine3.23-amd64": {}
+                "$(sdk|10.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(sdk|10.0|minor-tag)-alpine3.23-amd64": {}
               }
             },
             {
@@ -8760,13 +11278,13 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm",
-              "dockerfile": "src/sdk/9.0/alpine3.23/arm32v7",
+              "dockerfile": "src/sdk/10.0/alpine3.23/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(sdk|9.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(sdk|10.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(sdk|10.0|minor-tag)-alpine3.23-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -8775,88 +11293,91 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/9.0/alpine3.23/arm64v8",
+              "dockerfile": "src/sdk/10.0/alpine3.23/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(sdk|9.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(sdk|10.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(sdk|10.0|minor-tag)-alpine3.23-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|9.0|product-version)",
+          "productVersion": "$(sdk|10.0|product-version)",
           "sharedTags": {
-            "$(sdk|9.0|fixed-tag)-noble": {},
-            "$(sdk|9.0|minor-tag)-noble": {}
+            "$(sdk|10.0|fixed-tag)-alpine3.23-aot": {},
+            "$(sdk|10.0|minor-tag)-alpine3.23-aot": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "dockerfile": "src/sdk/9.0/noble/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "noble",
-              "tags": {
-                "$(sdk|9.0|fixed-tag)-noble-amd64": {},
-                "$(sdk|9.0|minor-tag)-noble-amd64": {}
-              }
-            },
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
+                "REPO": "$(Repo:sdk)"
               },
-              "architecture": "arm",
-              "dockerfile": "src/sdk/9.0/noble/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "dockerfile": "src/sdk/10.0/alpine3.23-aot/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-noble-arm32v7": {},
-                "$(sdk|9.0|minor-tag)-noble-arm32v7": {}
+                "$(sdk|10.0|fixed-tag)-alpine3.23-aot-amd64": {},
+                "$(sdk|10.0|minor-tag)-alpine3.23-aot-amd64": {}
               },
-              "variant": "v7"
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-amd64"
+                  ]
+                }
+              ]
             },
             {
               "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
+                "REPO": "$(Repo:sdk)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/9.0/noble/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "dockerfile": "src/sdk/10.0/alpine3.23-aot/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-noble-arm64v8": {},
-                "$(sdk|9.0|minor-tag)-noble-arm64v8": {}
+                "$(sdk|10.0|fixed-tag)-alpine3.23-aot-arm64v8": {},
+                "$(sdk|10.0|minor-tag)-alpine3.23-aot-arm64v8": {}
               },
-              "variant": "v8"
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ]
             }
           ]
         },
         {
-          "productVersion": "$(sdk|9.0|product-version)",
+          "productVersion": "$(sdk|10.0|product-version)",
           "sharedTags": {
-            "$(sdk|9.0|fixed-tag)-azurelinux3.0": {},
-            "$(sdk|9.0|minor-tag)-azurelinux3.0": {}
+            "$(sdk|10.0|fixed-tag)-azurelinux3.0": {},
+            "$(sdk|10.0|minor-tag)-azurelinux3.0": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/9.0/azurelinux3.0/amd64",
+              "dockerfile": "src/sdk/10.0/azurelinux3.0/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-azurelinux3.0-amd64": {},
-                "$(sdk|9.0|minor-tag)-azurelinux3.0-amd64": {}
+                "$(sdk|10.0|fixed-tag)-azurelinux3.0-amd64": {},
+                "$(sdk|10.0|minor-tag)-azurelinux3.0-amd64": {}
               }
             },
             {
@@ -8864,133 +11385,134 @@
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/9.0/azurelinux3.0/arm64v8",
+              "dockerfile": "src/sdk/10.0/azurelinux3.0/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-azurelinux3.0-arm64v8": {},
-                "$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8": {}
+                "$(sdk|10.0|fixed-tag)-azurelinux3.0-arm64v8": {},
+                "$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|9.0|product-version)",
+          "productVersion": "$(sdk|10.0|product-version)",
+          "sharedTags": {
+            "$(sdk|10.0|fixed-tag)-azurelinux3.0-aot": {},
+            "$(sdk|10.0|minor-tag)-azurelinux3.0-aot": {}
+          },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
+                "REPO": "$(Repo:sdk)"
               },
-              "dockerfile": "src/sdk/9.0/nanoserver-1809/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "nanoserver-1809",
+              "dockerfile": "src/sdk/10.0/azurelinux3.0-aot/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-nanoserver-1809": {},
-                "$(sdk|9.0|minor-tag)-nanoserver-1809": {}
+                "$(sdk|10.0|fixed-tag)-azurelinux3.0-aot-amd64": {},
+                "$(sdk|10.0|minor-tag)-azurelinux3.0-aot-amd64": {}
               }
-            }
-          ]
-        },
-        {
-          "productVersion": "$(sdk|9.0|product-version)",
-          "platforms": [
+            },
             {
+              "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
+                "REPO": "$(Repo:sdk)"
               },
-              "dockerfile": "src/sdk/9.0/nanoserver-ltsc2022/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "nanoserver-ltsc2022",
+              "dockerfile": "src/sdk/10.0/azurelinux3.0-aot/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-nanoserver-ltsc2022": {},
-                "$(sdk|9.0|minor-tag)-nanoserver-ltsc2022": {}
-              }
+                "$(sdk|10.0|fixed-tag)-azurelinux3.0-aot-arm64v8": {},
+                "$(sdk|10.0|minor-tag)-azurelinux3.0-aot-arm64v8": {}
+              },
+              "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|9.0|product-version)",
+          "productVersion": "$(sdk|10.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/9.0/nanoserver-ltsc2025/amd64",
+              "dockerfile": "src/sdk/10.0/nanoserver-ltsc2022/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
-              "osVersion": "nanoserver-ltsc2025",
+              "osVersion": "nanoserver-ltsc2022",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-nanoserver-ltsc2025": {},
-                "$(sdk|9.0|minor-tag)-nanoserver-ltsc2025": {}
+                "$(sdk|10.0|fixed-tag)-nanoserver-ltsc2022": {},
+                "$(sdk|10.0|minor-tag)-nanoserver-ltsc2022": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(sdk|9.0|product-version)",
+          "productVersion": "$(sdk|10.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/9.0/windowsservercore-ltsc2019/amd64",
+              "dockerfile": "src/sdk/10.0/nanoserver-ltsc2025/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
-              "osVersion": "windowsservercore-ltsc2019",
+              "osVersion": "nanoserver-ltsc2025",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-windowsservercore-ltsc2019": {},
-                "$(sdk|9.0|minor-tag)-windowsservercore-ltsc2019": {}
+                "$(sdk|10.0|fixed-tag)-nanoserver-ltsc2025": {},
+                "$(sdk|10.0|minor-tag)-nanoserver-ltsc2025": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(sdk|9.0|product-version)",
+          "productVersion": "$(sdk|10.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/9.0/windowsservercore-ltsc2022/amd64",
+              "dockerfile": "src/sdk/10.0/windowsservercore-ltsc2022/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "windowsservercore-ltsc2022",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-windowsservercore-ltsc2022": {},
-                "$(sdk|9.0|minor-tag)-windowsservercore-ltsc2022": {}
+                "$(sdk|10.0|fixed-tag)-windowsservercore-ltsc2022": {},
+                "$(sdk|10.0|minor-tag)-windowsservercore-ltsc2022": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(sdk|9.0|product-version)",
+          "productVersion": "$(sdk|10.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/9.0/windowsservercore-ltsc2025/amd64",
+              "dockerfile": "src/sdk/10.0/windowsservercore-ltsc2025/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "windowsservercore-ltsc2025",
               "tags": {
-                "$(sdk|9.0|fixed-tag)-windowsservercore-ltsc2025": {},
-                "$(sdk|9.0|minor-tag)-windowsservercore-ltsc2025": {}
+                "$(sdk|10.0|fixed-tag)-windowsservercore-ltsc2025": {},
+                "$(sdk|10.0|minor-tag)-windowsservercore-ltsc2025": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(sdk|10.0|product-version)",
+          "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
-            "$(sdk|10.0|fixed-tag)-noble": {},
-            "$(sdk|10.0|minor-tag)-noble": {},
-            "$(sdk|10.0|fixed-tag)": {},
-            "$(sdk|10.0|minor-tag)": {},
+            "$(sdk|11.0|fixed-tag)-noble": {},
+            "$(sdk|11.0|minor-tag)-noble": {},
+            "$(sdk|11.0|fixed-tag)": {},
+            "$(sdk|11.0|minor-tag)": {},
             "latest": {}
           },
           "platforms": [
@@ -8998,13 +11520,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/10.0/noble/amd64",
+              "dockerfile": "src/sdk/11.0/noble/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "noble",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-noble-amd64": {},
-                "$(sdk|10.0|minor-tag)-noble-amd64": {}
+                "$(sdk|11.0|fixed-tag)-noble-amd64": {},
+                "$(sdk|11.0|minor-tag)-noble-amd64": {}
               }
             },
             {
@@ -9012,13 +11534,13 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm",
-              "dockerfile": "src/sdk/10.0/noble/arm32v7",
+              "dockerfile": "src/sdk/11.0/noble/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "noble",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-noble-arm32v7": {},
-                "$(sdk|10.0|minor-tag)-noble-arm32v7": {}
+                "$(sdk|11.0|fixed-tag)-noble-arm32v7": {},
+                "$(sdk|11.0|minor-tag)-noble-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -9027,38 +11549,38 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/10.0/noble/arm64v8",
+              "dockerfile": "src/sdk/11.0/noble/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "noble",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-noble-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-noble-arm64v8": {}
+                "$(sdk|11.0|fixed-tag)-noble-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-noble-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|10.0|product-version)",
+          "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
-            "$(sdk|10.0|fixed-tag)-noble-aot": {},
-            "$(sdk|10.0|minor-tag)-noble-aot": {},
-            "$(sdk|10.0|fixed-tag)-aot": {},
-            "$(sdk|10.0|minor-tag)-aot": {}
+            "$(sdk|11.0|fixed-tag)-noble-aot": {},
+            "$(sdk|11.0|minor-tag)-noble-aot": {},
+            "$(sdk|11.0|fixed-tag)-aot": {},
+            "$(sdk|11.0|minor-tag)-aot": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:sdk)"
               },
-              "dockerfile": "src/sdk/10.0/noble-aot/amd64",
+              "dockerfile": "src/sdk/11.0/noble-aot/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
               "os": "linux",
               "osVersion": "noble",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-noble-aot-amd64": {},
-                "$(sdk|10.0|minor-tag)-noble-aot-amd64": {}
+                "$(sdk|11.0|fixed-tag)-noble-aot-amd64": {},
+                "$(sdk|11.0|minor-tag)-noble-aot-amd64": {}
               }
             },
             {
@@ -9066,38 +11588,38 @@
                 "REPO": "$(Repo:sdk)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/10.0/noble-aot/arm64v8",
+              "dockerfile": "src/sdk/11.0/noble-aot/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
               "os": "linux",
               "osVersion": "noble",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-noble-aot-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-noble-aot-arm64v8": {}
+                "$(sdk|11.0|fixed-tag)-noble-aot-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-noble-aot-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|10.0|product-version)",
+          "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
-            "$(sdk|10.0|fixed-tag)-alpine3.22": {},
-            "$(sdk|10.0|minor-tag)-alpine3.22": {},
-            "$(sdk|10.0|minor-tag)-alpine": {}
+            "$(sdk|11.0|fixed-tag)-alpine3.22": {},
+            "$(sdk|11.0|minor-tag)-alpine3.22": {},
+            "$(sdk|11.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/10.0/alpine3.22/amd64",
+              "dockerfile": "src/sdk/11.0/alpine3.22/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(sdk|10.0|minor-tag)-alpine3.22-amd64": {},
-                "$(sdk|10.0|minor-tag)-alpine-amd64": {}
+                "$(sdk|11.0|fixed-tag)-alpine3.22-amd64": {},
+                "$(sdk|11.0|minor-tag)-alpine3.22-amd64": {},
+                "$(sdk|11.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -9105,14 +11627,14 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm",
-              "dockerfile": "src/sdk/10.0/alpine3.22/arm32v7",
+              "dockerfile": "src/sdk/11.0/alpine3.22/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(sdk|10.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(sdk|10.0|minor-tag)-alpine-arm32v7": {}
+                "$(sdk|11.0|fixed-tag)-alpine3.22-arm32v7": {},
+                "$(sdk|11.0|minor-tag)-alpine3.22-arm32v7": {},
+                "$(sdk|11.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -9121,46 +11643,46 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/10.0/alpine3.22/arm64v8",
+              "dockerfile": "src/sdk/11.0/alpine3.22/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-alpine-arm64v8": {}
+                "$(sdk|11.0|fixed-tag)-alpine3.22-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-alpine3.22-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|10.0|product-version)",
+          "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
-            "$(sdk|10.0|fixed-tag)-alpine3.22-aot": {},
-            "$(sdk|10.0|minor-tag)-alpine3.22-aot": {},
-            "$(sdk|10.0|minor-tag)-alpine-aot": {}
+            "$(sdk|11.0|fixed-tag)-alpine3.22-aot": {},
+            "$(sdk|11.0|minor-tag)-alpine3.22-aot": {},
+            "$(sdk|11.0|minor-tag)-alpine-aot": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:sdk)"
               },
-              "dockerfile": "src/sdk/10.0/alpine3.22-aot/amd64",
+              "dockerfile": "src/sdk/11.0/alpine3.22-aot/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-alpine3.22-aot-amd64": {},
-                "$(sdk|10.0|minor-tag)-alpine3.22-aot-amd64": {},
-                "$(sdk|10.0|minor-tag)-alpine-aot-amd64": {}
+                "$(sdk|11.0|fixed-tag)-alpine3.22-aot-amd64": {},
+                "$(sdk|11.0|minor-tag)-alpine3.22-aot-amd64": {},
+                "$(sdk|11.0|minor-tag)-alpine-aot-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.22-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.22-amd64"
                   ]
                 }
               ]
@@ -9170,14 +11692,14 @@
                 "REPO": "$(Repo:sdk)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/10.0/alpine3.22-aot/arm64v8",
+              "dockerfile": "src/sdk/11.0/alpine3.22-aot/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-alpine3.22-aot-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-alpine3.22-aot-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-alpine-aot-arm64v8": {}
+                "$(sdk|11.0|fixed-tag)-alpine3.22-aot-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-alpine3.22-aot-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-alpine-aot-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -9185,7 +11707,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.22-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.22-arm64v8"
                   ]
                 }
               ]
@@ -9193,23 +11715,23 @@
           ]
         },
         {
-          "productVersion": "$(sdk|10.0|product-version)",
+          "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
-            "$(sdk|10.0|fixed-tag)-alpine3.23": {},
-            "$(sdk|10.0|minor-tag)-alpine3.23": {}
+            "$(sdk|11.0|fixed-tag)-alpine3.23": {},
+            "$(sdk|11.0|minor-tag)-alpine3.23": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/10.0/alpine3.23/amd64",
+              "dockerfile": "src/sdk/11.0/alpine3.23/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(sdk|10.0|minor-tag)-alpine3.23-amd64": {}
+                "$(sdk|11.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(sdk|11.0|minor-tag)-alpine3.23-amd64": {}
               }
             },
             {
@@ -9217,13 +11739,13 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm",
-              "dockerfile": "src/sdk/10.0/alpine3.23/arm32v7",
+              "dockerfile": "src/sdk/11.0/alpine3.23/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(sdk|10.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(sdk|11.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(sdk|11.0|minor-tag)-alpine3.23-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -9232,43 +11754,43 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/10.0/alpine3.23/arm64v8",
+              "dockerfile": "src/sdk/11.0/alpine3.23/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(sdk|11.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-alpine3.23-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|10.0|product-version)",
+          "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
-            "$(sdk|10.0|fixed-tag)-alpine3.23-aot": {},
-            "$(sdk|10.0|minor-tag)-alpine3.23-aot": {}
+            "$(sdk|11.0|fixed-tag)-alpine3.23-aot": {},
+            "$(sdk|11.0|minor-tag)-alpine3.23-aot": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:sdk)"
               },
-              "dockerfile": "src/sdk/10.0/alpine3.23-aot/amd64",
+              "dockerfile": "src/sdk/11.0/alpine3.23-aot/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-alpine3.23-aot-amd64": {},
-                "$(sdk|10.0|minor-tag)-alpine3.23-aot-amd64": {}
+                "$(sdk|11.0|fixed-tag)-alpine3.23-aot-amd64": {},
+                "$(sdk|11.0|minor-tag)-alpine3.23-aot-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-amd64"
                   ]
                 }
               ]
@@ -9278,13 +11800,13 @@
                 "REPO": "$(Repo:sdk)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/10.0/alpine3.23-aot/arm64v8",
+              "dockerfile": "src/sdk/11.0/alpine3.23-aot/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-alpine3.23-aot-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-alpine3.23-aot-arm64v8": {}
+                "$(sdk|11.0|fixed-tag)-alpine3.23-aot-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-alpine3.23-aot-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -9292,7 +11814,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm64v8"
                   ]
                 }
               ]
@@ -9300,23 +11822,23 @@
           ]
         },
         {
-          "productVersion": "$(sdk|10.0|product-version)",
+          "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
-            "$(sdk|10.0|fixed-tag)-azurelinux3.0": {},
-            "$(sdk|10.0|minor-tag)-azurelinux3.0": {}
+            "$(sdk|11.0|fixed-tag)-azurelinux3.0": {},
+            "$(sdk|11.0|minor-tag)-azurelinux3.0": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/10.0/azurelinux3.0/amd64",
+              "dockerfile": "src/sdk/11.0/azurelinux3.0/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-azurelinux3.0-amd64": {},
-                "$(sdk|10.0|minor-tag)-azurelinux3.0-amd64": {}
+                "$(sdk|11.0|fixed-tag)-azurelinux3.0-amd64": {},
+                "$(sdk|11.0|minor-tag)-azurelinux3.0-amd64": {}
               }
             },
             {
@@ -9324,36 +11846,36 @@
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/10.0/azurelinux3.0/arm64v8",
+              "dockerfile": "src/sdk/11.0/azurelinux3.0/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-azurelinux3.0-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-azurelinux3.0-arm64v8": {}
+                "$(sdk|11.0|fixed-tag)-azurelinux3.0-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-azurelinux3.0-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|10.0|product-version)",
+          "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
-            "$(sdk|10.0|fixed-tag)-azurelinux3.0-aot": {},
-            "$(sdk|10.0|minor-tag)-azurelinux3.0-aot": {}
+            "$(sdk|11.0|fixed-tag)-azurelinux3.0-aot": {},
+            "$(sdk|11.0|minor-tag)-azurelinux3.0-aot": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:sdk)"
               },
-              "dockerfile": "src/sdk/10.0/azurelinux3.0-aot/amd64",
+              "dockerfile": "src/sdk/11.0/azurelinux3.0-aot/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-azurelinux3.0-aot-amd64": {},
-                "$(sdk|10.0|minor-tag)-azurelinux3.0-aot-amd64": {}
+                "$(sdk|11.0|fixed-tag)-azurelinux3.0-aot-amd64": {},
+                "$(sdk|11.0|minor-tag)-azurelinux3.0-aot-amd64": {}
               }
             },
             {
@@ -9361,86 +11883,86 @@
               "buildArgs": {
                 "REPO": "$(Repo:sdk)"
               },
-              "dockerfile": "src/sdk/10.0/azurelinux3.0-aot/arm64v8",
+              "dockerfile": "src/sdk/11.0/azurelinux3.0-aot/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-azurelinux3.0-aot-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-azurelinux3.0-aot-arm64v8": {}
+                "$(sdk|11.0|fixed-tag)-azurelinux3.0-aot-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-azurelinux3.0-aot-arm64v8": {}
               },
               "variant": "v8"
             }
           ]
         },
         {
-          "productVersion": "$(sdk|10.0|product-version)",
+          "productVersion": "$(sdk|11.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/10.0/nanoserver-ltsc2022/amd64",
+              "dockerfile": "src/sdk/11.0/nanoserver-ltsc2022/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "nanoserver-ltsc2022",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-nanoserver-ltsc2022": {},
-                "$(sdk|10.0|minor-tag)-nanoserver-ltsc2022": {}
+                "$(sdk|11.0|fixed-tag)-nanoserver-ltsc2022": {},
+                "$(sdk|11.0|minor-tag)-nanoserver-ltsc2022": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(sdk|10.0|product-version)",
+          "productVersion": "$(sdk|11.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/10.0/nanoserver-ltsc2025/amd64",
+              "dockerfile": "src/sdk/11.0/nanoserver-ltsc2025/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "nanoserver-ltsc2025",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-nanoserver-ltsc2025": {},
-                "$(sdk|10.0|minor-tag)-nanoserver-ltsc2025": {}
+                "$(sdk|11.0|fixed-tag)-nanoserver-ltsc2025": {},
+                "$(sdk|11.0|minor-tag)-nanoserver-ltsc2025": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(sdk|10.0|product-version)",
+          "productVersion": "$(sdk|11.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/10.0/windowsservercore-ltsc2022/amd64",
+              "dockerfile": "src/sdk/11.0/windowsservercore-ltsc2022/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "windowsservercore-ltsc2022",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-windowsservercore-ltsc2022": {},
-                "$(sdk|10.0|minor-tag)-windowsservercore-ltsc2022": {}
+                "$(sdk|11.0|fixed-tag)-windowsservercore-ltsc2022": {},
+                "$(sdk|11.0|minor-tag)-windowsservercore-ltsc2022": {}
               }
             }
           ]
         },
         {
-          "productVersion": "$(sdk|10.0|product-version)",
+          "productVersion": "$(sdk|11.0|product-version)",
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/10.0/windowsservercore-ltsc2025/amd64",
+              "dockerfile": "src/sdk/11.0/windowsservercore-ltsc2025/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
               "os": "windows",
               "osVersion": "windowsservercore-ltsc2025",
               "tags": {
-                "$(sdk|10.0|fixed-tag)-windowsservercore-ltsc2025": {},
-                "$(sdk|10.0|minor-tag)-windowsservercore-ltsc2025": {}
+                "$(sdk|11.0|fixed-tag)-windowsservercore-ltsc2025": {},
+                "$(sdk|11.0|minor-tag)-windowsservercore-ltsc2025": {}
               }
             }
           ]
diff --git a/manifest.versions.json b/manifest.versions.json
index 5419beda09..484be299a2 100644
--- a/manifest.versions.json
+++ b/manifest.versions.json
@@ -13,6 +13,7 @@
     "base-url|public-checksums|preview|nightly": "https://ci.dot.net/public-checksums",
 
     "alpine|floating-tag-version": "alpine3.22",
+    "alpine|11.0|floating-tag-version": "$(alpine|floating-tag-version)",
     "alpine|10.0|floating-tag-version": "$(alpine|floating-tag-version)",
     "alpine|9.0|floating-tag-version": "$(alpine|floating-tag-version)",
     "alpine|8.0|floating-tag-version": "$(alpine|floating-tag-version)",
@@ -30,6 +31,9 @@
     "aspnet|8.0|build-version": "8.0.22",
     "aspnet-composite|8.0|build-version": "$(aspnet|8.0|build-version)",
 
+    "aspnet|11.0|build-version": "11.0.0-preview.1.00000.1",
+    "aspnet-composite|11.0|build-version": "$(aspnet|11.0|build-version)",
+
     "aspnet|10.0|build-version": "10.0.1",
     "aspnet-composite|10.0|build-version": "$(aspnet|10.0|build-version)",
 
@@ -43,6 +47,9 @@
     "chisel|10.0|x64|url": "$(chisel|latest|x64|url)",
     "chisel|10.0|arm|url": "$(chisel|latest|arm|url)",
     "chisel|10.0|arm64|url": "$(chisel|latest|arm64|url)",
+    "chisel|11.0|x64|url": "$(chisel|latest|x64|url)",
+    "chisel|11.0|arm|url": "$(chisel|latest|arm|url)",
+    "chisel|11.0|arm64|url": "$(chisel|latest|arm64|url)",
     "chisel|9.0|x64|url": "$(chisel|latest|x64|url)",
     "chisel|9.0|arm|url": "$(chisel|latest|arm|url)",
     "chisel|9.0|arm64|url": "$(chisel|latest|arm64|url)",
@@ -56,6 +63,9 @@
     "chisel|10.0|x64|sha384": "$(chisel|latest|x64|sha384)",
     "chisel|10.0|arm|sha384": "$(chisel|latest|arm|sha384)",
     "chisel|10.0|arm64|sha384": "$(chisel|latest|arm64|sha384)",
+    "chisel|11.0|x64|sha384": "$(chisel|latest|x64|sha384)",
+    "chisel|11.0|arm|sha384": "$(chisel|latest|arm|sha384)",
+    "chisel|11.0|arm64|sha384": "$(chisel|latest|arm64|sha384)",
     "chisel|9.0|x64|sha384": "$(chisel|latest|x64|sha384)",
     "chisel|9.0|arm|sha384": "$(chisel|latest|arm|sha384)",
     "chisel|9.0|arm64|sha384": "$(chisel|latest|arm64|sha384)",
@@ -89,6 +99,14 @@
     "dotnet|10.0|base-url|checksums|main": "$(base-url|public|maintenance|main)",
     "dotnet|10.0|base-url|checksums|nightly": "$(base-url|public|maintenance|nightly)",
 
+    "dotnet|11.0|product-version": "11.0.0-preview.1.00000.1",
+    "dotnet|11.0|fixed-tag": "$(dotnet|11.0|product-version)",
+    "dotnet|11.0|minor-tag": "11.0-preview",
+    "dotnet|11.0|base-url|main": "$(base-url|public|preview|main)",
+    "dotnet|11.0|base-url|nightly": "$(base-url|public|preview|nightly)",
+    "dotnet|11.0|base-url|checksums|main": "$(base-url|public-checksums|preview|main)",
+    "dotnet|11.0|base-url|checksums|nightly": "$(base-url|public-checksums|preview|nightly)",
+
     "libicu|bookworm": 72,
     "libicu|bullseye": 67,
     "libicu|focal": 66,
@@ -111,6 +129,8 @@
     "mingit|9.0|x64|sha": "$(mingit|latest|x64|sha)",
     "mingit|10.0|x64|url": "$(mingit|latest|x64|url)",
     "mingit|10.0|x64|sha": "$(mingit|latest|x64|sha)",
+    "mingit|11.0|x64|url": "$(mingit|latest|x64|url)",
+    "mingit|11.0|x64|sha": "$(mingit|latest|x64|sha)",
 
     "monitor|8|major-tag": "8",
     "monitor|8.1|build-version": "8.1.3-servicing.25556.1",
@@ -172,6 +192,13 @@
     "powershell|10.0|Linux|x64|sha": "92ba2a8344f13d1c640f73d61488a582bae3ea82e4d00aad02efece3475f852855fb6f8ac37f72b4a14cdc1975af9f253d59ce72e36f3653e6b1ee87dc273f8f",
     "powershell|10.0|Windows|x64|sha": "a529408a93ca2be753d84137bff8ed95dc9301faf2da62fbd9d7bfb29fe502bfca9427736b1004884e839e3f2585ac613349f0fbbb97ea6f979b115dcf06aa0c",
 
+    "powershell|11.0|build-version": "7.6.0-preview.4",
+    "powershell|11.0|Linux.Alpine|sha": "$(powershell|10.0|Linux.Alpine|sha)",
+    "powershell|11.0|Linux|arm32|sha": "$(powershell|10.0|Linux|arm32|sha)",
+    "powershell|11.0|Linux|arm64|sha": "$(powershell|10.0|Linux|arm64|sha)",
+    "powershell|11.0|Linux|x64|sha": "$(powershell|10.0|Linux|x64|sha)",
+    "powershell|11.0|Windows|x64|sha": "$(powershell|10.0|Windows|x64|sha)",
+
     "yarp|2.3|build-version": "3.0.0-preview.1.25375.1",
     "yarp|2.3|product-version": "2.3.0-preview.5",
     "yarp|2.3|fixed-tag": "$(yarp|2.3|product-version)",
@@ -187,15 +214,18 @@
     "rocks-toolbox|8.0|url": "$(rocks-toolbox|latest|url)",
     "rocks-toolbox|9.0|url": "$(rocks-toolbox|latest|url)",
     "rocks-toolbox|10.0|url": "$(rocks-toolbox|latest|url)",
+    "rocks-toolbox|11.0|url": "$(rocks-toolbox|latest|url)",
 
     "rocks-toolbox|latest|version": "v1.2.0",
     "rocks-toolbox|8.0|version": "$(rocks-toolbox|latest|version)",
     "rocks-toolbox|9.0|version": "$(rocks-toolbox|latest|version)",
     "rocks-toolbox|10.0|version": "$(rocks-toolbox|latest|version)",
+    "rocks-toolbox|11.0|version": "$(rocks-toolbox|latest|version)",
 
     "runtime|8.0|build-version": "8.0.22",
     "runtime|9.0|build-version": "9.0.11",
     "runtime|10.0|build-version": "10.0.1",
+    "runtime|11.0|build-version": "11.0.0-preview.1.00000.1",
 
     "sdk|8.0|build-version": "8.0.416",
     "sdk|8.0|product-version": "8.0.416",
@@ -224,6 +254,15 @@
     "sdk|10.0|fixed-tag": "$(sdk|10.0|product-version)",
     "sdk|10.0|minor-tag": "$(dotnet|10.0|minor-tag)",
 
+    "sdk|11.0|build-version": "11.0.100-preview.1",
+    "sdk|11.0|product-version": "11.0.100-preview.1",
+    "sdk|11.0|base-url|main": "$(dotnet|11.0|base-url|main)",
+    "sdk|11.0|base-url|nightly": "$(dotnet|11.0|base-url|nightly)",
+    "sdk|11.0|base-url|checksums|main": "$(dotnet|11.0|base-url|checksums|main)",
+    "sdk|11.0|base-url|checksums|nightly": "$(dotnet|11.0|base-url|checksums|nightly)",
+    "sdk|11.0|fixed-tag": "$(sdk|11.0|product-version)",
+    "sdk|11.0|minor-tag": "$(dotnet|11.0|minor-tag)",
+
     "syft|repo": "anchore/syft",
     "syft|version": "v1.38.0",
     "syft|tag": "$(syft|version)-debug"
diff --git a/src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile b/src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile
new file mode 100644
index 0000000000..c61ec9624e
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile
new file mode 100644
index 0000000000..f5c3e9e8c7
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile
new file mode 100644
index 0000000000..fd6065c0a4
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.22/amd64/Dockerfile b/src/aspnet/11.0/alpine3.22/amd64/Dockerfile
new file mode 100644
index 0000000000..96426fdbcf
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.22/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile
new file mode 100644
index 0000000000..0ce1342701
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile
new file mode 100644
index 0000000000..f412c9df77
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile
new file mode 100644
index 0000000000..5525428f39
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile
new file mode 100644
index 0000000000..607eae6531
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile
new file mode 100644
index 0000000000..3da803332a
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.23/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23/amd64/Dockerfile
new file mode 100644
index 0000000000..cc263db756
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.23/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile
new file mode 100644
index 0000000000..9b68c5981f
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile
new file mode 100644
index 0000000000..69eeed4470
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..e6d70e08f0
--- /dev/null
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
@@ -0,0 +1,41 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..9c2671364d
--- /dev/null
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
@@ -0,0 +1,41 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
new file mode 100644
index 0000000000..cad92cca90
--- /dev/null
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
@@ -0,0 +1,41 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
new file mode 100644
index 0000000000..6d422ff9c2
--- /dev/null
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
@@ -0,0 +1,41 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..1f7f02f3e6
--- /dev/null
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
@@ -0,0 +1,31 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..7a8f3ffd5d
--- /dev/null
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
@@ -0,0 +1,31 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile
new file mode 100644
index 0000000000..ec88866b7a
--- /dev/null
+++ b/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile
@@ -0,0 +1,31 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
new file mode 100644
index 0000000000..271b9f6f4d
--- /dev/null
+++ b/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
@@ -0,0 +1,31 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile
new file mode 100644
index 0000000000..a62be98873
--- /dev/null
+++ b/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-amd64 AS installer
+
+RUN tdnf install -y \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile
new file mode 100644
index 0000000000..c155ab35c9
--- /dev/null
+++ b/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8 AS installer
+
+RUN tdnf install -y \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile
new file mode 100644
index 0000000000..0db613af95
--- /dev/null
+++ b/src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile
@@ -0,0 +1,38 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
+
+# Install ASP.NET Core Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $aspnetcore_version = '11.0.0-preview.1.00000.1'; `
+        $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
+        `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; `
+        `
+        if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $aspnetcore_file --directory dotnet ./shared/Microsoft.AspNetCore.App; `
+        Remove-Item -Force `
+            $aspnetcore_file, `
+            $dotnet_sha512_file
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-nanoserver-ltsc2022
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile
new file mode 100644
index 0000000000..f7e5664d07
--- /dev/null
+++ b/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -0,0 +1,38 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2025-amd64 AS installer
+
+# Install ASP.NET Core Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $aspnetcore_version = '11.0.0-preview.1.00000.1'; `
+        $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
+        `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; `
+        `
+        if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $aspnetcore_file --directory dotnet ./shared/Microsoft.AspNetCore.App; `
+        Remove-Item -Force `
+            $aspnetcore_file, `
+            $dotnet_sha512_file
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-nanoserver-ltsc2025
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..0600e9ba81
--- /dev/null
+++ b/src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile
@@ -0,0 +1,35 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile b/src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..f3d6661433
--- /dev/null
+++ b/src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile
@@ -0,0 +1,35 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..5a8ab85882
--- /dev/null
+++ b/src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
@@ -0,0 +1,35 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile b/src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile
new file mode 100644
index 0000000000..6acb787a93
--- /dev/null
+++ b/src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile
@@ -0,0 +1,35 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile b/src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile
new file mode 100644
index 0000000000..b021eec3b1
--- /dev/null
+++ b/src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile
@@ -0,0 +1,35 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile b/src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile
new file mode 100644
index 0000000000..d9314d8ba6
--- /dev/null
+++ b/src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile
@@ -0,0 +1,35 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile b/src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..dae19f51eb
--- /dev/null
+++ b/src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..fb8dfc0361
--- /dev/null
+++ b/src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..dfd165c015
--- /dev/null
+++ b/src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble-chiseled/amd64/Dockerfile b/src/aspnet/11.0/noble-chiseled/amd64/Dockerfile
new file mode 100644
index 0000000000..9446be0073
--- /dev/null
+++ b/src/aspnet/11.0/noble-chiseled/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile b/src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile
new file mode 100644
index 0000000000..b4210f7eef
--- /dev/null
+++ b/src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile b/src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile
new file mode 100644
index 0000000000..26288b7ec0
--- /dev/null
+++ b/src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble/amd64/Dockerfile b/src/aspnet/11.0/noble/amd64/Dockerfile
new file mode 100644
index 0000000000..fd3ecbafcc
--- /dev/null
+++ b/src/aspnet/11.0/noble/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble/arm32v7/Dockerfile b/src/aspnet/11.0/noble/arm32v7/Dockerfile
new file mode 100644
index 0000000000..eb92c8b97b
--- /dev/null
+++ b/src/aspnet/11.0/noble/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble/arm64v8/Dockerfile b/src/aspnet/11.0/noble/arm64v8/Dockerfile
new file mode 100644
index 0000000000..0846cf31e8
--- /dev/null
+++ b/src/aspnet/11.0/noble/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
new file mode 100644
index 0000000000..7d30132680
--- /dev/null
+++ b/src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
@@ -0,0 +1,38 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
+
+# Install ASP.NET Core Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $aspnetcore_version = '11.0.0-preview.1.00000.1'; `
+        $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
+        `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; `
+        `
+        if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $aspnetcore_file --directory dotnet ./shared/Microsoft.AspNetCore.App; `
+        Remove-Item -Force `
+            $aspnetcore_file, `
+            $dotnet_sha512_file
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-windowsservercore-ltsc2022
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
new file mode 100644
index 0000000000..148442456c
--- /dev/null
+++ b/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -0,0 +1,38 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2025-amd64 AS installer
+
+# Install ASP.NET Core Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $aspnetcore_version = '11.0.0-preview.1.00000.1'; `
+        $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
+        `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; `
+        `
+        if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $aspnetcore_file --directory dotnet ./shared/Microsoft.AspNetCore.App; `
+        Remove-Item -Force `
+            $aspnetcore_file, `
+            $dotnet_sha512_file
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-preview.1.00000.1-windowsservercore-ltsc2025
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/runtime-deps/11.0/alpine3.22-extra/amd64/Dockerfile b/src/runtime-deps/11.0/alpine3.22-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..c9dc3b1da2
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.22-extra/amd64/Dockerfile
@@ -0,0 +1,30 @@
+FROM amd64/alpine:3.22
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        icu-data-full \
+        icu-libs \
+        libgcc \
+        libssl3 \
+        libstdc++ \
+        tzdata
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/src/runtime-deps/11.0/alpine3.22-extra/arm32v7/Dockerfile b/src/runtime-deps/11.0/alpine3.22-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..dfa4053e2f
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.22-extra/arm32v7/Dockerfile
@@ -0,0 +1,30 @@
+FROM arm32v7/alpine:3.22
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        icu-data-full \
+        icu-libs \
+        libgcc \
+        libssl3 \
+        libstdc++ \
+        tzdata
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/src/runtime-deps/11.0/alpine3.22-extra/arm64v8/Dockerfile b/src/runtime-deps/11.0/alpine3.22-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..7c25ae6f2e
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.22-extra/arm64v8/Dockerfile
@@ -0,0 +1,30 @@
+FROM arm64v8/alpine:3.22
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        icu-data-full \
+        icu-libs \
+        libgcc \
+        libssl3 \
+        libstdc++ \
+        tzdata
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/src/runtime-deps/11.0/alpine3.22/amd64/Dockerfile b/src/runtime-deps/11.0/alpine3.22/amd64/Dockerfile
new file mode 100644
index 0000000000..c3042512d9
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.22/amd64/Dockerfile
@@ -0,0 +1,29 @@
+FROM amd64/alpine:3.22
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        libgcc \
+        libssl3 \
+        libstdc++
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/src/runtime-deps/11.0/alpine3.22/arm32v7/Dockerfile b/src/runtime-deps/11.0/alpine3.22/arm32v7/Dockerfile
new file mode 100644
index 0000000000..a543d8c074
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.22/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+FROM arm32v7/alpine:3.22
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        libgcc \
+        libssl3 \
+        libstdc++
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/src/runtime-deps/11.0/alpine3.22/arm64v8/Dockerfile b/src/runtime-deps/11.0/alpine3.22/arm64v8/Dockerfile
new file mode 100644
index 0000000000..ab50a7bde1
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.22/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+FROM arm64v8/alpine:3.22
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        libgcc \
+        libssl3 \
+        libstdc++
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile b/src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..e4e8a49348
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile
@@ -0,0 +1,30 @@
+FROM amd64/alpine:3.23
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        icu-data-full \
+        icu-libs \
+        libgcc \
+        libssl3 \
+        libstdc++ \
+        tzdata
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile b/src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..459793f172
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile
@@ -0,0 +1,30 @@
+FROM arm32v7/alpine:3.23
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        icu-data-full \
+        icu-libs \
+        libgcc \
+        libssl3 \
+        libstdc++ \
+        tzdata
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile b/src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..cdbd11bda4
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile
@@ -0,0 +1,30 @@
+FROM arm64v8/alpine:3.23
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        icu-data-full \
+        icu-libs \
+        libgcc \
+        libssl3 \
+        libstdc++ \
+        tzdata
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile b/src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile
new file mode 100644
index 0000000000..3584d9343b
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile
@@ -0,0 +1,29 @@
+FROM amd64/alpine:3.23
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        libgcc \
+        libssl3 \
+        libstdc++
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile b/src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile
new file mode 100644
index 0000000000..44fac11e41
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+FROM arm32v7/alpine:3.23
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        libgcc \
+        libssl3 \
+        libstdc++
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile b/src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile
new file mode 100644
index 0000000000..682d8bd495
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+FROM arm64v8/alpine:3.23
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        libgcc \
+        libssl3 \
+        libstdc++
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/src/runtime-deps/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime-deps/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..b3aa352eba
--- /dev/null
+++ b/src/runtime-deps/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
@@ -0,0 +1,73 @@
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        gawk \
+        shadow-utils \
+    && tdnf clean all
+
+# Install .NET's dependencies into a staging location
+RUN mkdir /staging \
+    && tdnf install -y --releasever=3.0 --installroot /staging \
+        prebuilt-ca-certificates \
+        \
+        # .NET dependencies
+        glibc \
+        icu \
+        libgcc \
+        libstdc++ \
+        openssl-libs \
+        tzdata \
+    && tdnf clean all --releasever=3.0 --installroot /staging
+
+# Generate RPM manifest file by appending to the original manifest file from base distroless image
+COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest
+RUN tmpManifestPath="/tmp/rpmmanifest" \
+    && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \
+    && mkdir --parents /staging/var/lib/rpmmanifest \
+    # Remove duplicates that match on the first field (package name)
+    && tac $tmpManifestPath | gawk '!x[$1]++' | sort > /staging/var/lib/rpmmanifest/container-manifest-2
+
+# Create a non-root user and group
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        --create-home \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/staging/home/app" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/staging/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/staging/etc/group"
+
+# Clean up staging
+RUN rm -rf \
+        /staging/etc/tdnf \
+        /staging/run/* \
+        /staging/var/cache/tdnf \
+        /staging/var/lib/rpm \
+        /staging/usr/share/doc \
+        /staging/usr/share/man \
+    && find /staging/var/log -type f -size +0 -delete
+
+
+# .NET runtime-deps image
+FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+COPY --from=installer /staging/ /
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=installer --chown=1654:1654 /staging/home/app /home/app
+
+USER $APP_UID
diff --git a/src/runtime-deps/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime-deps/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..b3aa352eba
--- /dev/null
+++ b/src/runtime-deps/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
@@ -0,0 +1,73 @@
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        gawk \
+        shadow-utils \
+    && tdnf clean all
+
+# Install .NET's dependencies into a staging location
+RUN mkdir /staging \
+    && tdnf install -y --releasever=3.0 --installroot /staging \
+        prebuilt-ca-certificates \
+        \
+        # .NET dependencies
+        glibc \
+        icu \
+        libgcc \
+        libstdc++ \
+        openssl-libs \
+        tzdata \
+    && tdnf clean all --releasever=3.0 --installroot /staging
+
+# Generate RPM manifest file by appending to the original manifest file from base distroless image
+COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest
+RUN tmpManifestPath="/tmp/rpmmanifest" \
+    && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \
+    && mkdir --parents /staging/var/lib/rpmmanifest \
+    # Remove duplicates that match on the first field (package name)
+    && tac $tmpManifestPath | gawk '!x[$1]++' | sort > /staging/var/lib/rpmmanifest/container-manifest-2
+
+# Create a non-root user and group
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        --create-home \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/staging/home/app" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/staging/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/staging/etc/group"
+
+# Clean up staging
+RUN rm -rf \
+        /staging/etc/tdnf \
+        /staging/run/* \
+        /staging/var/cache/tdnf \
+        /staging/var/lib/rpm \
+        /staging/usr/share/doc \
+        /staging/usr/share/man \
+    && find /staging/var/log -type f -size +0 -delete
+
+
+# .NET runtime-deps image
+FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+COPY --from=installer /staging/ /
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=installer --chown=1654:1654 /staging/home/app /home/app
+
+USER $APP_UID
diff --git a/src/runtime-deps/11.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime-deps/11.0/azurelinux3.0-distroless/amd64/Dockerfile
new file mode 100644
index 0000000000..94daad8657
--- /dev/null
+++ b/src/runtime-deps/11.0/azurelinux3.0-distroless/amd64/Dockerfile
@@ -0,0 +1,73 @@
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        gawk \
+        shadow-utils \
+    && tdnf clean all
+
+# Install .NET's dependencies into a staging location
+RUN mkdir /staging \
+    && tdnf install -y --releasever=3.0 --installroot /staging \
+        prebuilt-ca-certificates \
+        \
+        # .NET dependencies
+        glibc \
+        libgcc \
+        libstdc++ \
+        openssl-libs \
+    && tdnf clean all --releasever=3.0 --installroot /staging
+
+# Generate RPM manifest file by appending to the original manifest file from base distroless image
+COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest
+RUN tmpManifestPath="/tmp/rpmmanifest" \
+    && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \
+    && mkdir --parents /staging/var/lib/rpmmanifest \
+    # Remove duplicates that match on the first field (package name)
+    && tac $tmpManifestPath | gawk '!x[$1]++' | sort > /staging/var/lib/rpmmanifest/container-manifest-2
+
+# Create a non-root user and group
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        --create-home \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/staging/home/app" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/staging/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/staging/etc/group"
+
+# Clean up staging
+RUN rm -rf \
+        /staging/etc/tdnf \
+        /staging/run/* \
+        /staging/var/cache/tdnf \
+        /staging/var/lib/rpm \
+        /staging/usr/share/doc \
+        /staging/usr/share/man \
+    && find /staging/var/log -type f -size +0 -delete
+
+
+# .NET runtime-deps image
+FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+COPY --from=installer /staging/ /
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=installer --chown=1654:1654 /staging/home/app /home/app
+
+USER $APP_UID
diff --git a/src/runtime-deps/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime-deps/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
new file mode 100644
index 0000000000..94daad8657
--- /dev/null
+++ b/src/runtime-deps/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
@@ -0,0 +1,73 @@
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        gawk \
+        shadow-utils \
+    && tdnf clean all
+
+# Install .NET's dependencies into a staging location
+RUN mkdir /staging \
+    && tdnf install -y --releasever=3.0 --installroot /staging \
+        prebuilt-ca-certificates \
+        \
+        # .NET dependencies
+        glibc \
+        libgcc \
+        libstdc++ \
+        openssl-libs \
+    && tdnf clean all --releasever=3.0 --installroot /staging
+
+# Generate RPM manifest file by appending to the original manifest file from base distroless image
+COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest
+RUN tmpManifestPath="/tmp/rpmmanifest" \
+    && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \
+    && mkdir --parents /staging/var/lib/rpmmanifest \
+    # Remove duplicates that match on the first field (package name)
+    && tac $tmpManifestPath | gawk '!x[$1]++' | sort > /staging/var/lib/rpmmanifest/container-manifest-2
+
+# Create a non-root user and group
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        --create-home \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/staging/home/app" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/staging/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/staging/etc/group"
+
+# Clean up staging
+RUN rm -rf \
+        /staging/etc/tdnf \
+        /staging/run/* \
+        /staging/var/cache/tdnf \
+        /staging/var/lib/rpm \
+        /staging/usr/share/doc \
+        /staging/usr/share/man \
+    && find /staging/var/log -type f -size +0 -delete
+
+
+# .NET runtime-deps image
+FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+COPY --from=installer /staging/ /
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=installer --chown=1654:1654 /staging/home/app /home/app
+
+USER $APP_UID
diff --git a/src/runtime-deps/11.0/azurelinux3.0/amd64/Dockerfile b/src/runtime-deps/11.0/azurelinux3.0/amd64/Dockerfile
new file mode 100644
index 0000000000..4adeda9e8f
--- /dev/null
+++ b/src/runtime-deps/11.0/azurelinux3.0/amd64/Dockerfile
@@ -0,0 +1,36 @@
+FROM mcr.microsoft.com/azurelinux/base/core:3.0
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN tdnf install -y \
+        ca-certificates \
+        \
+        # .NET dependencies
+        glibc \
+        icu \
+        libgcc \
+        libstdc++ \
+        openssl-libs \
+        tzdata \
+    && tdnf clean all
+
+# Create a non-root user and group
+RUN tdnf install -y \
+        shadow-utils \
+    && groupadd \
+        --gid=$APP_UID \
+        app \
+    && useradd --no-log-init \
+        --uid=$APP_UID \
+        --gid=$APP_UID \
+        --create-home \
+        app \
+    && tdnf autoremove -y \
+        shadow-utils \
+    && tdnf clean all
diff --git a/src/runtime-deps/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/runtime-deps/11.0/azurelinux3.0/arm64v8/Dockerfile
new file mode 100644
index 0000000000..4adeda9e8f
--- /dev/null
+++ b/src/runtime-deps/11.0/azurelinux3.0/arm64v8/Dockerfile
@@ -0,0 +1,36 @@
+FROM mcr.microsoft.com/azurelinux/base/core:3.0
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN tdnf install -y \
+        ca-certificates \
+        \
+        # .NET dependencies
+        glibc \
+        icu \
+        libgcc \
+        libstdc++ \
+        openssl-libs \
+        tzdata \
+    && tdnf clean all
+
+# Create a non-root user and group
+RUN tdnf install -y \
+        shadow-utils \
+    && groupadd \
+        --gid=$APP_UID \
+        app \
+    && useradd --no-log-init \
+        --uid=$APP_UID \
+        --gid=$APP_UID \
+        --create-home \
+        app \
+    && tdnf autoremove -y \
+        shadow-utils \
+    && tdnf clean all
diff --git a/src/runtime-deps/11.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/11.0/noble-chiseled-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..ecd88fc7b9
--- /dev/null
+++ b/src/runtime-deps/11.0/noble-chiseled-extra/amd64/Dockerfile
@@ -0,0 +1,58 @@
+FROM amd64/buildpack-deps:noble-curl AS chisel
+
+RUN apt-get update && apt-get install -y file
+
+RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \
+    && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \
+    && echo "$chisel_sha384  chisel.tar.gz" | sha384sum -c - \
+    && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \
+    && rm chisel.tar.gz \
+    && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \
+    && chmod 755 /usr/bin/chisel-wrapper
+
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/rootfs/home/app" \
+    && mkdir --parents "/rootfs/etc" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/rootfs/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/rootfs/etc/group"
+
+RUN mkdir --parents /rootfs/var/lib/dpkg/ \
+    && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
+        --release ubuntu-24.04 --root /rootfs \
+            base-files_base \
+            base-files_chisel \
+            base-files_release-info \
+            ca-certificates_data \
+            libc6_libs \
+            libgcc-s1_libs \
+            libicu74_libs \
+            libssl3t64_libs \
+            libstdc++6_libs \
+            tzdata-legacy_zoneinfo \
+            tzdata_zoneinfo
+
+
+FROM scratch
+
+COPY --from=chisel /rootfs /
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=chisel --chown=$APP_UID:$APP_UID /rootfs/home/app /home/app
+
+USER $APP_UID
diff --git a/src/runtime-deps/11.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/runtime-deps/11.0/noble-chiseled-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..d976820ebf
--- /dev/null
+++ b/src/runtime-deps/11.0/noble-chiseled-extra/arm32v7/Dockerfile
@@ -0,0 +1,58 @@
+FROM arm32v7/buildpack-deps:noble-curl AS chisel
+
+RUN apt-get update && apt-get install -y file
+
+RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \
+    && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \
+    && echo "$chisel_sha384  chisel.tar.gz" | sha384sum -c - \
+    && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \
+    && rm chisel.tar.gz \
+    && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \
+    && chmod 755 /usr/bin/chisel-wrapper
+
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/rootfs/home/app" \
+    && mkdir --parents "/rootfs/etc" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/rootfs/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/rootfs/etc/group"
+
+RUN mkdir --parents /rootfs/var/lib/dpkg/ \
+    && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
+        --release ubuntu-24.04 --root /rootfs \
+            base-files_base \
+            base-files_chisel \
+            base-files_release-info \
+            ca-certificates_data \
+            libc6_libs \
+            libgcc-s1_libs \
+            libicu74_libs \
+            libssl3t64_libs \
+            libstdc++6_libs \
+            tzdata-legacy_zoneinfo \
+            tzdata_zoneinfo
+
+
+FROM scratch
+
+COPY --from=chisel /rootfs /
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=chisel --chown=$APP_UID:$APP_UID /rootfs/home/app /home/app
+
+USER $APP_UID
diff --git a/src/runtime-deps/11.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/11.0/noble-chiseled-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..4f29219fe8
--- /dev/null
+++ b/src/runtime-deps/11.0/noble-chiseled-extra/arm64v8/Dockerfile
@@ -0,0 +1,58 @@
+FROM arm64v8/buildpack-deps:noble-curl AS chisel
+
+RUN apt-get update && apt-get install -y file
+
+RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \
+    && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \
+    && echo "$chisel_sha384  chisel.tar.gz" | sha384sum -c - \
+    && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \
+    && rm chisel.tar.gz \
+    && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \
+    && chmod 755 /usr/bin/chisel-wrapper
+
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/rootfs/home/app" \
+    && mkdir --parents "/rootfs/etc" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/rootfs/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/rootfs/etc/group"
+
+RUN mkdir --parents /rootfs/var/lib/dpkg/ \
+    && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
+        --release ubuntu-24.04 --root /rootfs \
+            base-files_base \
+            base-files_chisel \
+            base-files_release-info \
+            ca-certificates_data \
+            libc6_libs \
+            libgcc-s1_libs \
+            libicu74_libs \
+            libssl3t64_libs \
+            libstdc++6_libs \
+            tzdata-legacy_zoneinfo \
+            tzdata_zoneinfo
+
+
+FROM scratch
+
+COPY --from=chisel /rootfs /
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=chisel --chown=$APP_UID:$APP_UID /rootfs/home/app /home/app
+
+USER $APP_UID
diff --git a/src/runtime-deps/11.0/noble-chiseled/amd64/Dockerfile b/src/runtime-deps/11.0/noble-chiseled/amd64/Dockerfile
new file mode 100644
index 0000000000..87acfe8b95
--- /dev/null
+++ b/src/runtime-deps/11.0/noble-chiseled/amd64/Dockerfile
@@ -0,0 +1,57 @@
+FROM amd64/buildpack-deps:noble-curl AS chisel
+
+RUN apt-get update && apt-get install -y file
+
+RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \
+    && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \
+    && echo "$chisel_sha384  chisel.tar.gz" | sha384sum -c - \
+    && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \
+    && rm chisel.tar.gz \
+    && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \
+    && chmod 755 /usr/bin/chisel-wrapper
+
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/rootfs/home/app" \
+    && mkdir --parents "/rootfs/etc" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/rootfs/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/rootfs/etc/group"
+
+RUN mkdir --parents /rootfs/var/lib/dpkg/ \
+    && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
+        --release ubuntu-24.04 --root /rootfs \
+            base-files_base \
+            base-files_chisel \
+            base-files_release-info \
+            ca-certificates_data \
+            libc6_libs \
+            libgcc-s1_libs \
+            libssl3t64_libs \
+            libstdc++6_libs
+
+
+FROM scratch
+
+COPY --from=chisel /rootfs /
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=chisel --chown=$APP_UID:$APP_UID /rootfs/home/app /home/app
+
+USER $APP_UID
diff --git a/src/runtime-deps/11.0/noble-chiseled/arm32v7/Dockerfile b/src/runtime-deps/11.0/noble-chiseled/arm32v7/Dockerfile
new file mode 100644
index 0000000000..2be7ef5c00
--- /dev/null
+++ b/src/runtime-deps/11.0/noble-chiseled/arm32v7/Dockerfile
@@ -0,0 +1,57 @@
+FROM arm32v7/buildpack-deps:noble-curl AS chisel
+
+RUN apt-get update && apt-get install -y file
+
+RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \
+    && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \
+    && echo "$chisel_sha384  chisel.tar.gz" | sha384sum -c - \
+    && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \
+    && rm chisel.tar.gz \
+    && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \
+    && chmod 755 /usr/bin/chisel-wrapper
+
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/rootfs/home/app" \
+    && mkdir --parents "/rootfs/etc" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/rootfs/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/rootfs/etc/group"
+
+RUN mkdir --parents /rootfs/var/lib/dpkg/ \
+    && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
+        --release ubuntu-24.04 --root /rootfs \
+            base-files_base \
+            base-files_chisel \
+            base-files_release-info \
+            ca-certificates_data \
+            libc6_libs \
+            libgcc-s1_libs \
+            libssl3t64_libs \
+            libstdc++6_libs
+
+
+FROM scratch
+
+COPY --from=chisel /rootfs /
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=chisel --chown=$APP_UID:$APP_UID /rootfs/home/app /home/app
+
+USER $APP_UID
diff --git a/src/runtime-deps/11.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime-deps/11.0/noble-chiseled/arm64v8/Dockerfile
new file mode 100644
index 0000000000..89c07ffc2a
--- /dev/null
+++ b/src/runtime-deps/11.0/noble-chiseled/arm64v8/Dockerfile
@@ -0,0 +1,57 @@
+FROM arm64v8/buildpack-deps:noble-curl AS chisel
+
+RUN apt-get update && apt-get install -y file
+
+RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \
+    && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \
+    && echo "$chisel_sha384  chisel.tar.gz" | sha384sum -c - \
+    && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \
+    && rm chisel.tar.gz \
+    && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v1.2.0/chisel-wrapper \
+    && chmod 755 /usr/bin/chisel-wrapper
+
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/rootfs/home/app" \
+    && mkdir --parents "/rootfs/etc" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/rootfs/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/rootfs/etc/group"
+
+RUN mkdir --parents /rootfs/var/lib/dpkg/ \
+    && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
+        --release ubuntu-24.04 --root /rootfs \
+            base-files_base \
+            base-files_chisel \
+            base-files_release-info \
+            ca-certificates_data \
+            libc6_libs \
+            libgcc-s1_libs \
+            libssl3t64_libs \
+            libstdc++6_libs
+
+
+FROM scratch
+
+COPY --from=chisel /rootfs /
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=chisel --chown=$APP_UID:$APP_UID /rootfs/home/app /home/app
+
+USER $APP_UID
diff --git a/src/runtime-deps/11.0/noble/amd64/Dockerfile b/src/runtime-deps/11.0/noble/amd64/Dockerfile
new file mode 100644
index 0000000000..1be9446078
--- /dev/null
+++ b/src/runtime-deps/11.0/noble/amd64/Dockerfile
@@ -0,0 +1,33 @@
+FROM ubuntu.azurecr.io/ubuntu:noble
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        ca-certificates \
+        \
+        # .NET dependencies
+        libc6 \
+        libgcc-s1 \
+        libicu74 \
+        libssl3t64 \
+        libstdc++6 \
+        tzdata \
+        tzdata-legacy \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create a non-root user and group
+RUN groupadd \
+        --gid=$APP_UID \
+        app \
+    && useradd --no-log-init \
+        --uid=$APP_UID \
+        --gid=$APP_UID \
+        --create-home \
+        app
diff --git a/src/runtime-deps/11.0/noble/arm32v7/Dockerfile b/src/runtime-deps/11.0/noble/arm32v7/Dockerfile
new file mode 100644
index 0000000000..1be9446078
--- /dev/null
+++ b/src/runtime-deps/11.0/noble/arm32v7/Dockerfile
@@ -0,0 +1,33 @@
+FROM ubuntu.azurecr.io/ubuntu:noble
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        ca-certificates \
+        \
+        # .NET dependencies
+        libc6 \
+        libgcc-s1 \
+        libicu74 \
+        libssl3t64 \
+        libstdc++6 \
+        tzdata \
+        tzdata-legacy \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create a non-root user and group
+RUN groupadd \
+        --gid=$APP_UID \
+        app \
+    && useradd --no-log-init \
+        --uid=$APP_UID \
+        --gid=$APP_UID \
+        --create-home \
+        app
diff --git a/src/runtime-deps/11.0/noble/arm64v8/Dockerfile b/src/runtime-deps/11.0/noble/arm64v8/Dockerfile
new file mode 100644
index 0000000000..1be9446078
--- /dev/null
+++ b/src/runtime-deps/11.0/noble/arm64v8/Dockerfile
@@ -0,0 +1,33 @@
+FROM ubuntu.azurecr.io/ubuntu:noble
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        ca-certificates \
+        \
+        # .NET dependencies
+        libc6 \
+        libgcc-s1 \
+        libicu74 \
+        libssl3t64 \
+        libstdc++6 \
+        tzdata \
+        tzdata-legacy \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create a non-root user and group
+RUN groupadd \
+        --gid=$APP_UID \
+        app \
+    && useradd --no-log-init \
+        --uid=$APP_UID \
+        --gid=$APP_UID \
+        --create-home \
+        app
diff --git a/src/runtime/11.0/alpine3.22/amd64/Dockerfile b/src/runtime/11.0/alpine3.22/amd64/Dockerfile
new file mode 100644
index 0000000000..8111f6f8e5
--- /dev/null
+++ b/src/runtime/11.0/alpine3.22/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/alpine3.22/arm32v7/Dockerfile b/src/runtime/11.0/alpine3.22/arm32v7/Dockerfile
new file mode 100644
index 0000000000..e610f56d37
--- /dev/null
+++ b/src/runtime/11.0/alpine3.22/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/alpine3.22/arm64v8/Dockerfile b/src/runtime/11.0/alpine3.22/arm64v8/Dockerfile
new file mode 100644
index 0000000000..9f9e08b3b7
--- /dev/null
+++ b/src/runtime/11.0/alpine3.22/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/alpine3.23/amd64/Dockerfile b/src/runtime/11.0/alpine3.23/amd64/Dockerfile
new file mode 100644
index 0000000000..05714828bc
--- /dev/null
+++ b/src/runtime/11.0/alpine3.23/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile b/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile
new file mode 100644
index 0000000000..fcf8491a8c
--- /dev/null
+++ b/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile b/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile
new file mode 100644
index 0000000000..3353b66c1a
--- /dev/null
+++ b/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && wget \
+        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..9599522a1f
--- /dev/null
+++ b/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
@@ -0,0 +1,38 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..c370555fba
--- /dev/null
+++ b/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
@@ -0,0 +1,38 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile
new file mode 100644
index 0000000000..480c382ed9
--- /dev/null
+++ b/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile
@@ -0,0 +1,38 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
new file mode 100644
index 0000000000..b23299420f
--- /dev/null
+++ b/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
@@ -0,0 +1,38 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile b/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile
new file mode 100644
index 0000000000..689b7c9d8b
--- /dev/null
+++ b/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile
@@ -0,0 +1,31 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-amd64 AS installer
+
+RUN tdnf install -y \
+        tar \
+    && tdnf clean all
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile
new file mode 100644
index 0000000000..fece9dfbbc
--- /dev/null
+++ b/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile
@@ -0,0 +1,31 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8 AS installer
+
+RUN tdnf install -y \
+        tar \
+    && tdnf clean all
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile
new file mode 100644
index 0000000000..a3578b4629
--- /dev/null
+++ b/src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile
@@ -0,0 +1,46 @@
+# escape=`
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $dotnet_version = '11.0.0-preview.1.00000.1'; `
+        $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_version/$dotnet_sha512_file; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file
+
+
+# Runtime image
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022-amd64
+
+ENV `
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 `
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true `
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+# In order to set system PATH, ContainerAdministrator must be used
+USER ContainerAdministrator
+RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
+USER ContainerUser
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
diff --git a/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile
new file mode 100644
index 0000000000..06d1812249
--- /dev/null
+++ b/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -0,0 +1,46 @@
+# escape=`
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2025-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $dotnet_version = '11.0.0-preview.1.00000.1'; `
+        $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_version/$dotnet_sha512_file; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file
+
+
+# Runtime image
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025-amd64
+
+ENV `
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 `
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true `
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+# In order to set system PATH, ContainerAdministrator must be used
+USER ContainerAdministrator
+RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
+USER ContainerUser
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
diff --git a/src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..81ed4066c7
--- /dev/null
+++ b/src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile
@@ -0,0 +1,32 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..73a8861df0
--- /dev/null
+++ b/src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile
@@ -0,0 +1,32 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..00911ed70a
--- /dev/null
+++ b/src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile
@@ -0,0 +1,32 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/runtime/11.0/noble-chiseled/amd64/Dockerfile b/src/runtime/11.0/noble-chiseled/amd64/Dockerfile
new file mode 100644
index 0000000000..1b64563f31
--- /dev/null
+++ b/src/runtime/11.0/noble-chiseled/amd64/Dockerfile
@@ -0,0 +1,32 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile b/src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile
new file mode 100644
index 0000000000..07a8921497
--- /dev/null
+++ b/src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile
@@ -0,0 +1,32 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile
new file mode 100644
index 0000000000..c8caae1e11
--- /dev/null
+++ b/src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile
@@ -0,0 +1,32 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/src/runtime/11.0/noble/amd64/Dockerfile b/src/runtime/11.0/noble/amd64/Dockerfile
new file mode 100644
index 0000000000..bce1833cfa
--- /dev/null
+++ b/src/runtime/11.0/noble/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/noble/arm32v7/Dockerfile b/src/runtime/11.0/noble/arm32v7/Dockerfile
new file mode 100644
index 0000000000..65eb6d8d08
--- /dev/null
+++ b/src/runtime/11.0/noble/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/noble/arm64v8/Dockerfile b/src/runtime/11.0/noble/arm64v8/Dockerfile
new file mode 100644
index 0000000000..2ee4e20b5b
--- /dev/null
+++ b/src/runtime/11.0/noble/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.1.00000.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
new file mode 100644
index 0000000000..cbcb10f6e6
--- /dev/null
+++ b/src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
@@ -0,0 +1,43 @@
+# escape=`
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $dotnet_version = '11.0.0-preview.1.00000.1'; `
+        $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_version/$dotnet_sha512_file; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file
+
+
+# Runtime image
+FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64
+
+ENV `
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 `
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true `
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
diff --git a/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
new file mode 100644
index 0000000000..57cd4bb2e0
--- /dev/null
+++ b/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -0,0 +1,43 @@
+# escape=`
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2025-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $dotnet_version = '11.0.0-preview.1.00000.1'; `
+        $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_version/$dotnet_sha512_file; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file
+
+
+# Runtime image
+FROM mcr.microsoft.com/windows/servercore:ltsc2025-amd64
+
+ENV `
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 `
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true `
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.1.00000.1
+
+RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
diff --git a/src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile b/src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile
new file mode 100644
index 0000000000..1b912db318
--- /dev/null
+++ b/src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile
@@ -0,0 +1,8 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:11.0.100-preview.1-alpine3.22-amd64
+
+RUN apk add --upgrade --no-cache \
+        build-base \
+        clang \
+        zlib-dev
diff --git a/src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile
new file mode 100644
index 0000000000..2cfdc7285c
--- /dev/null
+++ b/src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile
@@ -0,0 +1,8 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:11.0.100-preview.1-alpine3.22-arm64v8
+
+RUN apk add --upgrade --no-cache \
+        build-base \
+        clang \
+        zlib-dev
diff --git a/src/sdk/11.0/alpine3.22/amd64/Dockerfile b/src/sdk/11.0/alpine3.22/amd64/Dockerfile
new file mode 100644
index 0000000000..05139089c4
--- /dev/null
+++ b/src/sdk/11.0/alpine3.22/amd64/Dockerfile
@@ -0,0 +1,67 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=11.0.100-preview.1 \
+    && wget \
+        https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    # Disable the invariant mode (set in base image)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.22 \
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=7.6.0-preview.4 \
+    && wget --output-document PowerShell.Linux.Alpine.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.Alpine.$powershell_version.nupkg \
+    && powershell_sha512='d0b0e5822a49371f632605a087aed11e71943899c7e910ba510dd848270e56b449b02d425f23333139054ae37f298241c071ca15a77c945af7d4d39c15ac74a6' \
+    && echo "$powershell_sha512  PowerShell.Linux.Alpine.$powershell_version.nupkg" | sha512sum -c - \
+    && mkdir --parents /usr/share/powershell \
+    && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.Alpine \
+    && dotnet nuget locals all --clear \
+    && rm PowerShell.Linux.Alpine.$powershell_version.nupkg \
+    && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \
+    && chmod 755 /usr/share/powershell/pwsh \
+    # To reduce image size, remove the copy nupkg that nuget keeps.
+    && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm \
+    # Add ncurses-terminfo-base to resolve psreadline dependency
+    && apk add --no-cache ncurses-terminfo-base
diff --git a/src/sdk/11.0/alpine3.22/arm32v7/Dockerfile b/src/sdk/11.0/alpine3.22/arm32v7/Dockerfile
new file mode 100644
index 0000000000..9ee9ea28c5
--- /dev/null
+++ b/src/sdk/11.0/alpine3.22/arm32v7/Dockerfile
@@ -0,0 +1,47 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=11.0.100-preview.1 \
+    && wget \
+        https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    # Disable the invariant mode (set in base image)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip 
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
diff --git a/src/sdk/11.0/alpine3.22/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.22/arm64v8/Dockerfile
new file mode 100644
index 0000000000..cd6362a80e
--- /dev/null
+++ b/src/sdk/11.0/alpine3.22/arm64v8/Dockerfile
@@ -0,0 +1,47 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=11.0.100-preview.1 \
+    && wget \
+        https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    # Disable the invariant mode (set in base image)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip 
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
diff --git a/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile b/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile
new file mode 100644
index 0000000000..944fd94369
--- /dev/null
+++ b/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile
@@ -0,0 +1,8 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:11.0.100-preview.1-alpine3.23-amd64
+
+RUN apk add --upgrade --no-cache \
+        build-base \
+        clang \
+        zlib-dev
diff --git a/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile
new file mode 100644
index 0000000000..022526a3c2
--- /dev/null
+++ b/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile
@@ -0,0 +1,8 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:11.0.100-preview.1-alpine3.23-arm64v8
+
+RUN apk add --upgrade --no-cache \
+        build-base \
+        clang \
+        zlib-dev
diff --git a/src/sdk/11.0/alpine3.23/amd64/Dockerfile b/src/sdk/11.0/alpine3.23/amd64/Dockerfile
new file mode 100644
index 0000000000..7e019c4586
--- /dev/null
+++ b/src/sdk/11.0/alpine3.23/amd64/Dockerfile
@@ -0,0 +1,67 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=11.0.100-preview.1 \
+    && wget \
+        https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    # Disable the invariant mode (set in base image)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.23 \
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=7.6.0-preview.4 \
+    && wget --output-document PowerShell.Linux.Alpine.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.Alpine.$powershell_version.nupkg \
+    && powershell_sha512='d0b0e5822a49371f632605a087aed11e71943899c7e910ba510dd848270e56b449b02d425f23333139054ae37f298241c071ca15a77c945af7d4d39c15ac74a6' \
+    && echo "$powershell_sha512  PowerShell.Linux.Alpine.$powershell_version.nupkg" | sha512sum -c - \
+    && mkdir --parents /usr/share/powershell \
+    && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.Alpine \
+    && dotnet nuget locals all --clear \
+    && rm PowerShell.Linux.Alpine.$powershell_version.nupkg \
+    && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \
+    && chmod 755 /usr/share/powershell/pwsh \
+    # To reduce image size, remove the copy nupkg that nuget keeps.
+    && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm \
+    # Add ncurses-terminfo-base to resolve psreadline dependency
+    && apk add --no-cache ncurses-terminfo-base
diff --git a/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile b/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile
new file mode 100644
index 0000000000..81eb2ea70e
--- /dev/null
+++ b/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile
@@ -0,0 +1,47 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=11.0.100-preview.1 \
+    && wget \
+        https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    # Disable the invariant mode (set in base image)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip 
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
diff --git a/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile
new file mode 100644
index 0000000000..71bb3b0b22
--- /dev/null
+++ b/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile
@@ -0,0 +1,47 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=11.0.100-preview.1 \
+    && wget \
+        https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    # Disable the invariant mode (set in base image)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip 
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
diff --git a/src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile b/src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile
new file mode 100644
index 0000000000..daa777a711
--- /dev/null
+++ b/src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile
@@ -0,0 +1,9 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:11.0.100-preview.1-azurelinux3.0-amd64
+
+RUN tdnf install -y \
+        build-essential \
+        clang \
+        zlib-devel \
+    && tdnf clean all
diff --git a/src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile b/src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile
new file mode 100644
index 0000000000..6c42369005
--- /dev/null
+++ b/src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile
@@ -0,0 +1,9 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:11.0.100-preview.1-azurelinux3.0-arm64v8
+
+RUN tdnf install -y \
+        build-essential \
+        clang \
+        zlib-devel \
+    && tdnf clean all
diff --git a/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile b/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile
new file mode 100644
index 0000000000..b60866a97d
--- /dev/null
+++ b/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile
@@ -0,0 +1,65 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-amd64 AS installer
+
+RUN tdnf install -y \
+        tar \
+    && tdnf clean all
+
+# Install .NET SDK
+RUN dotnet_sdk_version=11.0.100-preview.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-amd64
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0 \
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN tdnf install -y \
+        git \
+        libgcc-atomic \
+        tar \
+    && tdnf clean all
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=7.6.0-preview.4 \
+    && curl --fail --show-error --location --output PowerShell.Linux.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.x64.$powershell_version.nupkg \
+    && powershell_sha512='92ba2a8344f13d1c640f73d61488a582bae3ea82e4d00aad02efece3475f852855fb6f8ac37f72b4a14cdc1975af9f253d59ce72e36f3653e6b1ee87dc273f8f' \
+    && echo "$powershell_sha512  PowerShell.Linux.x64.$powershell_version.nupkg" | sha512sum -c - \
+    && mkdir --parents /usr/share/powershell \
+    && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.x64 \
+    && dotnet nuget locals all --clear \
+    && rm PowerShell.Linux.x64.$powershell_version.nupkg \
+    && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \
+    && chmod 755 /usr/share/powershell/pwsh \
+    # To reduce image size, remove the copy nupkg that nuget keeps.
+    && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm
diff --git a/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile
new file mode 100644
index 0000000000..ebee18a412
--- /dev/null
+++ b/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile
@@ -0,0 +1,65 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8 AS installer
+
+RUN tdnf install -y \
+        tar \
+    && tdnf clean all
+
+# Install .NET SDK
+RUN dotnet_sdk_version=11.0.100-preview.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0-arm64 \
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN tdnf install -y \
+        git \
+        libgcc-atomic \
+        tar \
+    && tdnf clean all
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=7.6.0-preview.4 \
+    && curl --fail --show-error --location --output PowerShell.Linux.arm64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm64.$powershell_version.nupkg \
+    && powershell_sha512='265519a89209f8c0c6c736f3a0d92d97468ee5ddfc245c9ed24ec8ebe13826f15b6d3a879ce6e4274c17091d38811c91b2e5acf8ec4d2202d9b0d1176a28c710' \
+    && echo "$powershell_sha512  PowerShell.Linux.arm64.$powershell_version.nupkg" | sha512sum -c - \
+    && mkdir --parents /usr/share/powershell \
+    && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm64 \
+    && dotnet nuget locals all --clear \
+    && rm PowerShell.Linux.arm64.$powershell_version.nupkg \
+    && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \
+    && chmod 755 /usr/share/powershell/pwsh \
+    # To reduce image size, remove the copy nupkg that nuget keeps.
+    && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm
diff --git a/src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile
new file mode 100644
index 0000000000..471c727f6a
--- /dev/null
+++ b/src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile
@@ -0,0 +1,95 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
+
+# Download MinGit
+RUN powershell -Command " `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; `
+        $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; `
+        if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        mkdir MinGit; `
+        tar --gzip --extract --no-same-owner --file mingit.zip --directory MinGit; `
+        Remove-Item -Force mingit.zip"
+
+RUN powershell -Command " `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        # Retrieve .NET SDK
+        $dotnet_sdk_version = '11.0.100-preview.1'; `
+        $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file; `
+        `
+        # Install PowerShell global tool
+        $powershell_version = '7.6.0-preview.4'; `
+        Invoke-WebRequest -OutFile PowerShell.Windows.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Windows.x64.$powershell_version.nupkg; `
+        $powershell_sha512 = 'a529408a93ca2be753d84137bff8ed95dc9301faf2da62fbd9d7bfb29fe502bfca9427736b1004884e839e3f2585ac613349f0fbbb97ea6f979b115dcf06aa0c'; `
+        if ((Get-FileHash PowerShell.Windows.x64.$powershell_version.nupkg -Algorithm sha512).Hash -ne $powershell_sha512) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        & \dotnet\dotnet tool install --add-source . --tool-path \powershell --version $powershell_version PowerShell.Windows.x64; `
+        & \dotnet\dotnet nuget locals all --clear; `
+        Remove-Item -Force PowerShell.Windows.x64.$powershell_version.nupkg; `
+        Remove-Item -Path \powershell\.store\powershell.windows.x64\$powershell_version\powershell.windows.x64\$powershell_version\powershell.windows.x64.$powershell_version.nupkg -Force; `
+        `
+        # Delete everything in the dotnet folder that's not needed in the SDK layer but will instead be derived from base layers
+        Get-ChildItem -Exclude 'dnx.cmd','dnx.ps1','LICENSE.txt','ThirdPartyNotices.txt','packs','sdk','sdk-manifests','templates','shared' -Path dotnet `
+            | Remove-Item -Force -Recurse; `
+        Get-ChildItem -Exclude 'Microsoft.WindowsDesktop.App' -Path dotnet\shared `
+            | Remove-Item -Force -Recurse"
+
+
+# SDK image
+FROM $REPO:11.0.0-preview.1.00000.1-nanoserver-ltsc2022
+
+ENV `
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false `
+    # Do not show first run text
+    DOTNET_NOLOGO=true `
+    # SDK version
+    DOTNET_SDK_VERSION=11.0.100-preview.1 `
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true `
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip `
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2022 `
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+# In order to set system PATH, ContainerAdministrator must be used
+USER ContainerAdministrator
+RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd"
+USER ContainerUser
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
+COPY --from=installer ["/powershell", "/Program Files/powershell"]
+COPY --from=installer ["/MinGit", "/Program Files/MinGit"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile
new file mode 100644
index 0000000000..3b72439b6c
--- /dev/null
+++ b/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -0,0 +1,95 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2025-amd64 AS installer
+
+# Download MinGit
+RUN powershell -Command " `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; `
+        $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; `
+        if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        mkdir MinGit; `
+        tar --gzip --extract --no-same-owner --file mingit.zip --directory MinGit; `
+        Remove-Item -Force mingit.zip"
+
+RUN powershell -Command " `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        # Retrieve .NET SDK
+        $dotnet_sdk_version = '11.0.100-preview.1'; `
+        $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file; `
+        `
+        # Install PowerShell global tool
+        $powershell_version = '7.6.0-preview.4'; `
+        Invoke-WebRequest -OutFile PowerShell.Windows.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Windows.x64.$powershell_version.nupkg; `
+        $powershell_sha512 = 'a529408a93ca2be753d84137bff8ed95dc9301faf2da62fbd9d7bfb29fe502bfca9427736b1004884e839e3f2585ac613349f0fbbb97ea6f979b115dcf06aa0c'; `
+        if ((Get-FileHash PowerShell.Windows.x64.$powershell_version.nupkg -Algorithm sha512).Hash -ne $powershell_sha512) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        & \dotnet\dotnet tool install --add-source . --tool-path \powershell --version $powershell_version PowerShell.Windows.x64; `
+        & \dotnet\dotnet nuget locals all --clear; `
+        Remove-Item -Force PowerShell.Windows.x64.$powershell_version.nupkg; `
+        Remove-Item -Path \powershell\.store\powershell.windows.x64\$powershell_version\powershell.windows.x64\$powershell_version\powershell.windows.x64.$powershell_version.nupkg -Force; `
+        `
+        # Delete everything in the dotnet folder that's not needed in the SDK layer but will instead be derived from base layers
+        Get-ChildItem -Exclude 'dnx.cmd','dnx.ps1','LICENSE.txt','ThirdPartyNotices.txt','packs','sdk','sdk-manifests','templates','shared' -Path dotnet `
+            | Remove-Item -Force -Recurse; `
+        Get-ChildItem -Exclude 'Microsoft.WindowsDesktop.App' -Path dotnet\shared `
+            | Remove-Item -Force -Recurse"
+
+
+# SDK image
+FROM $REPO:11.0.0-preview.1.00000.1-nanoserver-ltsc2025
+
+ENV `
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false `
+    # Do not show first run text
+    DOTNET_NOLOGO=true `
+    # SDK version
+    DOTNET_SDK_VERSION=11.0.100-preview.1 `
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true `
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip `
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2025 `
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+# In order to set system PATH, ContainerAdministrator must be used
+USER ContainerAdministrator
+RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd"
+USER ContainerUser
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
+COPY --from=installer ["/powershell", "/Program Files/powershell"]
+COPY --from=installer ["/MinGit", "/Program Files/MinGit"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/src/sdk/11.0/noble-aot/amd64/Dockerfile b/src/sdk/11.0/noble-aot/amd64/Dockerfile
new file mode 100644
index 0000000000..ad92933845
--- /dev/null
+++ b/src/sdk/11.0/noble-aot/amd64/Dockerfile
@@ -0,0 +1,10 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:11.0.100-preview.1-noble-amd64
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        clang \
+        llvm \
+        zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
diff --git a/src/sdk/11.0/noble-aot/arm64v8/Dockerfile b/src/sdk/11.0/noble-aot/arm64v8/Dockerfile
new file mode 100644
index 0000000000..6198ab4091
--- /dev/null
+++ b/src/sdk/11.0/noble-aot/arm64v8/Dockerfile
@@ -0,0 +1,10 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:11.0.100-preview.1-noble-arm64v8
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        clang \
+        llvm \
+        zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
diff --git a/src/sdk/11.0/noble/amd64/Dockerfile b/src/sdk/11.0/noble/amd64/Dockerfile
new file mode 100644
index 0000000000..cf961ba65d
--- /dev/null
+++ b/src/sdk/11.0/noble/amd64/Dockerfile
@@ -0,0 +1,63 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=11.0.100-preview.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-amd64
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04 \
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        curl \
+        git \
+        libatomic1 \
+        wget \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=7.6.0-preview.4 \
+    && curl --fail --show-error --location --output PowerShell.Linux.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.x64.$powershell_version.nupkg \
+    && powershell_sha512='92ba2a8344f13d1c640f73d61488a582bae3ea82e4d00aad02efece3475f852855fb6f8ac37f72b4a14cdc1975af9f253d59ce72e36f3653e6b1ee87dc273f8f' \
+    && echo "$powershell_sha512  PowerShell.Linux.x64.$powershell_version.nupkg" | sha512sum -c - \
+    && mkdir --parents /usr/share/powershell \
+    && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.x64 \
+    && dotnet nuget locals all --clear \
+    && rm PowerShell.Linux.x64.$powershell_version.nupkg \
+    && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \
+    && chmod 755 /usr/share/powershell/pwsh \
+    # To reduce image size, remove the copy nupkg that nuget keeps.
+    && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm
diff --git a/src/sdk/11.0/noble/arm32v7/Dockerfile b/src/sdk/11.0/noble/arm32v7/Dockerfile
new file mode 100644
index 0000000000..c5f07ecb62
--- /dev/null
+++ b/src/sdk/11.0/noble/arm32v7/Dockerfile
@@ -0,0 +1,63 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=11.0.100-preview.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-arm32v7
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm32 \
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        curl \
+        git \
+        libatomic1 \
+        wget \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=7.6.0-preview.4 \
+    && curl --fail --show-error --location --output PowerShell.Linux.arm32.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm32.$powershell_version.nupkg \
+    && powershell_sha512='32e410abb44dcd6ba943fa8c7367a88a6c0c4e3ac0a67756fb5919139c980f1a3d66a3b055e6b2292a154c9eede22003b0b85605c101e3e6fa89fd71b7d44a7f' \
+    && echo "$powershell_sha512  PowerShell.Linux.arm32.$powershell_version.nupkg" | sha512sum -c - \
+    && mkdir --parents /usr/share/powershell \
+    && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm32 \
+    && dotnet nuget locals all --clear \
+    && rm PowerShell.Linux.arm32.$powershell_version.nupkg \
+    && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \
+    && chmod 755 /usr/share/powershell/pwsh \
+    # To reduce image size, remove the copy nupkg that nuget keeps.
+    && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm
diff --git a/src/sdk/11.0/noble/arm64v8/Dockerfile b/src/sdk/11.0/noble/arm64v8/Dockerfile
new file mode 100644
index 0000000000..3d834e70fb
--- /dev/null
+++ b/src/sdk/11.0/noble/arm64v8/Dockerfile
@@ -0,0 +1,63 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=11.0.100-preview.1 \
+    && curl --fail --show-error --location \
+        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:11.0.0-preview.1.00000.1-noble-arm64v8
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm64 \
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        curl \
+        git \
+        libatomic1 \
+        wget \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=7.6.0-preview.4 \
+    && curl --fail --show-error --location --output PowerShell.Linux.arm64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm64.$powershell_version.nupkg \
+    && powershell_sha512='265519a89209f8c0c6c736f3a0d92d97468ee5ddfc245c9ed24ec8ebe13826f15b6d3a879ce6e4274c17091d38811c91b2e5acf8ec4d2202d9b0d1176a28c710' \
+    && echo "$powershell_sha512  PowerShell.Linux.arm64.$powershell_version.nupkg" | sha512sum -c - \
+    && mkdir --parents /usr/share/powershell \
+    && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm64 \
+    && dotnet nuget locals all --clear \
+    && rm PowerShell.Linux.arm64.$powershell_version.nupkg \
+    && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \
+    && chmod 755 /usr/share/powershell/pwsh \
+    # To reduce image size, remove the copy nupkg that nuget keeps.
+    && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm
diff --git a/src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
new file mode 100644
index 0000000000..c12b8badbe
--- /dev/null
+++ b/src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
@@ -0,0 +1,92 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
+
+# Download MinGit
+RUN powershell -Command " `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; `
+        $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; `
+        if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        mkdir MinGit; `
+        tar --gzip --extract --no-same-owner --file mingit.zip --directory MinGit; `
+        Remove-Item -Force mingit.zip"
+
+RUN powershell -Command " `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        # Retrieve .NET SDK
+        $dotnet_sdk_version = '11.0.100-preview.1'; `
+        $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file; `
+        `
+        # Install PowerShell global tool
+        $powershell_version = '7.6.0-preview.4'; `
+        Invoke-WebRequest -OutFile PowerShell.Windows.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Windows.x64.$powershell_version.nupkg; `
+        $powershell_sha512 = 'a529408a93ca2be753d84137bff8ed95dc9301faf2da62fbd9d7bfb29fe502bfca9427736b1004884e839e3f2585ac613349f0fbbb97ea6f979b115dcf06aa0c'; `
+        if ((Get-FileHash PowerShell.Windows.x64.$powershell_version.nupkg -Algorithm sha512).Hash -ne $powershell_sha512) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        & \dotnet\dotnet tool install --add-source . --tool-path \powershell --version $powershell_version PowerShell.Windows.x64; `
+        & \dotnet\dotnet nuget locals all --clear; `
+        Remove-Item -Force PowerShell.Windows.x64.$powershell_version.nupkg; `
+        Remove-Item -Path \powershell\.store\powershell.windows.x64\$powershell_version\powershell.windows.x64\$powershell_version\powershell.windows.x64.$powershell_version.nupkg -Force; `
+        `
+        # Delete everything in the dotnet folder that's not needed in the SDK layer but will instead be derived from base layers
+        Get-ChildItem -Exclude 'dnx.cmd','dnx.ps1','LICENSE.txt','ThirdPartyNotices.txt','packs','sdk','sdk-manifests','templates','shared' -Path dotnet `
+            | Remove-Item -Force -Recurse; `
+        Get-ChildItem -Exclude 'Microsoft.WindowsDesktop.App' -Path dotnet\shared `
+            | Remove-Item -Force -Recurse"
+
+
+# SDK image
+FROM $REPO:11.0.0-preview.1.00000.1-windowsservercore-ltsc2022
+
+ENV `
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false `
+    # Do not show first run text
+    DOTNET_NOLOGO=true `
+    # SDK version
+    DOTNET_SDK_VERSION=11.0.100-preview.1 `
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true `
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip `
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2022 `
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd"
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
+COPY --from=installer ["/powershell", "/Program Files/powershell"]
+COPY --from=installer ["/MinGit", "/Program Files/MinGit"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
new file mode 100644
index 0000000000..e596dcc4d5
--- /dev/null
+++ b/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -0,0 +1,92 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2025-amd64 AS installer
+
+# Download MinGit
+RUN powershell -Command " `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; `
+        $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; `
+        if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        mkdir MinGit; `
+        tar --gzip --extract --no-same-owner --file mingit.zip --directory MinGit; `
+        Remove-Item -Force mingit.zip"
+
+RUN powershell -Command " `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        # Retrieve .NET SDK
+        $dotnet_sdk_version = '11.0.100-preview.1'; `
+        $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file; `
+        `
+        # Install PowerShell global tool
+        $powershell_version = '7.6.0-preview.4'; `
+        Invoke-WebRequest -OutFile PowerShell.Windows.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Windows.x64.$powershell_version.nupkg; `
+        $powershell_sha512 = 'a529408a93ca2be753d84137bff8ed95dc9301faf2da62fbd9d7bfb29fe502bfca9427736b1004884e839e3f2585ac613349f0fbbb97ea6f979b115dcf06aa0c'; `
+        if ((Get-FileHash PowerShell.Windows.x64.$powershell_version.nupkg -Algorithm sha512).Hash -ne $powershell_sha512) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        & \dotnet\dotnet tool install --add-source . --tool-path \powershell --version $powershell_version PowerShell.Windows.x64; `
+        & \dotnet\dotnet nuget locals all --clear; `
+        Remove-Item -Force PowerShell.Windows.x64.$powershell_version.nupkg; `
+        Remove-Item -Path \powershell\.store\powershell.windows.x64\$powershell_version\powershell.windows.x64\$powershell_version\powershell.windows.x64.$powershell_version.nupkg -Force; `
+        `
+        # Delete everything in the dotnet folder that's not needed in the SDK layer but will instead be derived from base layers
+        Get-ChildItem -Exclude 'dnx.cmd','dnx.ps1','LICENSE.txt','ThirdPartyNotices.txt','packs','sdk','sdk-manifests','templates','shared' -Path dotnet `
+            | Remove-Item -Force -Recurse; `
+        Get-ChildItem -Exclude 'Microsoft.WindowsDesktop.App' -Path dotnet\shared `
+            | Remove-Item -Force -Recurse"
+
+
+# SDK image
+FROM $REPO:11.0.0-preview.1.00000.1-windowsservercore-ltsc2025
+
+ENV `
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false `
+    # Do not show first run text
+    DOTNET_NOLOGO=true `
+    # SDK version
+    DOTNET_SDK_VERSION=11.0.100-preview.1 `
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true `
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip `
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2025 `
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd"
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
+COPY --from=installer ["/powershell", "/Program Files/powershell"]
+COPY --from=installer ["/MinGit", "/Program Files/MinGit"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..57cc13e47c
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-amd64-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-alpine3.XX-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..fecc264cad
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..8b582b3053
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..934bed0d0b
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-amd64-Dockerfile.approved.txt
@@ -0,0 +1,31 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-alpine3.XX-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..d4f7e29776
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,31 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..971ff2df28
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,31 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..57cc13e47c
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-alpine3.XX-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..fecc264cad
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..8b582b3053
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..934bed0d0b
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt
@@ -0,0 +1,31 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-alpine3.XX-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..d4f7e29776
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,31 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..971ff2df28
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,31 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..d5dfad3088
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
@@ -0,0 +1,31 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-azurelinux3.0-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-azurelinux3.0-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..c44ba14e88
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,31 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-azurelinux3.0-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-azurelinux3.0-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..7903185595
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-azurelinux3.0-distroless-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..5bf3e8670b
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-azurelinux3.0-distroless-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..a1242a0b86
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt
@@ -0,0 +1,43 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-azurelinux3.0-distroless-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..a2b9dca9fa
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,43 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-azurelinux3.0-distroless-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..8342b60432
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,43 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-azurelinux3.0-distroless-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..c3128df0d3
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,43 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-azurelinux3.0-distroless-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..9e473c85ca
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-azurelinux3.0-distroless-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..55647a6beb
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-azurelinux3.0-distroless-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..055b3dfa1d
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
@@ -0,0 +1,44 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Install ASP.NET Core Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $aspnetcore_version = '0.0.0'; `
+        $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
+        `
+        $Headers = @{ `
+            Authorization = \"Bearer $env:ACCESSTOKEN\"; `
+            'x-ms-version' = '2017-11-09'; `
+        }; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file -Headers $Headers; `
+        `
+        if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $aspnetcore_file --directory dotnet ./shared/Microsoft.AspNetCore.App; `
+        Remove-Item -Force `
+            $aspnetcore_file, `
+            $dotnet_sha512_file
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-nanoserver-ltsc2022
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..c2cb3ef7d3
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
@@ -0,0 +1,44 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2025-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Install ASP.NET Core Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $aspnetcore_version = '0.0.0'; `
+        $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
+        `
+        $Headers = @{ `
+            Authorization = \"Bearer $env:ACCESSTOKEN\"; `
+            'x-ms-version' = '2017-11-09'; `
+        }; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file -Headers $Headers; `
+        `
+        if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $aspnetcore_file --directory dotnet ./shared/Microsoft.AspNetCore.App; `
+        Remove-Item -Force `
+            $aspnetcore_file, `
+            $dotnet_sha512_file
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-nanoserver-ltsc2025
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..8dc91c999a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-amd64-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-noble-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..7a3ff00ae2
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-noble-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..d28739a32d
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-noble-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..d258da52bc
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-noble-chiseled-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..c7f6fb134a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-noble-chiseled-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..2c44a5970a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-noble-chiseled-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..b3c5467a81
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-amd64-Dockerfile.approved.txt
@@ -0,0 +1,37 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-noble-chiseled-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..d47198e5fd
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,37 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-noble-chiseled-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..c3ae522b01
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,37 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-noble-chiseled-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..63ffb52700
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,37 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-noble-chiseled-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..0003363e50
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,37 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-noble-chiseled-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..96f71a926a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,37 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-noble-chiseled-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0 \
+    # ASP.NET Core version
+    ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..e699dbf047
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-noble-chiseled-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..3abf5598f7
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-noble-chiseled-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..b0c49aaffe
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-noble-chiseled-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..7911975006
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
@@ -0,0 +1,44 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Install ASP.NET Core Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $aspnetcore_version = '0.0.0'; `
+        $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
+        `
+        $Headers = @{ `
+            Authorization = \"Bearer $env:ACCESSTOKEN\"; `
+            'x-ms-version' = '2017-11-09'; `
+        }; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file -Headers $Headers; `
+        `
+        if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $aspnetcore_file --directory dotnet ./shared/Microsoft.AspNetCore.App; `
+        Remove-Item -Force `
+            $aspnetcore_file, `
+            $dotnet_sha512_file
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-windowsservercore-ltsc2022
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..0c0fc95cdf
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
@@ -0,0 +1,44 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2025-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Install ASP.NET Core Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $aspnetcore_version = '0.0.0'; `
+        $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
+        `
+        $Headers = @{ `
+            Authorization = \"Bearer $env:ACCESSTOKEN\"; `
+            'x-ms-version' = '2017-11-09'; `
+        }; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file -Headers $Headers; `
+        `
+        if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $aspnetcore_file --directory dotnet ./shared/Microsoft.AspNetCore.App; `
+        Remove-Item -Force `
+            $aspnetcore_file, `
+            $dotnet_sha512_file
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-windowsservercore-ltsc2025
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..32b28e65af
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-amd64-Dockerfile.approved.txt
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-alpine3.XX-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..531f790cac
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..3bb298e1ca
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..32b28e65af
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-alpine3.XX-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..531f790cac
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..3bb298e1ca
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..1661f6e865
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-azurelinux3.0-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        tar \
+    && tdnf clean all
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-azurelinux3.0-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..561daf3a1a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-azurelinux3.0-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        tar \
+    && tdnf clean all
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-azurelinux3.0-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..c0eb0dfd5b
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
@@ -0,0 +1,40 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-azurelinux3.0-distroless-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..64f97a946d
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,40 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-azurelinux3.0-distroless-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..7b89b776aa
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,40 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-azurelinux3.0-distroless-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..660a144524
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,40 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        ca-certificates \
+        gzip \
+        tar \
+    && tdnf clean all
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-azurelinux3.0-distroless-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..9011152344
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
@@ -0,0 +1,52 @@
+# escape=`
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $dotnet_version = '0.0.0'; `
+        $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        $Headers = @{ `
+            Authorization = \"Bearer $env:ACCESSTOKEN\"; `
+            'x-ms-version' = '2017-11-09'; `
+        }; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_sha512_file -Headers $Headers; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file
+
+
+# Runtime image
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022-amd64
+
+ENV `
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 `
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true `
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0
+
+# In order to set system PATH, ContainerAdministrator must be used
+USER ContainerAdministrator
+RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
+USER ContainerUser
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..d4f1527b5a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
@@ -0,0 +1,52 @@
+# escape=`
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2025-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $dotnet_version = '0.0.0'; `
+        $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        $Headers = @{ `
+            Authorization = \"Bearer $env:ACCESSTOKEN\"; `
+            'x-ms-version' = '2017-11-09'; `
+        }; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_sha512_file -Headers $Headers; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file
+
+
+# Runtime image
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025-amd64
+
+ENV `
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 `
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true `
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0
+
+# In order to set system PATH, ContainerAdministrator must be used
+USER ContainerAdministrator
+RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
+USER ContainerUser
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..dc2de68df3
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-amd64-Dockerfile.approved.txt
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-noble-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..72897c32a4
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-noble-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..8984eaa268
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-noble-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..fc6f1f23d2
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
@@ -0,0 +1,34 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-noble-chiseled-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..57bd96f297
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,34 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-noble-chiseled-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..d115a80a78
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,34 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-noble-chiseled-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..b36195ea03
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,34 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-noble-chiseled-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..d2e5f24442
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,34 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-noble-chiseled-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..4b01581877
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,34 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /usr/share/dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512
+
+RUN mkdir /dotnet-symlink \
+    && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-noble-chiseled-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=0.0.0
+
+COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
+COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
+
+ENTRYPOINT ["/usr/bin/dotnet"]
+CMD ["--info"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..064d0a1b00
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
@@ -0,0 +1,49 @@
+# escape=`
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $dotnet_version = '0.0.0'; `
+        $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        $Headers = @{ `
+            Authorization = \"Bearer $env:ACCESSTOKEN\"; `
+            'x-ms-version' = '2017-11-09'; `
+        }; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_sha512_file -Headers $Headers; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file
+
+
+# Runtime image
+FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64
+
+ENV `
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 `
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true `
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0
+
+RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..a161d997f0
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
@@ -0,0 +1,49 @@
+# escape=`
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2025-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN powershell -Command `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        $dotnet_version = '0.0.0'; `
+        $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        $Headers = @{ `
+            Authorization = \"Bearer $env:ACCESSTOKEN\"; `
+            'x-ms-version' = '2017-11-09'; `
+        }; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_sha512_file -Headers $Headers; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file
+
+
+# Runtime image
+FROM mcr.microsoft.com/windows/servercore:ltsc2025-amd64
+
+ENV `
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 `
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true `
+    # .NET Runtime version
+    DOTNET_VERSION=0.0.0
+
+RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..c3042512d9
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-amd64-Dockerfile.approved.txt
@@ -0,0 +1,29 @@
+FROM amd64/alpine:3.22
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        libgcc \
+        libssl3 \
+        libstdc++
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..a543d8c074
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,29 @@
+FROM arm32v7/alpine:3.22
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        libgcc \
+        libssl3 \
+        libstdc++
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..ab50a7bde1
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,29 @@
+FROM arm64v8/alpine:3.22
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        libgcc \
+        libssl3 \
+        libstdc++
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..c9dc3b1da2
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+FROM amd64/alpine:3.22
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        icu-data-full \
+        icu-libs \
+        libgcc \
+        libssl3 \
+        libstdc++ \
+        tzdata
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..dfa4053e2f
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+FROM arm32v7/alpine:3.22
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        icu-data-full \
+        icu-libs \
+        libgcc \
+        libssl3 \
+        libstdc++ \
+        tzdata
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..7c25ae6f2e
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.22-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+FROM arm64v8/alpine:3.22
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        icu-data-full \
+        icu-libs \
+        libgcc \
+        libssl3 \
+        libstdc++ \
+        tzdata
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..3584d9343b
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-amd64-Dockerfile.approved.txt
@@ -0,0 +1,29 @@
+FROM amd64/alpine:3.23
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        libgcc \
+        libssl3 \
+        libstdc++
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..44fac11e41
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,29 @@
+FROM arm32v7/alpine:3.23
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        libgcc \
+        libssl3 \
+        libstdc++
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..682d8bd495
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,29 @@
+FROM arm64v8/alpine:3.23
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        libgcc \
+        libssl3 \
+        libstdc++
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..e4e8a49348
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+FROM amd64/alpine:3.23
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        icu-data-full \
+        icu-libs \
+        libgcc \
+        libssl3 \
+        libstdc++ \
+        tzdata
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..459793f172
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+FROM arm32v7/alpine:3.23
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        icu-data-full \
+        icu-libs \
+        libgcc \
+        libssl3 \
+        libstdc++ \
+        tzdata
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..cdbd11bda4
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+FROM arm64v8/alpine:3.23
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apk add --upgrade --no-cache \
+        ca-certificates-bundle \
+        \
+        # .NET dependencies
+        icu-data-full \
+        icu-libs \
+        libgcc \
+        libssl3 \
+        libstdc++ \
+        tzdata
+
+# Create a non-root user and group
+RUN addgroup \
+        --gid=$APP_UID \
+        app \
+    && adduser \
+        --uid=$APP_UID \
+        --ingroup=app \
+        --disabled-password \
+        app
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..4adeda9e8f
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
@@ -0,0 +1,36 @@
+FROM mcr.microsoft.com/azurelinux/base/core:3.0
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN tdnf install -y \
+        ca-certificates \
+        \
+        # .NET dependencies
+        glibc \
+        icu \
+        libgcc \
+        libstdc++ \
+        openssl-libs \
+        tzdata \
+    && tdnf clean all
+
+# Create a non-root user and group
+RUN tdnf install -y \
+        shadow-utils \
+    && groupadd \
+        --gid=$APP_UID \
+        app \
+    && useradd --no-log-init \
+        --uid=$APP_UID \
+        --gid=$APP_UID \
+        --create-home \
+        app \
+    && tdnf autoremove -y \
+        shadow-utils \
+    && tdnf clean all
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..4adeda9e8f
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,36 @@
+FROM mcr.microsoft.com/azurelinux/base/core:3.0
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN tdnf install -y \
+        ca-certificates \
+        \
+        # .NET dependencies
+        glibc \
+        icu \
+        libgcc \
+        libstdc++ \
+        openssl-libs \
+        tzdata \
+    && tdnf clean all
+
+# Create a non-root user and group
+RUN tdnf install -y \
+        shadow-utils \
+    && groupadd \
+        --gid=$APP_UID \
+        app \
+    && useradd --no-log-init \
+        --uid=$APP_UID \
+        --gid=$APP_UID \
+        --create-home \
+        app \
+    && tdnf autoremove -y \
+        shadow-utils \
+    && tdnf clean all
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..94daad8657
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
@@ -0,0 +1,73 @@
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        gawk \
+        shadow-utils \
+    && tdnf clean all
+
+# Install .NET's dependencies into a staging location
+RUN mkdir /staging \
+    && tdnf install -y --releasever=3.0 --installroot /staging \
+        prebuilt-ca-certificates \
+        \
+        # .NET dependencies
+        glibc \
+        libgcc \
+        libstdc++ \
+        openssl-libs \
+    && tdnf clean all --releasever=3.0 --installroot /staging
+
+# Generate RPM manifest file by appending to the original manifest file from base distroless image
+COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest
+RUN tmpManifestPath="/tmp/rpmmanifest" \
+    && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \
+    && mkdir --parents /staging/var/lib/rpmmanifest \
+    # Remove duplicates that match on the first field (package name)
+    && tac $tmpManifestPath | gawk '!x[$1]++' | sort > /staging/var/lib/rpmmanifest/container-manifest-2
+
+# Create a non-root user and group
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        --create-home \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/staging/home/app" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/staging/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/staging/etc/group"
+
+# Clean up staging
+RUN rm -rf \
+        /staging/etc/tdnf \
+        /staging/run/* \
+        /staging/var/cache/tdnf \
+        /staging/var/lib/rpm \
+        /staging/usr/share/doc \
+        /staging/usr/share/man \
+    && find /staging/var/log -type f -size +0 -delete
+
+
+# .NET runtime-deps image
+FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+COPY --from=installer /staging/ /
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=installer --chown=1654:1654 /staging/home/app /home/app
+
+USER $APP_UID
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..94daad8657
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,73 @@
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        gawk \
+        shadow-utils \
+    && tdnf clean all
+
+# Install .NET's dependencies into a staging location
+RUN mkdir /staging \
+    && tdnf install -y --releasever=3.0 --installroot /staging \
+        prebuilt-ca-certificates \
+        \
+        # .NET dependencies
+        glibc \
+        libgcc \
+        libstdc++ \
+        openssl-libs \
+    && tdnf clean all --releasever=3.0 --installroot /staging
+
+# Generate RPM manifest file by appending to the original manifest file from base distroless image
+COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest
+RUN tmpManifestPath="/tmp/rpmmanifest" \
+    && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \
+    && mkdir --parents /staging/var/lib/rpmmanifest \
+    # Remove duplicates that match on the first field (package name)
+    && tac $tmpManifestPath | gawk '!x[$1]++' | sort > /staging/var/lib/rpmmanifest/container-manifest-2
+
+# Create a non-root user and group
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        --create-home \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/staging/home/app" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/staging/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/staging/etc/group"
+
+# Clean up staging
+RUN rm -rf \
+        /staging/etc/tdnf \
+        /staging/run/* \
+        /staging/var/cache/tdnf \
+        /staging/var/lib/rpm \
+        /staging/usr/share/doc \
+        /staging/usr/share/man \
+    && find /staging/var/log -type f -size +0 -delete
+
+
+# .NET runtime-deps image
+FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+COPY --from=installer /staging/ /
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=installer --chown=1654:1654 /staging/home/app /home/app
+
+USER $APP_UID
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..b3aa352eba
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,73 @@
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        gawk \
+        shadow-utils \
+    && tdnf clean all
+
+# Install .NET's dependencies into a staging location
+RUN mkdir /staging \
+    && tdnf install -y --releasever=3.0 --installroot /staging \
+        prebuilt-ca-certificates \
+        \
+        # .NET dependencies
+        glibc \
+        icu \
+        libgcc \
+        libstdc++ \
+        openssl-libs \
+        tzdata \
+    && tdnf clean all --releasever=3.0 --installroot /staging
+
+# Generate RPM manifest file by appending to the original manifest file from base distroless image
+COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest
+RUN tmpManifestPath="/tmp/rpmmanifest" \
+    && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \
+    && mkdir --parents /staging/var/lib/rpmmanifest \
+    # Remove duplicates that match on the first field (package name)
+    && tac $tmpManifestPath | gawk '!x[$1]++' | sort > /staging/var/lib/rpmmanifest/container-manifest-2
+
+# Create a non-root user and group
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        --create-home \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/staging/home/app" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/staging/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/staging/etc/group"
+
+# Clean up staging
+RUN rm -rf \
+        /staging/etc/tdnf \
+        /staging/run/* \
+        /staging/var/cache/tdnf \
+        /staging/var/lib/rpm \
+        /staging/usr/share/doc \
+        /staging/usr/share/man \
+    && find /staging/var/log -type f -size +0 -delete
+
+
+# .NET runtime-deps image
+FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+COPY --from=installer /staging/ /
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=installer --chown=1654:1654 /staging/home/app /home/app
+
+USER $APP_UID
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..b3aa352eba
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,73 @@
+# Installer image
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
+
+RUN tdnf install -y \
+        gawk \
+        shadow-utils \
+    && tdnf clean all
+
+# Install .NET's dependencies into a staging location
+RUN mkdir /staging \
+    && tdnf install -y --releasever=3.0 --installroot /staging \
+        prebuilt-ca-certificates \
+        \
+        # .NET dependencies
+        glibc \
+        icu \
+        libgcc \
+        libstdc++ \
+        openssl-libs \
+        tzdata \
+    && tdnf clean all --releasever=3.0 --installroot /staging
+
+# Generate RPM manifest file by appending to the original manifest file from base distroless image
+COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest
+RUN tmpManifestPath="/tmp/rpmmanifest" \
+    && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \
+    && mkdir --parents /staging/var/lib/rpmmanifest \
+    # Remove duplicates that match on the first field (package name)
+    && tac $tmpManifestPath | gawk '!x[$1]++' | sort > /staging/var/lib/rpmmanifest/container-manifest-2
+
+# Create a non-root user and group
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        --create-home \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/staging/home/app" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/staging/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/staging/etc/group"
+
+# Clean up staging
+RUN rm -rf \
+        /staging/etc/tdnf \
+        /staging/run/* \
+        /staging/var/cache/tdnf \
+        /staging/var/lib/rpm \
+        /staging/usr/share/doc \
+        /staging/usr/share/man \
+    && find /staging/var/log -type f -size +0 -delete
+
+
+# .NET runtime-deps image
+FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+COPY --from=installer /staging/ /
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=installer --chown=1654:1654 /staging/home/app /home/app
+
+USER $APP_UID
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..1be9446078
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-amd64-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+FROM ubuntu.azurecr.io/ubuntu:noble
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        ca-certificates \
+        \
+        # .NET dependencies
+        libc6 \
+        libgcc-s1 \
+        libicu74 \
+        libssl3t64 \
+        libstdc++6 \
+        tzdata \
+        tzdata-legacy \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create a non-root user and group
+RUN groupadd \
+        --gid=$APP_UID \
+        app \
+    && useradd --no-log-init \
+        --uid=$APP_UID \
+        --gid=$APP_UID \
+        --create-home \
+        app
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..1be9446078
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+FROM ubuntu.azurecr.io/ubuntu:noble
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        ca-certificates \
+        \
+        # .NET dependencies
+        libc6 \
+        libgcc-s1 \
+        libicu74 \
+        libssl3t64 \
+        libstdc++6 \
+        tzdata \
+        tzdata-legacy \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create a non-root user and group
+RUN groupadd \
+        --gid=$APP_UID \
+        app \
+    && useradd --no-log-init \
+        --uid=$APP_UID \
+        --gid=$APP_UID \
+        --create-home \
+        app
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..1be9446078
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+FROM ubuntu.azurecr.io/ubuntu:noble
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        ca-certificates \
+        \
+        # .NET dependencies
+        libc6 \
+        libgcc-s1 \
+        libicu74 \
+        libssl3t64 \
+        libstdc++6 \
+        tzdata \
+        tzdata-legacy \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create a non-root user and group
+RUN groupadd \
+        --gid=$APP_UID \
+        app \
+    && useradd --no-log-init \
+        --uid=$APP_UID \
+        --gid=$APP_UID \
+        --create-home \
+        app
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..0915fff97d
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
@@ -0,0 +1,57 @@
+FROM amd64/buildpack-deps:noble-curl AS chisel
+
+RUN apt-get update && apt-get install -y file
+
+RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_amd64.tar.gz \
+    && chisel_sha384='{sha386_placeholder}' \
+    && echo "$chisel_sha384  chisel.tar.gz" | sha384sum -c - \
+    && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \
+    && rm chisel.tar.gz \
+    && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \
+    && chmod 755 /usr/bin/chisel-wrapper
+
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/rootfs/home/app" \
+    && mkdir --parents "/rootfs/etc" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/rootfs/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/rootfs/etc/group"
+
+RUN mkdir --parents /rootfs/var/lib/dpkg/ \
+    && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
+        --release ubuntu-24.04 --root /rootfs \
+            base-files_base \
+            base-files_chisel \
+            base-files_release-info \
+            ca-certificates_data \
+            libc6_libs \
+            libgcc-s1_libs \
+            libssl3t64_libs \
+            libstdc++6_libs
+
+
+FROM scratch
+
+COPY --from=chisel /rootfs /
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=chisel --chown=$APP_UID:$APP_UID /rootfs/home/app /home/app
+
+USER $APP_UID
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..b1a8f19a19
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,57 @@
+FROM arm32v7/buildpack-deps:noble-curl AS chisel
+
+RUN apt-get update && apt-get install -y file
+
+RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm.tar.gz \
+    && chisel_sha384='{sha386_placeholder}' \
+    && echo "$chisel_sha384  chisel.tar.gz" | sha384sum -c - \
+    && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \
+    && rm chisel.tar.gz \
+    && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \
+    && chmod 755 /usr/bin/chisel-wrapper
+
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/rootfs/home/app" \
+    && mkdir --parents "/rootfs/etc" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/rootfs/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/rootfs/etc/group"
+
+RUN mkdir --parents /rootfs/var/lib/dpkg/ \
+    && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
+        --release ubuntu-24.04 --root /rootfs \
+            base-files_base \
+            base-files_chisel \
+            base-files_release-info \
+            ca-certificates_data \
+            libc6_libs \
+            libgcc-s1_libs \
+            libssl3t64_libs \
+            libstdc++6_libs
+
+
+FROM scratch
+
+COPY --from=chisel /rootfs /
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=chisel --chown=$APP_UID:$APP_UID /rootfs/home/app /home/app
+
+USER $APP_UID
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..d950ea2209
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,57 @@
+FROM arm64v8/buildpack-deps:noble-curl AS chisel
+
+RUN apt-get update && apt-get install -y file
+
+RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm64.tar.gz \
+    && chisel_sha384='{sha386_placeholder}' \
+    && echo "$chisel_sha384  chisel.tar.gz" | sha384sum -c - \
+    && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \
+    && rm chisel.tar.gz \
+    && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \
+    && chmod 755 /usr/bin/chisel-wrapper
+
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/rootfs/home/app" \
+    && mkdir --parents "/rootfs/etc" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/rootfs/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/rootfs/etc/group"
+
+RUN mkdir --parents /rootfs/var/lib/dpkg/ \
+    && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
+        --release ubuntu-24.04 --root /rootfs \
+            base-files_base \
+            base-files_chisel \
+            base-files_release-info \
+            ca-certificates_data \
+            libc6_libs \
+            libgcc-s1_libs \
+            libssl3t64_libs \
+            libstdc++6_libs
+
+
+FROM scratch
+
+COPY --from=chisel /rootfs /
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true \
+    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=chisel --chown=$APP_UID:$APP_UID /rootfs/home/app /home/app
+
+USER $APP_UID
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..88505748e9
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,58 @@
+FROM amd64/buildpack-deps:noble-curl AS chisel
+
+RUN apt-get update && apt-get install -y file
+
+RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_amd64.tar.gz \
+    && chisel_sha384='{sha386_placeholder}' \
+    && echo "$chisel_sha384  chisel.tar.gz" | sha384sum -c - \
+    && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \
+    && rm chisel.tar.gz \
+    && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \
+    && chmod 755 /usr/bin/chisel-wrapper
+
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/rootfs/home/app" \
+    && mkdir --parents "/rootfs/etc" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/rootfs/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/rootfs/etc/group"
+
+RUN mkdir --parents /rootfs/var/lib/dpkg/ \
+    && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
+        --release ubuntu-24.04 --root /rootfs \
+            base-files_base \
+            base-files_chisel \
+            base-files_release-info \
+            ca-certificates_data \
+            libc6_libs \
+            libgcc-s1_libs \
+            libicu74_libs \
+            libssl3t64_libs \
+            libstdc++6_libs \
+            tzdata-legacy_zoneinfo \
+            tzdata_zoneinfo
+
+
+FROM scratch
+
+COPY --from=chisel /rootfs /
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=chisel --chown=$APP_UID:$APP_UID /rootfs/home/app /home/app
+
+USER $APP_UID
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..690a88178a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,58 @@
+FROM arm32v7/buildpack-deps:noble-curl AS chisel
+
+RUN apt-get update && apt-get install -y file
+
+RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm.tar.gz \
+    && chisel_sha384='{sha386_placeholder}' \
+    && echo "$chisel_sha384  chisel.tar.gz" | sha384sum -c - \
+    && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \
+    && rm chisel.tar.gz \
+    && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \
+    && chmod 755 /usr/bin/chisel-wrapper
+
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/rootfs/home/app" \
+    && mkdir --parents "/rootfs/etc" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/rootfs/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/rootfs/etc/group"
+
+RUN mkdir --parents /rootfs/var/lib/dpkg/ \
+    && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
+        --release ubuntu-24.04 --root /rootfs \
+            base-files_base \
+            base-files_chisel \
+            base-files_release-info \
+            ca-certificates_data \
+            libc6_libs \
+            libgcc-s1_libs \
+            libicu74_libs \
+            libssl3t64_libs \
+            libstdc++6_libs \
+            tzdata-legacy_zoneinfo \
+            tzdata_zoneinfo
+
+
+FROM scratch
+
+COPY --from=chisel /rootfs /
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=chisel --chown=$APP_UID:$APP_UID /rootfs/home/app /home/app
+
+USER $APP_UID
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..3457cff01f
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,58 @@
+FROM arm64v8/buildpack-deps:noble-curl AS chisel
+
+RUN apt-get update && apt-get install -y file
+
+RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v0.0.0/chisel_v0.0.0_linux_arm64.tar.gz \
+    && chisel_sha384='{sha386_placeholder}' \
+    && echo "$chisel_sha384  chisel.tar.gz" | sha384sum -c - \
+    && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \
+    && rm chisel.tar.gz \
+    && curl --fail --show-error --location --output /usr/bin/chisel-wrapper https://raw.githubusercontent.com/canonical/rocks-toolbox/v0.0.0/chisel-wrapper \
+    && chmod 755 /usr/bin/chisel-wrapper
+
+RUN groupadd \
+        --gid=1654 \
+        app \
+    && useradd --no-log-init \
+        --uid=1654 \
+        --gid=1654 \
+        --shell /bin/false \
+        app \
+    && install --directory --mode 0755 --owner 1654 --group 1654 "/rootfs/home/app" \
+    && mkdir --parents "/rootfs/etc" \
+    && rootOrAppRegex='^\(root\|app\):' \
+    && cat /etc/passwd | grep $rootOrAppRegex > "/rootfs/etc/passwd" \
+    && cat /etc/group | grep $rootOrAppRegex > "/rootfs/etc/group"
+
+RUN mkdir --parents /rootfs/var/lib/dpkg/ \
+    && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
+        --release ubuntu-24.04 --root /rootfs \
+            base-files_base \
+            base-files_chisel \
+            base-files_release-info \
+            ca-certificates_data \
+            libc6_libs \
+            libgcc-s1_libs \
+            libicu74_libs \
+            libssl3t64_libs \
+            libstdc++6_libs \
+            tzdata-legacy_zoneinfo \
+            tzdata_zoneinfo
+
+
+FROM scratch
+
+COPY --from=chisel /rootfs /
+
+ENV \
+    # UID of the non-root user 'app'
+    APP_UID=1654 \
+    # Configure web servers to bind to port 8080 when present
+    ASPNETCORE_HTTP_PORTS=8080 \
+    # Enable detection of running in a container
+    DOTNET_RUNNING_IN_CONTAINER=true
+
+# Workaround for https://github.com/moby/moby/issues/38710
+COPY --from=chisel --chown=$APP_UID:$APP_UID /rootfs/home/app /home/app
+
+USER $APP_UID
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..f3aeb7a6eb
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-amd64-Dockerfile.approved.txt
@@ -0,0 +1,69 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Install .NET SDK
+RUN dotnet_sdk_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:0.0.0-alpine3.XX-amd64
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=0.0.0 \
+    # Disable the invariant mode (set in base image)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.22 \
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=0.0.0 \
+    && wget --output-document PowerShell.Linux.Alpine.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.Alpine.$powershell_version.nupkg \
+    && powershell_sha512='{sha512_placeholder}' \
+    && echo "$powershell_sha512  PowerShell.Linux.Alpine.$powershell_version.nupkg" | sha512sum -c - \
+    && mkdir --parents /usr/share/powershell \
+    && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.Alpine \
+    && dotnet nuget locals all --clear \
+    && rm PowerShell.Linux.Alpine.$powershell_version.nupkg \
+    && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \
+    && chmod 755 /usr/share/powershell/pwsh \
+    # To reduce image size, remove the copy nupkg that nuget keeps.
+    && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm \
+    # Add ncurses-terminfo-base to resolve psreadline dependency
+    && apk add --no-cache ncurses-terminfo-base
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-aot-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-aot-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..5f7812c897
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-aot-amd64-Dockerfile.approved.txt
@@ -0,0 +1,8 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:0.0.0-alpine3.XX-amd64
+
+RUN apk add --upgrade --no-cache \
+        build-base \
+        clang \
+        zlib-dev
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-aot-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-aot-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..19046afa59
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-aot-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,8 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:0.0.0-alpine3.XX-arm64v8
+
+RUN apk add --upgrade --no-cache \
+        build-base \
+        clang \
+        zlib-dev
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..34dc206b0e
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,49 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Install .NET SDK
+RUN dotnet_sdk_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=0.0.0 \
+    # Disable the invariant mode (set in base image)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip 
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..691687fa4a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,49 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Install .NET SDK
+RUN dotnet_sdk_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=0.0.0 \
+    # Disable the invariant mode (set in base image)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip 
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..e5cce2b97f
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt
@@ -0,0 +1,69 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Install .NET SDK
+RUN dotnet_sdk_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:0.0.0-alpine3.XX-amd64
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=0.0.0 \
+    # Disable the invariant mode (set in base image)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.23 \
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=0.0.0 \
+    && wget --output-document PowerShell.Linux.Alpine.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.Alpine.$powershell_version.nupkg \
+    && powershell_sha512='{sha512_placeholder}' \
+    && echo "$powershell_sha512  PowerShell.Linux.Alpine.$powershell_version.nupkg" | sha512sum -c - \
+    && mkdir --parents /usr/share/powershell \
+    && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.Alpine \
+    && dotnet nuget locals all --clear \
+    && rm PowerShell.Linux.Alpine.$powershell_version.nupkg \
+    && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \
+    && chmod 755 /usr/share/powershell/pwsh \
+    # To reduce image size, remove the copy nupkg that nuget keeps.
+    && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm \
+    # Add ncurses-terminfo-base to resolve psreadline dependency
+    && apk add --no-cache ncurses-terminfo-base
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-aot-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-aot-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..5f7812c897
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-aot-amd64-Dockerfile.approved.txt
@@ -0,0 +1,8 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:0.0.0-alpine3.XX-amd64
+
+RUN apk add --upgrade --no-cache \
+        build-base \
+        clang \
+        zlib-dev
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-aot-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-aot-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..19046afa59
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-aot-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,8 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:0.0.0-alpine3.XX-arm64v8
+
+RUN apk add --upgrade --no-cache \
+        build-base \
+        clang \
+        zlib-dev
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..34dc206b0e
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,49 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Install .NET SDK
+RUN dotnet_sdk_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:0.0.0-alpine3.XX-arm32v7
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=0.0.0 \
+    # Disable the invariant mode (set in base image)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip 
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..691687fa4a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,49 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Install .NET SDK
+RUN dotnet_sdk_version=0.0.0 \
+    && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:0.0.0-alpine3.XX-arm64v8
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=0.0.0 \
+    # Disable the invariant mode (set in base image)
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip 
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..0f6b1c0d8c
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
@@ -0,0 +1,67 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:0.0.0-azurelinux3.0-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        tar \
+    && tdnf clean all
+
+# Install .NET SDK
+RUN dotnet_sdk_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:0.0.0-azurelinux3.0-amd64
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=0.0.0 \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0 \
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN tdnf install -y \
+        git \
+        libgcc-atomic \
+        tar \
+    && tdnf clean all
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=0.0.0 \
+    && curl --fail --show-error --location --output PowerShell.Linux.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.x64.$powershell_version.nupkg \
+    && powershell_sha512='{sha512_placeholder}' \
+    && echo "$powershell_sha512  PowerShell.Linux.x64.$powershell_version.nupkg" | sha512sum -c - \
+    && mkdir --parents /usr/share/powershell \
+    && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.x64 \
+    && dotnet nuget locals all --clear \
+    && rm PowerShell.Linux.x64.$powershell_version.nupkg \
+    && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \
+    && chmod 755 /usr/share/powershell/pwsh \
+    # To reduce image size, remove the copy nupkg that nuget keeps.
+    && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-aot-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-aot-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..ab3e377c59
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-aot-amd64-Dockerfile.approved.txt
@@ -0,0 +1,9 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:0.0.0-azurelinux3.0-amd64
+
+RUN tdnf install -y \
+        build-essential \
+        clang \
+        zlib-devel \
+    && tdnf clean all
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-aot-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-aot-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..d54911d329
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-aot-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,9 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:0.0.0-azurelinux3.0-arm64v8
+
+RUN tdnf install -y \
+        build-essential \
+        clang \
+        zlib-devel \
+    && tdnf clean all
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..cba4d6df79
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,67 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:0.0.0-azurelinux3.0-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+RUN tdnf install -y \
+        tar \
+    && tdnf clean all
+
+# Install .NET SDK
+RUN dotnet_sdk_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:0.0.0-azurelinux3.0-arm64v8
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=0.0.0 \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0-arm64 \
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN tdnf install -y \
+        git \
+        libgcc-atomic \
+        tar \
+    && tdnf clean all
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=0.0.0 \
+    && curl --fail --show-error --location --output PowerShell.Linux.arm64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm64.$powershell_version.nupkg \
+    && powershell_sha512='{sha512_placeholder}' \
+    && echo "$powershell_sha512  PowerShell.Linux.arm64.$powershell_version.nupkg" | sha512sum -c - \
+    && mkdir --parents /usr/share/powershell \
+    && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm64 \
+    && dotnet nuget locals all --clear \
+    && rm PowerShell.Linux.arm64.$powershell_version.nupkg \
+    && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \
+    && chmod 755 /usr/share/powershell/pwsh \
+    # To reduce image size, remove the copy nupkg that nuget keeps.
+    && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..2514713dfc
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
@@ -0,0 +1,102 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Download MinGit
+RUN powershell -Command " `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v0.0.0.windows.0/MinGit-0.0.0-64-bit.zip; `
+        $mingit_sha256 = '{sha256_placeholder}'; `
+        if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        mkdir MinGit; `
+        tar --gzip --extract --no-same-owner --file mingit.zip --directory MinGit; `
+        Remove-Item -Force mingit.zip"
+
+SHELL ["powershell", "-command"]
+RUN `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        # Retrieve .NET SDK
+        $dotnet_sdk_version = '0.0.0'; `
+        $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        $Headers = @{ `
+            Authorization = \"Bearer $env:ACCESSTOKEN\"; `
+            'x-ms-version' = '2017-11-09'; `
+        }; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_sha512_file -Headers $Headers; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file; `
+        `
+        # Install PowerShell global tool
+        $powershell_version = '0.0.0'; `
+        Invoke-WebRequest -OutFile PowerShell.Windows.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Windows.x64.$powershell_version.nupkg; `
+        $powershell_sha512 = '{sha512_placeholder}'; `
+        if ((Get-FileHash PowerShell.Windows.x64.$powershell_version.nupkg -Algorithm sha512).Hash -ne $powershell_sha512) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        & \dotnet\dotnet tool install --add-source . --tool-path \powershell --version $powershell_version PowerShell.Windows.x64; `
+        & \dotnet\dotnet nuget locals all --clear; `
+        Remove-Item -Force PowerShell.Windows.x64.$powershell_version.nupkg; `
+        Remove-Item -Path \powershell\.store\powershell.windows.x64\$powershell_version\powershell.windows.x64\$powershell_version\powershell.windows.x64.$powershell_version.nupkg -Force; `
+        `
+        # Delete everything in the dotnet folder that's not needed in the SDK layer but will instead be derived from base layers
+        Get-ChildItem -Exclude 'dnx.cmd','dnx.ps1','LICENSE.txt','ThirdPartyNotices.txt','packs','sdk','sdk-manifests','templates','shared' -Path dotnet `
+            | Remove-Item -Force -Recurse; `
+        Get-ChildItem -Exclude 'Microsoft.WindowsDesktop.App' -Path dotnet\shared `
+            | Remove-Item -Force -Recurse
+
+
+# SDK image
+FROM $REPO:0.0.0-nanoserver-ltsc2022
+
+ENV `
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false `
+    # Do not show first run text
+    DOTNET_NOLOGO=true `
+    # SDK version
+    DOTNET_SDK_VERSION=0.0.0 `
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true `
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip `
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2022 `
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+# In order to set system PATH, ContainerAdministrator must be used
+USER ContainerAdministrator
+RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd"
+USER ContainerUser
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
+COPY --from=installer ["/powershell", "/Program Files/powershell"]
+COPY --from=installer ["/MinGit", "/Program Files/MinGit"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..126cf83a04
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
@@ -0,0 +1,102 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2025-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Download MinGit
+RUN powershell -Command " `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v0.0.0.windows.0/MinGit-0.0.0-64-bit.zip; `
+        $mingit_sha256 = '{sha256_placeholder}'; `
+        if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        mkdir MinGit; `
+        tar --gzip --extract --no-same-owner --file mingit.zip --directory MinGit; `
+        Remove-Item -Force mingit.zip"
+
+SHELL ["powershell", "-command"]
+RUN `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        # Retrieve .NET SDK
+        $dotnet_sdk_version = '0.0.0'; `
+        $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        $Headers = @{ `
+            Authorization = \"Bearer $env:ACCESSTOKEN\"; `
+            'x-ms-version' = '2017-11-09'; `
+        }; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_sha512_file -Headers $Headers; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file; `
+        `
+        # Install PowerShell global tool
+        $powershell_version = '0.0.0'; `
+        Invoke-WebRequest -OutFile PowerShell.Windows.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Windows.x64.$powershell_version.nupkg; `
+        $powershell_sha512 = '{sha512_placeholder}'; `
+        if ((Get-FileHash PowerShell.Windows.x64.$powershell_version.nupkg -Algorithm sha512).Hash -ne $powershell_sha512) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        & \dotnet\dotnet tool install --add-source . --tool-path \powershell --version $powershell_version PowerShell.Windows.x64; `
+        & \dotnet\dotnet nuget locals all --clear; `
+        Remove-Item -Force PowerShell.Windows.x64.$powershell_version.nupkg; `
+        Remove-Item -Path \powershell\.store\powershell.windows.x64\$powershell_version\powershell.windows.x64\$powershell_version\powershell.windows.x64.$powershell_version.nupkg -Force; `
+        `
+        # Delete everything in the dotnet folder that's not needed in the SDK layer but will instead be derived from base layers
+        Get-ChildItem -Exclude 'dnx.cmd','dnx.ps1','LICENSE.txt','ThirdPartyNotices.txt','packs','sdk','sdk-manifests','templates','shared' -Path dotnet `
+            | Remove-Item -Force -Recurse; `
+        Get-ChildItem -Exclude 'Microsoft.WindowsDesktop.App' -Path dotnet\shared `
+            | Remove-Item -Force -Recurse
+
+
+# SDK image
+FROM $REPO:0.0.0-nanoserver-ltsc2025
+
+ENV `
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false `
+    # Do not show first run text
+    DOTNET_NOLOGO=true `
+    # SDK version
+    DOTNET_SDK_VERSION=0.0.0 `
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true `
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip `
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2025 `
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+# In order to set system PATH, ContainerAdministrator must be used
+USER ContainerAdministrator
+RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd"
+USER ContainerUser
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
+COPY --from=installer ["/powershell", "/Program Files/powershell"]
+COPY --from=installer ["/MinGit", "/Program Files/MinGit"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..809f546e2b
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-amd64-Dockerfile.approved.txt
@@ -0,0 +1,65 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM amd64/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Install .NET SDK
+RUN dotnet_sdk_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:0.0.0-noble-amd64
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=0.0.0 \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04 \
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        curl \
+        git \
+        libatomic1 \
+        wget \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=0.0.0 \
+    && curl --fail --show-error --location --output PowerShell.Linux.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.x64.$powershell_version.nupkg \
+    && powershell_sha512='{sha512_placeholder}' \
+    && echo "$powershell_sha512  PowerShell.Linux.x64.$powershell_version.nupkg" | sha512sum -c - \
+    && mkdir --parents /usr/share/powershell \
+    && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.x64 \
+    && dotnet nuget locals all --clear \
+    && rm PowerShell.Linux.x64.$powershell_version.nupkg \
+    && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \
+    && chmod 755 /usr/share/powershell/pwsh \
+    # To reduce image size, remove the copy nupkg that nuget keeps.
+    && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-aot-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-aot-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..8846e30906
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-aot-amd64-Dockerfile.approved.txt
@@ -0,0 +1,10 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:0.0.0-noble-amd64
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        clang \
+        llvm \
+        zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-aot-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-aot-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..8577ac304b
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-aot-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,10 @@
+# syntax=docker/dockerfile:1
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:0.0.0-noble-arm64v8
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        clang \
+        llvm \
+        zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..74368d911a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,65 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Install .NET SDK
+RUN dotnet_sdk_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:0.0.0-noble-arm32v7
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=0.0.0 \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm32 \
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        curl \
+        git \
+        libatomic1 \
+        wget \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=0.0.0 \
+    && curl --fail --show-error --location --output PowerShell.Linux.arm32.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm32.$powershell_version.nupkg \
+    && powershell_sha512='{sha512_placeholder}' \
+    && echo "$powershell_sha512  PowerShell.Linux.arm32.$powershell_version.nupkg" | sha512sum -c - \
+    && mkdir --parents /usr/share/powershell \
+    && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm32 \
+    && dotnet nuget locals all --clear \
+    && rm PowerShell.Linux.arm32.$powershell_version.nupkg \
+    && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \
+    && chmod 755 /usr/share/powershell/pwsh \
+    # To reduce image size, remove the copy nupkg that nuget keeps.
+    && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..d7087ff840
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,65 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM arm64v8/buildpack-deps:noble-curl AS installer
+
+ARG ACCESSTOKEN
+
+# Install .NET SDK
+RUN dotnet_sdk_version=0.0.0 \
+    && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512
+
+
+# .NET SDK image
+FROM $REPO:0.0.0-noble-arm64v8
+
+ENV \
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    # Do not show first run text
+    DOTNET_NOLOGO=true \
+    # SDK version
+    DOTNET_SDK_VERSION=0.0.0 \
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true \
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm64 \
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        curl \
+        git \
+        libatomic1 \
+        wget \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
+    # Trigger first run experience by running arbitrary cmd
+    && dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=0.0.0 \
+    && curl --fail --show-error --location --output PowerShell.Linux.arm64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm64.$powershell_version.nupkg \
+    && powershell_sha512='{sha512_placeholder}' \
+    && echo "$powershell_sha512  PowerShell.Linux.arm64.$powershell_version.nupkg" | sha512sum -c - \
+    && mkdir --parents /usr/share/powershell \
+    && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm64 \
+    && dotnet nuget locals all --clear \
+    && rm PowerShell.Linux.arm64.$powershell_version.nupkg \
+    && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \
+    && chmod 755 /usr/share/powershell/pwsh \
+    # To reduce image size, remove the copy nupkg that nuget keeps.
+    && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..fb8a140661
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
@@ -0,0 +1,99 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Download MinGit
+RUN powershell -Command " `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v0.0.0.windows.0/MinGit-0.0.0-64-bit.zip; `
+        $mingit_sha256 = '{sha256_placeholder}'; `
+        if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        mkdir MinGit; `
+        tar --gzip --extract --no-same-owner --file mingit.zip --directory MinGit; `
+        Remove-Item -Force mingit.zip"
+
+SHELL ["powershell", "-command"]
+RUN `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        # Retrieve .NET SDK
+        $dotnet_sdk_version = '0.0.0'; `
+        $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        $Headers = @{ `
+            Authorization = \"Bearer $env:ACCESSTOKEN\"; `
+            'x-ms-version' = '2017-11-09'; `
+        }; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_sha512_file -Headers $Headers; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file; `
+        `
+        # Install PowerShell global tool
+        $powershell_version = '0.0.0'; `
+        Invoke-WebRequest -OutFile PowerShell.Windows.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Windows.x64.$powershell_version.nupkg; `
+        $powershell_sha512 = '{sha512_placeholder}'; `
+        if ((Get-FileHash PowerShell.Windows.x64.$powershell_version.nupkg -Algorithm sha512).Hash -ne $powershell_sha512) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        & \dotnet\dotnet tool install --add-source . --tool-path \powershell --version $powershell_version PowerShell.Windows.x64; `
+        & \dotnet\dotnet nuget locals all --clear; `
+        Remove-Item -Force PowerShell.Windows.x64.$powershell_version.nupkg; `
+        Remove-Item -Path \powershell\.store\powershell.windows.x64\$powershell_version\powershell.windows.x64\$powershell_version\powershell.windows.x64.$powershell_version.nupkg -Force; `
+        `
+        # Delete everything in the dotnet folder that's not needed in the SDK layer but will instead be derived from base layers
+        Get-ChildItem -Exclude 'dnx.cmd','dnx.ps1','LICENSE.txt','ThirdPartyNotices.txt','packs','sdk','sdk-manifests','templates','shared' -Path dotnet `
+            | Remove-Item -Force -Recurse; `
+        Get-ChildItem -Exclude 'Microsoft.WindowsDesktop.App' -Path dotnet\shared `
+            | Remove-Item -Force -Recurse
+
+
+# SDK image
+FROM $REPO:0.0.0-windowsservercore-ltsc2022
+
+ENV `
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false `
+    # Do not show first run text
+    DOTNET_NOLOGO=true `
+    # SDK version
+    DOTNET_SDK_VERSION=0.0.0 `
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true `
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip `
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2022 `
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd"
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
+COPY --from=installer ["/powershell", "/Program Files/powershell"]
+COPY --from=installer ["/MinGit", "/Program Files/MinGit"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..5aa5d6d377
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
@@ -0,0 +1,99 @@
+# escape=`
+
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+
+# Installer image
+FROM mcr.microsoft.com/windows/servercore:ltsc2025-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Download MinGit
+RUN powershell -Command " `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v0.0.0.windows.0/MinGit-0.0.0-64-bit.zip; `
+        $mingit_sha256 = '{sha256_placeholder}'; `
+        if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        mkdir MinGit; `
+        tar --gzip --extract --no-same-owner --file mingit.zip --directory MinGit; `
+        Remove-Item -Force mingit.zip"
+
+SHELL ["powershell", "-command"]
+RUN `
+        $ErrorActionPreference = 'Stop'; `
+        $ProgressPreference = 'SilentlyContinue'; `
+        `
+        # Retrieve .NET SDK
+        $dotnet_sdk_version = '0.0.0'; `
+        $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
+        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
+        `
+        $Headers = @{ `
+            Authorization = \"Bearer $env:ACCESSTOKEN\"; `
+            'x-ms-version' = '2017-11-09'; `
+        }; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_sha512_file -Headers $Headers; `
+        `
+        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        `
+        mkdir dotnet; `
+        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
+        Remove-Item -Force `
+            $dotnet_file, `
+            $dotnet_sha512_file; `
+        `
+        # Install PowerShell global tool
+        $powershell_version = '0.0.0'; `
+        Invoke-WebRequest -OutFile PowerShell.Windows.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Windows.x64.$powershell_version.nupkg; `
+        $powershell_sha512 = '{sha512_placeholder}'; `
+        if ((Get-FileHash PowerShell.Windows.x64.$powershell_version.nupkg -Algorithm sha512).Hash -ne $powershell_sha512) { `
+            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
+            exit 1; `
+        }; `
+        & \dotnet\dotnet tool install --add-source . --tool-path \powershell --version $powershell_version PowerShell.Windows.x64; `
+        & \dotnet\dotnet nuget locals all --clear; `
+        Remove-Item -Force PowerShell.Windows.x64.$powershell_version.nupkg; `
+        Remove-Item -Path \powershell\.store\powershell.windows.x64\$powershell_version\powershell.windows.x64\$powershell_version\powershell.windows.x64.$powershell_version.nupkg -Force; `
+        `
+        # Delete everything in the dotnet folder that's not needed in the SDK layer but will instead be derived from base layers
+        Get-ChildItem -Exclude 'dnx.cmd','dnx.ps1','LICENSE.txt','ThirdPartyNotices.txt','packs','sdk','sdk-manifests','templates','shared' -Path dotnet `
+            | Remove-Item -Force -Recurse; `
+        Get-ChildItem -Exclude 'Microsoft.WindowsDesktop.App' -Path dotnet\shared `
+            | Remove-Item -Force -Recurse
+
+
+# SDK image
+FROM $REPO:0.0.0-windowsservercore-ltsc2025
+
+ENV `
+    # Do not generate certificate
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false `
+    # Do not show first run text
+    DOTNET_NOLOGO=true `
+    # SDK version
+    DOTNET_SDK_VERSION=0.0.0 `
+    # Enable correct mode for dotnet watch (only mode supported in a container)
+    DOTNET_USE_POLLING_FILE_WATCHER=true `
+    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
+    NUGET_XMLDOC_MODE=skip `
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2025 `
+    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
+    DOTNET_ROLL_FORWARD=Major
+
+RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd"
+
+COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
+COPY --from=installer ["/powershell", "/Program Files/powershell"]
+COPY --from=installer ["/MinGit", "/Program Files/MinGit"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs b/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs
index 5304c4ad80..76b987b93d 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs
@@ -17,6 +17,7 @@ public readonly record struct ImageVersion
         public static readonly ImageVersion V13_1 = new(new Version(13, 1), isPreview: false);
         public static readonly ImageVersion V9_2_Preview = new(new Version(9, 2), isPreview: true);
         public static readonly ImageVersion V10_0 = new(new Version(10, 0), isPreview: false);
+        public static readonly ImageVersion V11_0 = new(new Version(11, 0), isPreview: true);
 
         public ImageVersion(Version version, bool isPreview)
         {
diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
index aacf0a7d52..9c0d206d45 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
@@ -285,6 +285,90 @@ public static class TestData
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.NobleChiseled,       Arch = Arch.Arm,     SdkOS = OS.Noble,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+
+
+            new ProductImageData { Version = V11_0, OS = OS.Noble,               Arch = Arch.Amd64 },
+            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Amd64,   SdkOS = OS.Noble },
+            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Amd64,   SdkOS = OS.Noble,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Amd64,   SdkOS = OS.Noble,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Amd64,   SdkOS = OS.Noble,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Amd64 },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Amd64,   SdkOS = OS.Alpine322,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Amd64,   SdkOS = OS.Alpine322,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Amd64 },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+            new ProductImageData { Version = V11_0, OS = OS.AzureLinux30,           Arch = Arch.Amd64 },
+            new ProductImageData { Version = V11_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Amd64,   SdkOS = OS.AzureLinux30 },
+            new ProductImageData { Version = V11_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Amd64,   SdkOS = OS.AzureLinux30,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Amd64,   SdkOS = OS.AzureLinux30,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Amd64,   SdkOS = OS.AzureLinux30,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+
+            new() { Version = V11_0, Arch = Arch.Amd64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine322 },
+            new() { Version = V11_0, Arch = Arch.Amd64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine323 },
+            new() { Version = V11_0, Arch = Arch.Amd64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.AzureLinux30Distroless, SdkOS = OS.AzureLinux30 },
+            new() { Version = V11_0, Arch = Arch.Amd64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.NobleChiseled, SdkOS = OS.Noble },
+
+            new ProductImageData { Version = V11_0, OS = OS.AzureLinux30,           Arch = Arch.Arm64 },
+            new ProductImageData { Version = V11_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Arm64,   SdkOS = OS.AzureLinux30 },
+            new ProductImageData { Version = V11_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Arm64,   SdkOS = OS.AzureLinux30,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Arm64,   SdkOS = OS.AzureLinux30,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Arm64,   SdkOS = OS.AzureLinux30,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.Noble,               Arch = Arch.Arm64 },
+            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm64,   SdkOS = OS.Noble },
+            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm64,   SdkOS = OS.Noble,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm64,   SdkOS = OS.Noble,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm64,   SdkOS = OS.Noble,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Arm64 },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Arm64,   SdkOS = OS.Alpine322,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Arm64,   SdkOS = OS.Alpine322,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm64 },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+
+            new() { Version = V11_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine322 },
+            new() { Version = V11_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine323 },
+            new() { Version = V11_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.AzureLinux30Distroless, SdkOS = OS.AzureLinux30 },
+            new() { Version = V11_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.NobleChiseled, SdkOS = OS.Noble },
+
+            new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Arm },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Arm,     SdkOS = OS.Alpine322,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Arm,     SdkOS = OS.Alpine322,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+            new ProductImageData { Version = V11_0, OS = OS.Noble,               Arch = Arch.Arm },
+            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm,     SdkOS = OS.Noble },
+            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm,     SdkOS = OS.Noble,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm,     SdkOS = OS.Noble,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm,     SdkOS = OS.Noble,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
         };
 
         private static readonly ProductImageData[] s_windowsTestData =
@@ -307,6 +391,11 @@ public static class TestData
             new ProductImageData { Version = V10_0, OS = OS.NanoServerLtsc2025, Arch = Arch.Amd64 },
             new ProductImageData { Version = V10_0, OS = OS.ServerCoreLtsc2022, Arch = Arch.Amd64 },
             new ProductImageData { Version = V10_0, OS = OS.ServerCoreLtsc2025, Arch = Arch.Amd64 },
+
+            new ProductImageData { Version = V11_0, OS = OS.NanoServerLtsc2022, Arch = Arch.Amd64 },
+            new ProductImageData { Version = V11_0, OS = OS.NanoServerLtsc2025, Arch = Arch.Amd64 },
+            new ProductImageData { Version = V11_0, OS = OS.ServerCoreLtsc2022, Arch = Arch.Amd64 },
+            new ProductImageData { Version = V11_0, OS = OS.ServerCoreLtsc2025, Arch = Arch.Amd64 },
         };
 
         private static readonly SampleImageData[] s_linuxSampleTestData =

From 6504062dad238b67824e8396fb2d04fd615c506a Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Wed, 10 Dec 2025 11:50:32 -0800
Subject: [PATCH 02/23] Update .NET 11 to 11.0.100-alpha.1.25609.108

---
 README.aspnet.md                              | 82 +++++++++----------
 README.runtime-deps.md                        | 54 ++++++------
 README.runtime.md                             | 50 +++++------
 README.sdk.md                                 | 46 +++++------
 manifest.versions.json                        | 10 +--
 .../alpine3.22-composite/amd64/Dockerfile     | 15 ++--
 .../alpine3.22-composite/arm32v7/Dockerfile   | 15 ++--
 .../alpine3.22-composite/arm64v8/Dockerfile   | 15 ++--
 src/aspnet/11.0/alpine3.22/amd64/Dockerfile   | 13 +--
 src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile | 13 +--
 src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile | 13 +--
 .../alpine3.23-composite/amd64/Dockerfile     | 15 ++--
 .../alpine3.23-composite/arm32v7/Dockerfile   | 15 ++--
 .../alpine3.23-composite/arm64v8/Dockerfile   | 15 ++--
 src/aspnet/11.0/alpine3.23/amd64/Dockerfile   | 13 +--
 src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile | 13 +--
 src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile | 13 +--
 .../amd64/Dockerfile                          | 13 +--
 .../arm64v8/Dockerfile                        | 13 +--
 .../amd64/Dockerfile                          | 13 +--
 .../arm64v8/Dockerfile                        | 13 +--
 .../amd64/Dockerfile                          | 11 +--
 .../arm64v8/Dockerfile                        | 11 +--
 .../azurelinux3.0-distroless/amd64/Dockerfile | 11 +--
 .../arm64v8/Dockerfile                        | 11 +--
 .../11.0/azurelinux3.0/amd64/Dockerfile       | 13 +--
 .../11.0/azurelinux3.0/arm64v8/Dockerfile     | 13 +--
 .../11.0/nanoserver-ltsc2022/amd64/Dockerfile | 11 +--
 .../11.0/nanoserver-ltsc2025/amd64/Dockerfile | 11 +--
 .../amd64/Dockerfile                          | 13 +--
 .../arm32v7/Dockerfile                        | 13 +--
 .../arm64v8/Dockerfile                        | 13 +--
 .../noble-chiseled-composite/amd64/Dockerfile | 13 +--
 .../arm32v7/Dockerfile                        | 13 +--
 .../arm64v8/Dockerfile                        | 13 +--
 .../noble-chiseled-extra/amd64/Dockerfile     | 11 +--
 .../noble-chiseled-extra/arm32v7/Dockerfile   | 11 +--
 .../noble-chiseled-extra/arm64v8/Dockerfile   | 11 +--
 .../11.0/noble-chiseled/amd64/Dockerfile      | 11 +--
 .../11.0/noble-chiseled/arm32v7/Dockerfile    | 11 +--
 .../11.0/noble-chiseled/arm64v8/Dockerfile    | 11 +--
 src/aspnet/11.0/noble/amd64/Dockerfile        | 11 +--
 src/aspnet/11.0/noble/arm32v7/Dockerfile      | 11 +--
 src/aspnet/11.0/noble/arm64v8/Dockerfile      | 11 +--
 .../amd64/Dockerfile                          | 11 +--
 .../amd64/Dockerfile                          | 11 +--
 src/runtime/11.0/alpine3.22/amd64/Dockerfile  | 13 +--
 .../11.0/alpine3.22/arm32v7/Dockerfile        | 13 +--
 .../11.0/alpine3.22/arm64v8/Dockerfile        | 13 +--
 src/runtime/11.0/alpine3.23/amd64/Dockerfile  | 13 +--
 .../11.0/alpine3.23/arm32v7/Dockerfile        | 13 +--
 .../11.0/alpine3.23/arm64v8/Dockerfile        | 13 +--
 .../amd64/Dockerfile                          | 11 +--
 .../arm64v8/Dockerfile                        | 11 +--
 .../azurelinux3.0-distroless/amd64/Dockerfile | 11 +--
 .../arm64v8/Dockerfile                        | 11 +--
 .../11.0/azurelinux3.0/amd64/Dockerfile       | 13 +--
 .../11.0/azurelinux3.0/arm64v8/Dockerfile     | 13 +--
 .../11.0/nanoserver-ltsc2022/amd64/Dockerfile |  9 +-
 .../11.0/nanoserver-ltsc2025/amd64/Dockerfile |  9 +-
 .../noble-chiseled-extra/amd64/Dockerfile     | 11 +--
 .../noble-chiseled-extra/arm32v7/Dockerfile   | 11 +--
 .../noble-chiseled-extra/arm64v8/Dockerfile   | 11 +--
 .../11.0/noble-chiseled/amd64/Dockerfile      | 11 +--
 .../11.0/noble-chiseled/arm32v7/Dockerfile    | 11 +--
 .../11.0/noble-chiseled/arm64v8/Dockerfile    | 11 +--
 src/runtime/11.0/noble/amd64/Dockerfile       | 11 +--
 src/runtime/11.0/noble/arm32v7/Dockerfile     | 11 +--
 src/runtime/11.0/noble/arm64v8/Dockerfile     | 11 +--
 .../amd64/Dockerfile                          |  9 +-
 .../amd64/Dockerfile                          |  9 +-
 src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile  |  2 +-
 .../11.0/alpine3.22-aot/arm64v8/Dockerfile    |  2 +-
 src/sdk/11.0/alpine3.22/amd64/Dockerfile      | 13 +--
 src/sdk/11.0/alpine3.22/arm32v7/Dockerfile    | 13 +--
 src/sdk/11.0/alpine3.22/arm64v8/Dockerfile    | 13 +--
 src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile  |  2 +-
 .../11.0/alpine3.23-aot/arm64v8/Dockerfile    |  2 +-
 src/sdk/11.0/alpine3.23/amd64/Dockerfile      | 13 +--
 src/sdk/11.0/alpine3.23/arm32v7/Dockerfile    | 13 +--
 src/sdk/11.0/alpine3.23/arm64v8/Dockerfile    | 13 +--
 .../11.0/azurelinux3.0-aot/amd64/Dockerfile   |  2 +-
 .../11.0/azurelinux3.0-aot/arm64v8/Dockerfile |  2 +-
 src/sdk/11.0/azurelinux3.0/amd64/Dockerfile   | 13 +--
 src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile | 13 +--
 .../11.0/nanoserver-ltsc2022/amd64/Dockerfile | 11 +--
 .../11.0/nanoserver-ltsc2025/amd64/Dockerfile | 11 +--
 src/sdk/11.0/noble-aot/amd64/Dockerfile       |  2 +-
 src/sdk/11.0/noble-aot/arm64v8/Dockerfile     |  2 +-
 src/sdk/11.0/noble/amd64/Dockerfile           | 11 +--
 src/sdk/11.0/noble/arm32v7/Dockerfile         | 11 +--
 src/sdk/11.0/noble/arm64v8/Dockerfile         | 11 +--
 .../amd64/Dockerfile                          | 11 +--
 .../amd64/Dockerfile                          | 11 +--
 ...0-alpine3.22-amd64-Dockerfile.approved.txt |  5 +-
 ...alpine3.22-arm32v7-Dockerfile.approved.txt |  5 +-
 ...alpine3.22-arm64v8-Dockerfile.approved.txt |  5 +-
 ...22-composite-amd64-Dockerfile.approved.txt |  5 +-
 ...-composite-arm32v7-Dockerfile.approved.txt |  5 +-
 ...-composite-arm64v8-Dockerfile.approved.txt |  5 +-
 ...0-alpine3.23-amd64-Dockerfile.approved.txt |  5 +-
 ...alpine3.23-arm32v7-Dockerfile.approved.txt |  5 +-
 ...alpine3.23-arm64v8-Dockerfile.approved.txt |  5 +-
 ...23-composite-amd64-Dockerfile.approved.txt |  5 +-
 ...-composite-arm32v7-Dockerfile.approved.txt |  5 +-
 ...-composite-arm64v8-Dockerfile.approved.txt |  5 +-
 ...zurelinux3.0-amd64-Dockerfile.approved.txt |  5 +-
 ...relinux3.0-arm64v8-Dockerfile.approved.txt |  5 +-
 ...0-distroless-amd64-Dockerfile.approved.txt |  5 +-
 ...distroless-arm64v8-Dockerfile.approved.txt |  5 +-
 ...ss-composite-amd64-Dockerfile.approved.txt |  5 +-
 ...-composite-arm64v8-Dockerfile.approved.txt |  5 +-
 ...posite-extra-amd64-Dockerfile.approved.txt |  5 +-
 ...site-extra-arm64v8-Dockerfile.approved.txt |  5 +-
 ...roless-extra-amd64-Dockerfile.approved.txt |  5 +-
 ...less-extra-arm64v8-Dockerfile.approved.txt |  5 +-
 ...ver-ltsc2022-amd64-Dockerfile.approved.txt |  5 +-
 ...ver-ltsc2025-amd64-Dockerfile.approved.txt |  5 +-
 ...t-11.0-noble-amd64-Dockerfile.approved.txt |  5 +-
 ...11.0-noble-arm32v7-Dockerfile.approved.txt |  5 +-
 ...11.0-noble-arm64v8-Dockerfile.approved.txt |  5 +-
 ...ble-chiseled-amd64-Dockerfile.approved.txt |  5 +-
 ...e-chiseled-arm32v7-Dockerfile.approved.txt |  5 +-
 ...e-chiseled-arm64v8-Dockerfile.approved.txt |  5 +-
 ...ed-composite-amd64-Dockerfile.approved.txt |  5 +-
 ...-composite-arm32v7-Dockerfile.approved.txt |  5 +-
 ...-composite-arm64v8-Dockerfile.approved.txt |  5 +-
 ...posite-extra-amd64-Dockerfile.approved.txt |  5 +-
 ...site-extra-arm32v7-Dockerfile.approved.txt |  5 +-
 ...site-extra-arm64v8-Dockerfile.approved.txt |  5 +-
 ...iseled-extra-amd64-Dockerfile.approved.txt |  5 +-
 ...eled-extra-arm32v7-Dockerfile.approved.txt |  5 +-
 ...eled-extra-arm64v8-Dockerfile.approved.txt |  5 +-
 ...ore-ltsc2022-amd64-Dockerfile.approved.txt |  5 +-
 ...ore-ltsc2025-amd64-Dockerfile.approved.txt |  5 +-
 ...0-alpine3.22-amd64-Dockerfile.approved.txt |  5 +-
 ...alpine3.22-arm32v7-Dockerfile.approved.txt |  5 +-
 ...alpine3.22-arm64v8-Dockerfile.approved.txt |  5 +-
 ...0-alpine3.23-amd64-Dockerfile.approved.txt |  5 +-
 ...alpine3.23-arm32v7-Dockerfile.approved.txt |  5 +-
 ...alpine3.23-arm64v8-Dockerfile.approved.txt |  5 +-
 ...zurelinux3.0-amd64-Dockerfile.approved.txt |  5 +-
 ...relinux3.0-arm64v8-Dockerfile.approved.txt |  5 +-
 ...0-distroless-amd64-Dockerfile.approved.txt |  5 +-
 ...distroless-arm64v8-Dockerfile.approved.txt |  5 +-
 ...roless-extra-amd64-Dockerfile.approved.txt |  5 +-
 ...less-extra-arm64v8-Dockerfile.approved.txt |  5 +-
 ...ver-ltsc2022-amd64-Dockerfile.approved.txt |  5 +-
 ...ver-ltsc2025-amd64-Dockerfile.approved.txt |  5 +-
 ...e-11.0-noble-amd64-Dockerfile.approved.txt |  5 +-
 ...11.0-noble-arm32v7-Dockerfile.approved.txt |  5 +-
 ...11.0-noble-arm64v8-Dockerfile.approved.txt |  5 +-
 ...ble-chiseled-amd64-Dockerfile.approved.txt |  5 +-
 ...e-chiseled-arm32v7-Dockerfile.approved.txt |  5 +-
 ...e-chiseled-arm64v8-Dockerfile.approved.txt |  5 +-
 ...iseled-extra-amd64-Dockerfile.approved.txt |  5 +-
 ...eled-extra-arm32v7-Dockerfile.approved.txt |  5 +-
 ...eled-extra-arm64v8-Dockerfile.approved.txt |  5 +-
 ...ore-ltsc2022-amd64-Dockerfile.approved.txt |  5 +-
 ...ore-ltsc2025-amd64-Dockerfile.approved.txt |  5 +-
 ...0-alpine3.22-amd64-Dockerfile.approved.txt |  5 +-
 ...alpine3.22-arm32v7-Dockerfile.approved.txt |  5 +-
 ...alpine3.22-arm64v8-Dockerfile.approved.txt |  5 +-
 ...0-alpine3.23-amd64-Dockerfile.approved.txt |  5 +-
 ...alpine3.23-arm32v7-Dockerfile.approved.txt |  5 +-
 ...alpine3.23-arm64v8-Dockerfile.approved.txt |  5 +-
 ...zurelinux3.0-amd64-Dockerfile.approved.txt |  5 +-
 ...relinux3.0-arm64v8-Dockerfile.approved.txt |  5 +-
 ...ver-ltsc2022-amd64-Dockerfile.approved.txt |  5 +-
 ...ver-ltsc2025-amd64-Dockerfile.approved.txt |  5 +-
 ...k-11.0-noble-amd64-Dockerfile.approved.txt |  5 +-
 ...11.0-noble-arm32v7-Dockerfile.approved.txt |  5 +-
 ...11.0-noble-arm64v8-Dockerfile.approved.txt |  5 +-
 ...ore-ltsc2022-amd64-Dockerfile.approved.txt |  5 +-
 ...ore-ltsc2025-amd64-Dockerfile.approved.txt |  5 +-
 175 files changed, 900 insertions(+), 738 deletions(-)

diff --git a/README.aspnet.md b/README.aspnet.md
index f2bb35d92c..50663cd82f 100644
--- a/README.aspnet.md
+++ b/README.aspnet.md
@@ -89,19 +89,19 @@ For more information, see the [composite images section in the Image Variants do
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-noble-chiseled-composite-amd64, 11.0-preview-noble-chiseled-composite-amd64, 11.0.0-preview.1.00000.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-noble-chiseled-composite-extra-amd64, 11.0-preview-noble-chiseled-composite-extra-amd64, 11.0.0-preview.1.00000.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
-11.0.0-preview.1.00000.1-alpine3.22-composite-amd64, 11.0-preview-alpine3.22-composite-amd64, 11.0-preview-alpine-composite-amd64, 11.0.0-preview.1.00000.1-alpine3.22-composite, 11.0-preview-alpine3.22-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile) | Alpine 3.22
-11.0.0-preview.1.00000.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/aspnet/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
-11.0.0-preview.1.00000.1-alpine3.23-composite-amd64, 11.0-preview-alpine3.23-composite-amd64, 11.0.0-preview.1.00000.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
-11.0.0-preview.1.00000.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite-amd64, 11.0-preview-azurelinux3.0-distroless-composite-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite, 11.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite-extra-amd64, 11.0-preview-azurelinux3.0-distroless-composite-extra-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite-extra, 11.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-composite-amd64, 11.0-preview-noble-chiseled-composite-amd64, 11.0.0-alpha.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-composite-extra-amd64, 11.0-preview-noble-chiseled-composite-extra-amd64, 11.0.0-alpha.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+11.0.0-alpha.1-alpine3.22-composite-amd64, 11.0-preview-alpine3.22-composite-amd64, 11.0-preview-alpine-composite-amd64, 11.0.0-alpha.1-alpine3.22-composite, 11.0-preview-alpine3.22-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile) | Alpine 3.22
+11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/aspnet/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-composite-amd64, 11.0-preview-alpine3.23-composite-amd64, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-composite-amd64, 11.0-preview-azurelinux3.0-distroless-composite-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-composite, 11.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-composite-extra-amd64, 11.0-preview-azurelinux3.0-distroless-composite-extra-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-composite-extra, 11.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0
 10.0.1-noble-amd64, 10.0-noble-amd64, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/aspnet/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -156,25 +156,25 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-noble-chiseled-composite-arm64v8, 11.0-preview-noble-chiseled-composite-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-noble-chiseled-composite-extra-arm64v8, 11.0-preview-noble-chiseled-composite-extra-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
-11.0.0-preview.1.00000.1-alpine3.22-composite-arm64v8, 11.0-preview-alpine3.22-composite-arm64v8, 11.0-preview-alpine-composite-arm64v8, 11.0.0-preview.1.00000.1-alpine3.22-composite, 11.0-preview-alpine3.22-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile) | Alpine 3.22
-11.0.0-preview.1.00000.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
-11.0.0-preview.1.00000.1-alpine3.23-composite-arm64v8, 11.0-preview-alpine3.23-composite-arm64v8, 11.0.0-preview.1.00000.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
-11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite-arm64v8, 11.0-preview-azurelinux3.0-distroless-composite-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite, 11.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-composite-extra-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-composite-extra, 11.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-composite-arm64v8, 11.0-preview-noble-chiseled-composite-arm64v8, 11.0.0-alpha.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-composite-extra-arm64v8, 11.0-preview-noble-chiseled-composite-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+11.0.0-alpha.1-alpine3.22-composite-arm64v8, 11.0-preview-alpine3.22-composite-arm64v8, 11.0-preview-alpine-composite-arm64v8, 11.0.0-alpha.1-alpine3.22-composite, 11.0-preview-alpine3.22-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile) | Alpine 3.22
+11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-composite-arm64v8, 11.0-preview-alpine3.23-composite-arm64v8, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-composite-arm64v8, 11.0-preview-azurelinux3.0-distroless-composite-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-composite, 11.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-composite-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-composite-extra-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-composite-extra, 11.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.1-noble-arm64v8, 10.0-noble-arm64v8, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/aspnet/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -229,20 +229,20 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-noble-chiseled-composite-arm32v7, 11.0-preview-noble-chiseled-composite-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-noble-chiseled-composite-extra-arm32v7, 11.0-preview-noble-chiseled-composite-extra-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
-11.0.0-preview.1.00000.1-alpine3.22-composite-arm32v7, 11.0-preview-alpine3.22-composite-arm32v7, 11.0-preview-alpine-composite-arm32v7, 11.0.0-preview.1.00000.1-alpine3.22-composite, 11.0-preview-alpine3.22-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile) | Alpine 3.22
-11.0.0-preview.1.00000.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
-11.0.0-preview.1.00000.1-alpine3.23-composite-arm32v7, 11.0-preview-alpine3.23-composite-arm32v7, 11.0.0-preview.1.00000.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-composite-arm32v7, 11.0-preview-noble-chiseled-composite-arm32v7, 11.0.0-alpha.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-composite-extra-arm32v7, 11.0-preview-noble-chiseled-composite-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+11.0.0-alpha.1-alpine3.22-composite-arm32v7, 11.0-preview-alpine3.22-composite-arm32v7, 11.0-preview-alpine-composite-arm32v7, 11.0.0-alpha.1-alpine3.22-composite, 11.0-preview-alpine3.22-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile) | Alpine 3.22
+11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-composite-arm32v7, 11.0-preview-alpine3.23-composite-arm32v7, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
 10.0.1-noble-arm32v7, 10.0-noble-arm32v7, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/aspnet/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
@@ -277,13 +277,13 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 
 ### Nano Server 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-preview.1.00000.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile)
+11.0.0-alpha.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile)
 10.0.1-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile)
 9.0.11-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
 8.0.22-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
@@ -292,7 +292,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-preview.1.00000.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+11.0.0-alpha.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 10.0.1-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 9.0.11-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 8.0.22-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
@@ -301,7 +301,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-preview.1.00000.1-nanoserver-ltsc2022, 11.0-preview-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile)
+11.0.0-alpha.1-nanoserver-ltsc2022, 11.0-preview-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile)
 10.0.1-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile)
 9.0.11-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
 8.0.22-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/8.0/nanoserver-ltsc2022/amd64/Dockerfile)
@@ -310,7 +310,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-preview.1.00000.1-windowsservercore-ltsc2022, 11.0-preview-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile)
+11.0.0-alpha.1-windowsservercore-ltsc2022, 11.0-preview-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 10.0.1-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 9.0.11-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 8.0.22-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)
diff --git a/README.runtime-deps.md b/README.runtime-deps.md
index 3cfb0e002f..4a77f55190 100644
--- a/README.runtime-deps.md
+++ b/README.runtime-deps.md
@@ -71,15 +71,15 @@ They contain the following features:
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
-11.0.0-preview.1.00000.1-alpine3.22-extra-amd64, 11.0-preview-alpine3.22-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.1.00000.1-alpine3.22-extra, 11.0-preview-alpine3.22-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
-11.0.0-preview.1.00000.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
-11.0.0-preview.1.00000.1-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0.0-preview.1.00000.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
-11.0.0-preview.1.00000.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+11.0.0-alpha.1-alpine3.22-extra-amd64, 11.0-preview-alpine3.22-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-alpha.1-alpine3.22-extra, 11.0-preview-alpine3.22-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
+11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
 10.0.1-noble-amd64, 10.0-noble-amd64, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime-deps/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -120,21 +120,21 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
-11.0.0-preview.1.00000.1-alpine3.22-extra-arm64v8, 11.0-preview-alpine3.22-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.1.00000.1-alpine3.22-extra, 11.0-preview-alpine3.22-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
-11.0.0-preview.1.00000.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
-11.0.0-preview.1.00000.1-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0.0-preview.1.00000.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
-11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+11.0.0-alpha.1-alpine3.22-extra-arm64v8, 11.0-preview-alpine3.22-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-alpha.1-alpine3.22-extra, 11.0-preview-alpine3.22-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
+11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.1-noble-arm64v8, 10.0-noble-arm64v8, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime-deps/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -175,18 +175,18 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
-11.0.0-preview.1.00000.1-alpine3.22-extra-arm32v7, 11.0-preview-alpine3.22-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.1.00000.1-alpine3.22-extra, 11.0-preview-alpine3.22-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
-11.0.0-preview.1.00000.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
-11.0.0-preview.1.00000.1-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0.0-preview.1.00000.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+11.0.0-alpha.1-alpine3.22-extra-arm32v7, 11.0-preview-alpine3.22-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-alpha.1-alpine3.22-extra, 11.0-preview-alpine3.22-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
+11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
 10.0.1-noble-arm32v7, 10.0-noble-arm32v7, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime-deps/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
@@ -215,7 +215,7 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 <!--End of generated tags-->
 
 *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/nightly/runtime-deps/tags/list) for all supported and unsupported tags.*
diff --git a/README.runtime.md b/README.runtime.md
index 9f54729957..ac14c566a1 100644
--- a/README.runtime.md
+++ b/README.runtime.md
@@ -78,13 +78,13 @@ They contain the following features:
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
-11.0.0-preview.1.00000.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
-11.0.0-preview.1.00000.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
 10.0.1-noble-amd64, 10.0-noble-amd64, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -119,19 +119,19 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
-11.0.0-preview.1.00000.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
-11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.1-noble-arm64v8, 10.0-noble-arm64v8, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -166,16 +166,16 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-preview.1.00000.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-preview.1.00000.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.1.00000.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
-11.0.0-preview.1.00000.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.0-preview.1.00000.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
 10.0.1-noble-arm32v7, 10.0-noble-arm32v7, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
@@ -198,13 +198,13 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-preview.1.00000.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.0-preview.1.00000.1-noble, 11.0-preview-noble, 11.0.0-preview.1.00000.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 
 ### Nano Server 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-preview.1.00000.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile)
+11.0.0-alpha.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile)
 10.0.1-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile)
 9.0.11-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
 8.0.22-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
@@ -213,7 +213,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-preview.1.00000.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+11.0.0-alpha.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 10.0.1-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 9.0.11-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 8.0.22-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
@@ -222,7 +222,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-preview.1.00000.1-nanoserver-ltsc2022, 11.0-preview-nanoserver-ltsc2022 | [Dockerfile](src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile)
+11.0.0-alpha.1-nanoserver-ltsc2022, 11.0-preview-nanoserver-ltsc2022 | [Dockerfile](src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile)
 10.0.1-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile)
 9.0.11-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
 8.0.22-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/8.0/nanoserver-ltsc2022/amd64/Dockerfile)
@@ -231,7 +231,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-preview.1.00000.1-windowsservercore-ltsc2022, 11.0-preview-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile)
+11.0.0-alpha.1-windowsservercore-ltsc2022, 11.0-preview-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 10.0.1-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 9.0.11-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 8.0.22-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)
diff --git a/README.sdk.md b/README.sdk.md
index 22b58dd746..8d06901048 100644
--- a/README.sdk.md
+++ b/README.sdk.md
@@ -74,13 +74,13 @@ The [Image Variants documentation](https://github.com/dotnet/dotnet-docker/blob/
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.100-preview.1-noble-aot-amd64, 11.0-preview-noble-aot-amd64, 11.0.100-preview.1-noble-aot, 11.0-preview-noble-aot, 11.0.100-preview.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/noble-aot/amd64/Dockerfile) | Ubuntu 24.04
-11.0.100-preview.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.100-preview.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
-11.0.100-preview.1-alpine3.22-aot-amd64, 11.0-preview-alpine3.22-aot-amd64, 11.0-preview-alpine-aot-amd64, 11.0.100-preview.1-alpine3.22-aot, 11.0-preview-alpine3.22-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile) | Alpine 3.22
-11.0.100-preview.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.100-preview.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/sdk/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
-11.0.100-preview.1-alpine3.23-aot-amd64, 11.0-preview-alpine3.23-aot-amd64, 11.0.100-preview.1-alpine3.23-aot, 11.0-preview-alpine3.23-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile) | Alpine 3.23
-11.0.100-preview.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.100-preview.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-11.0.100-preview.1-azurelinux3.0-aot-amd64, 11.0-preview-azurelinux3.0-aot-amd64, 11.0.100-preview.1-azurelinux3.0-aot, 11.0-preview-azurelinux3.0-aot | [Dockerfile](src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile) | Azure Linux 3.0
+11.0.100-alpha.1-noble-aot-amd64, 11.0-preview-noble-aot-amd64, 11.0.100-alpha.1-noble-aot, 11.0-preview-noble-aot, 11.0.100-alpha.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/noble-aot/amd64/Dockerfile) | Ubuntu 24.04
+11.0.100-alpha.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.100-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+11.0.100-alpha.1-alpine3.22-aot-amd64, 11.0-preview-alpine3.22-aot-amd64, 11.0-preview-alpine-aot-amd64, 11.0.100-alpha.1-alpine3.22-aot, 11.0-preview-alpine3.22-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile) | Alpine 3.22
+11.0.100-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.100-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/sdk/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+11.0.100-alpha.1-alpine3.23-aot-amd64, 11.0-preview-alpine3.23-aot-amd64, 11.0.100-alpha.1-alpine3.23-aot, 11.0-preview-alpine3.23-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile) | Alpine 3.23
+11.0.100-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.100-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+11.0.100-alpha.1-azurelinux3.0-aot-amd64, 11.0-preview-azurelinux3.0-aot-amd64, 11.0.100-alpha.1-azurelinux3.0-aot, 11.0-preview-azurelinux3.0-aot | [Dockerfile](src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile) | Azure Linux 3.0
 10.0.101-noble-amd64, 10.0-noble-amd64, 10.0.101-noble, 10.0-noble, 10.0.101, 10.0 | [Dockerfile](src/sdk/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 10.0.101-noble-aot-amd64, 10.0-noble-aot-amd64, 10.0.101-noble-aot, 10.0-noble-aot, 10.0.101-aot, 10.0-aot | [Dockerfile](src/sdk/10.0/noble-aot/amd64/Dockerfile) | Ubuntu 24.04
 10.0.101-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.101-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
@@ -105,19 +105,19 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.100-preview.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.100-preview.1-noble, 11.0-preview-noble, 11.0.100-preview.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+11.0.100-alpha.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.100-alpha.1-noble, 11.0-preview-noble, 11.0.100-alpha.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.100-preview.1-noble-aot-arm64v8, 11.0-preview-noble-aot-arm64v8, 11.0.100-preview.1-noble-aot, 11.0-preview-noble-aot, 11.0.100-preview.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/noble-aot/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.100-preview.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.100-preview.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
-11.0.100-preview.1-alpine3.22-aot-arm64v8, 11.0-preview-alpine3.22-aot-arm64v8, 11.0-preview-alpine-aot-arm64v8, 11.0.100-preview.1-alpine3.22-aot, 11.0-preview-alpine3.22-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile) | Alpine 3.22
-11.0.100-preview.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.100-preview.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/sdk/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
-11.0.100-preview.1-alpine3.23-aot-arm64v8, 11.0-preview-alpine3.23-aot-arm64v8, 11.0.100-preview.1-alpine3.23-aot, 11.0-preview-alpine3.23-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile) | Alpine 3.23
-11.0.100-preview.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.100-preview.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.100-preview.1-azurelinux3.0-aot-arm64v8, 11.0-preview-azurelinux3.0-aot-arm64v8, 11.0.100-preview.1-azurelinux3.0-aot, 11.0-preview-azurelinux3.0-aot | [Dockerfile](src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.100-alpha.1-noble-aot-arm64v8, 11.0-preview-noble-aot-arm64v8, 11.0.100-alpha.1-noble-aot, 11.0-preview-noble-aot, 11.0.100-alpha.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/noble-aot/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.100-alpha.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.100-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+11.0.100-alpha.1-alpine3.22-aot-arm64v8, 11.0-preview-alpine3.22-aot-arm64v8, 11.0-preview-alpine-aot-arm64v8, 11.0.100-alpha.1-alpine3.22-aot, 11.0-preview-alpine3.22-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile) | Alpine 3.22
+11.0.100-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.100-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/sdk/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+11.0.100-alpha.1-alpine3.23-aot-arm64v8, 11.0-preview-alpine3.23-aot-arm64v8, 11.0.100-alpha.1-alpine3.23-aot, 11.0-preview-alpine3.23-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile) | Alpine 3.23
+11.0.100-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.100-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.100-alpha.1-azurelinux3.0-aot-arm64v8, 11.0-preview-azurelinux3.0-aot-arm64v8, 11.0.100-alpha.1-azurelinux3.0-aot, 11.0-preview-azurelinux3.0-aot | [Dockerfile](src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.101-noble-arm64v8, 10.0-noble-arm64v8, 10.0.101-noble, 10.0-noble, 10.0.101, 10.0 | [Dockerfile](src/sdk/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.101-noble-aot-arm64v8, 10.0-noble-aot-arm64v8, 10.0.101-noble-aot, 10.0-noble-aot, 10.0.101-aot, 10.0-aot | [Dockerfile](src/sdk/10.0/noble-aot/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.101-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.101-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
@@ -142,14 +142,14 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.100-preview.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.100-preview.1-noble, 11.0-preview-noble, 11.0.100-preview.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.100-alpha.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.100-alpha.1-noble, 11.0-preview-noble, 11.0.100-alpha.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.100-preview.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.100-preview.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
-11.0.100-preview.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.100-preview.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/sdk/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+11.0.100-alpha.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.100-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+11.0.100-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.100-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/sdk/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
 10.0.101-noble-arm32v7, 10.0-noble-arm32v7, 10.0.101-noble, 10.0-noble, 10.0.101, 10.0 | [Dockerfile](src/sdk/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.101-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.101-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
 10.0.101-alpine3.23-arm32v7, 10.0-alpine3.23-arm32v7, 10.0.101-alpine3.23, 10.0-alpine3.23 | [Dockerfile](src/sdk/10.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
@@ -166,13 +166,13 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.100-preview.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.100-preview.1-noble, 11.0-preview-noble, 11.0.100-preview.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.100-alpha.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.100-alpha.1-noble, 11.0-preview-noble, 11.0.100-alpha.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 
 ### Nano Server 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.100-preview.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile)
+11.0.100-alpha.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile)
 10.0.101-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile)
 9.0.308-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
 8.0.416-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
@@ -181,7 +181,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.100-preview.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+11.0.100-alpha.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 10.0.101-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 9.0.308-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 8.0.416-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
@@ -190,7 +190,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.100-preview.1-nanoserver-ltsc2022, 11.0-preview-nanoserver-ltsc2022 | [Dockerfile](src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile)
+11.0.100-alpha.1-nanoserver-ltsc2022, 11.0-preview-nanoserver-ltsc2022 | [Dockerfile](src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile)
 10.0.101-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile)
 9.0.308-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
 8.0.416-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/8.0/nanoserver-ltsc2022/amd64/Dockerfile)
@@ -199,7 +199,7 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.100-preview.1-windowsservercore-ltsc2022, 11.0-preview-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile)
+11.0.100-alpha.1-windowsservercore-ltsc2022, 11.0-preview-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 10.0.101-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 9.0.308-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 8.0.416-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)
diff --git a/manifest.versions.json b/manifest.versions.json
index 484be299a2..39997bc244 100644
--- a/manifest.versions.json
+++ b/manifest.versions.json
@@ -31,7 +31,7 @@
     "aspnet|8.0|build-version": "8.0.22",
     "aspnet-composite|8.0|build-version": "$(aspnet|8.0|build-version)",
 
-    "aspnet|11.0|build-version": "11.0.0-preview.1.00000.1",
+    "aspnet|11.0|build-version": "11.0.0-alpha.1.25609.108",
     "aspnet-composite|11.0|build-version": "$(aspnet|11.0|build-version)",
 
     "aspnet|10.0|build-version": "10.0.1",
@@ -99,7 +99,7 @@
     "dotnet|10.0|base-url|checksums|main": "$(base-url|public|maintenance|main)",
     "dotnet|10.0|base-url|checksums|nightly": "$(base-url|public|maintenance|nightly)",
 
-    "dotnet|11.0|product-version": "11.0.0-preview.1.00000.1",
+    "dotnet|11.0|product-version": "11.0.0-alpha.1",
     "dotnet|11.0|fixed-tag": "$(dotnet|11.0|product-version)",
     "dotnet|11.0|minor-tag": "11.0-preview",
     "dotnet|11.0|base-url|main": "$(base-url|public|preview|main)",
@@ -225,7 +225,7 @@
     "runtime|8.0|build-version": "8.0.22",
     "runtime|9.0|build-version": "9.0.11",
     "runtime|10.0|build-version": "10.0.1",
-    "runtime|11.0|build-version": "11.0.0-preview.1.00000.1",
+    "runtime|11.0|build-version": "11.0.0-alpha.1.25609.108",
 
     "sdk|8.0|build-version": "8.0.416",
     "sdk|8.0|product-version": "8.0.416",
@@ -254,8 +254,8 @@
     "sdk|10.0|fixed-tag": "$(sdk|10.0|product-version)",
     "sdk|10.0|minor-tag": "$(dotnet|10.0|minor-tag)",
 
-    "sdk|11.0|build-version": "11.0.100-preview.1",
-    "sdk|11.0|product-version": "11.0.100-preview.1",
+    "sdk|11.0|build-version": "11.0.100-alpha.1.25609.108",
+    "sdk|11.0|product-version": "11.0.100-alpha.1",
     "sdk|11.0|base-url|main": "$(dotnet|11.0|base-url|main)",
     "sdk|11.0|base-url|nightly": "$(dotnet|11.0|base-url|nightly)",
     "sdk|11.0|base-url|checksums|main": "$(dotnet|11.0|base-url|checksums|main)",
diff --git a/src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile b/src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile
index c61ec9624e..c1f524d5f5 100644
--- a/src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile
+++ b/src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \
@@ -17,13 +18,13 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64
+FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile
index f5c3e9e8c7..72b6814d47 100644
--- a/src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \
@@ -17,13 +18,13 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile
index fd6065c0a4..aea515b68c 100644
--- a/src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \
@@ -17,13 +18,13 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.22/amd64/Dockerfile b/src/aspnet/11.0/alpine3.22/amd64/Dockerfile
index 96426fdbcf..80fd3eb45c 100644
--- a/src/aspnet/11.0/alpine3.22/amd64/Dockerfile
+++ b/src/aspnet/11.0/alpine3.22/amd64/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -17,9 +18,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64
+FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile
index 0ce1342701..202f14ea68 100644
--- a/src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -17,9 +18,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile
index f412c9df77..3a8c3cadad 100644
--- a/src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -17,9 +18,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile
index 5525428f39..79bca0192e 100644
--- a/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \
@@ -17,13 +18,13 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64
+FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile
index 607eae6531..90b83fb9c4 100644
--- a/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \
@@ -17,13 +18,13 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile
index 3da803332a..df7f8888d6 100644
--- a/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \
@@ -17,13 +18,13 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.23/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23/amd64/Dockerfile
index cc263db756..0d8cb57c1f 100644
--- a/src/aspnet/11.0/alpine3.23/amd64/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23/amd64/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -17,9 +18,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64
+FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile
index 9b68c5981f..102f6f6c7a 100644
--- a/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -17,9 +18,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile
index 69eeed4470..1c00afe57b 100644
--- a/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -17,9 +18,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
index e6d70e08f0..5b6f277583 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
@@ -10,10 +10,11 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
@@ -26,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-amd64
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
index 9c2671364d..17274cebc9 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
@@ -10,10 +10,11 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
@@ -26,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-arm64v8
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
index cad92cca90..16a569ca86 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
@@ -10,10 +10,11 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
@@ -26,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-amd64
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
index 6d422ff9c2..91acdf714d 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
@@ -10,10 +10,11 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
@@ -26,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-arm64v8
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
index 1f7f02f3e6..47999829ad 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
@@ -10,10 +10,11 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -23,9 +24,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-amd64
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
index 7a8f3ffd5d..53ce9da5c8 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
@@ -10,10 +10,11 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -23,9 +24,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-arm64v8
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile
index ec88866b7a..2727ef2b30 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile
@@ -10,10 +10,11 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -23,9 +24,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-amd64
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
index 271b9f6f4d..c16534ea7d 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
@@ -10,10 +10,11 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -23,9 +24,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-arm64v8
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile
index a62be98873..27dadb55ed 100644
--- a/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile
@@ -1,17 +1,18 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-amd64 AS installer
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-amd64 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -21,9 +22,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-amd64
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile
index c155ab35c9..6ceb49d5db 100644
--- a/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile
@@ -1,17 +1,18 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8 AS installer
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-arm64v8 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -21,9 +22,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile
index 0db613af95..7355a02941 100644
--- a/src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile
+++ b/src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile
@@ -10,12 +10,13 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '11.0.0-preview.1.00000.1'; `
+        $aspnetcore_version = '11.0.0-alpha.1'; `
+        $aspnetcore_build_version = $aspnetcore_version + '.25609.108'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
@@ -30,9 +31,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-nanoserver-ltsc2022
+FROM $REPO:11.0.0-alpha.1-nanoserver-ltsc2022
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile
index f7e5664d07..d28275910f 100644
--- a/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -10,12 +10,13 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '11.0.0-preview.1.00000.1'; `
+        $aspnetcore_version = '11.0.0-alpha.1'; `
+        $aspnetcore_build_version = $aspnetcore_version + '.25609.108'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
@@ -30,9 +31,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-nanoserver-ltsc2025
+FROM $REPO:11.0.0-alpha.1-nanoserver-ltsc2025
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile
index 0600e9ba81..49787cfecd 100644
--- a/src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
@@ -20,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-amd64
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile b/src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile
index f3d6661433..da64218833 100644
--- a/src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
@@ -20,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-arm32v7
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
index 5a8ab85882..36ab9cf32f 100644
--- a/src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
@@ -20,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-arm64v8
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile b/src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile
index 6acb787a93..f551281762 100644
--- a/src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile
+++ b/src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
@@ -20,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-amd64
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile b/src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile
index b021eec3b1..0e03d3ce39 100644
--- a/src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
@@ -20,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-arm32v7
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile b/src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile
index d9314d8ba6..2afafe5740 100644
--- a/src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
@@ -20,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-arm64v8
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1 \
+    DOTNET_VERSION=11.0.0-alpha.1 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.1.00000.1
+    ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile b/src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile
index dae19f51eb..81373767df 100644
--- a/src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -17,9 +18,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-amd64
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile
index fb8dfc0361..3ff2ad9f38 100644
--- a/src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -17,9 +18,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-arm32v7
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile
index dfd165c015..a0a4e6b8d3 100644
--- a/src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -17,9 +18,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-arm64v8
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble-chiseled/amd64/Dockerfile b/src/aspnet/11.0/noble-chiseled/amd64/Dockerfile
index 9446be0073..8792cea098 100644
--- a/src/aspnet/11.0/noble-chiseled/amd64/Dockerfile
+++ b/src/aspnet/11.0/noble-chiseled/amd64/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -17,9 +18,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-amd64
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile b/src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile
index b4210f7eef..42aae78967 100644
--- a/src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -17,9 +18,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-arm32v7
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile b/src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile
index 26288b7ec0..4b9f277ffb 100644
--- a/src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -17,9 +18,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-arm64v8
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble/amd64/Dockerfile b/src/aspnet/11.0/noble/amd64/Dockerfile
index fd3ecbafcc..895454d8d6 100644
--- a/src/aspnet/11.0/noble/amd64/Dockerfile
+++ b/src/aspnet/11.0/noble/amd64/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -17,9 +18,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-amd64
+FROM $REPO:11.0.0-alpha.1-noble-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble/arm32v7/Dockerfile b/src/aspnet/11.0/noble/arm32v7/Dockerfile
index eb92c8b97b..d2909beab2 100644
--- a/src/aspnet/11.0/noble/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/noble/arm32v7/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -17,9 +18,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-arm32v7
+FROM $REPO:11.0.0-alpha.1-noble-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/noble/arm64v8/Dockerfile b/src/aspnet/11.0/noble/arm64v8/Dockerfile
index 0846cf31e8..1ba947e9e3 100644
--- a/src/aspnet/11.0/noble/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/noble/arm64v8/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
+RUN aspnetcore_version=11.0.0-alpha.1 \
+    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
@@ -17,9 +18,9 @@ RUN aspnetcore_version=11.0.0-preview.1.00000.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-arm64v8
+FROM $REPO:11.0.0-alpha.1-noble-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
index 7d30132680..d29bff4d8b 100644
--- a/src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
+++ b/src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
@@ -10,12 +10,13 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '11.0.0-preview.1.00000.1'; `
+        $aspnetcore_version = '11.0.0-alpha.1'; `
+        $aspnetcore_build_version = $aspnetcore_version + '.25609.108'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
@@ -30,9 +31,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-windowsservercore-ltsc2022
+FROM $REPO:11.0.0-alpha.1-windowsservercore-ltsc2022
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
index 148442456c..f3e19ce76f 100644
--- a/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -10,12 +10,13 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '11.0.0-preview.1.00000.1'; `
+        $aspnetcore_version = '11.0.0-alpha.1'; `
+        $aspnetcore_build_version = $aspnetcore_version + '.25609.108'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
@@ -30,9 +31,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-preview.1.00000.1-windowsservercore-ltsc2025
+FROM $REPO:11.0.0-alpha.1-windowsservercore-ltsc2025
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.1.00000.1
+ENV ASPNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/runtime/11.0/alpine3.22/amd64/Dockerfile b/src/runtime/11.0/alpine3.22/amd64/Dockerfile
index 8111f6f8e5..6c72e8b1f0 100644
--- a/src/runtime/11.0/alpine3.22/amd64/Dockerfile
+++ b/src/runtime/11.0/alpine3.22/amd64/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
+        https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \
@@ -17,10 +18,10 @@ RUN dotnet_version=11.0.0-preview.1.00000.1 \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64
+FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/alpine3.22/arm32v7/Dockerfile b/src/runtime/11.0/alpine3.22/arm32v7/Dockerfile
index e610f56d37..a0bb0efa72 100644
--- a/src/runtime/11.0/alpine3.22/arm32v7/Dockerfile
+++ b/src/runtime/11.0/alpine3.22/arm32v7/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
+        https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \
@@ -17,10 +18,10 @@ RUN dotnet_version=11.0.0-preview.1.00000.1 \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/alpine3.22/arm64v8/Dockerfile b/src/runtime/11.0/alpine3.22/arm64v8/Dockerfile
index 9f9e08b3b7..c716542fc1 100644
--- a/src/runtime/11.0/alpine3.22/arm64v8/Dockerfile
+++ b/src/runtime/11.0/alpine3.22/arm64v8/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
+        https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \
@@ -17,10 +18,10 @@ RUN dotnet_version=11.0.0-preview.1.00000.1 \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/alpine3.23/amd64/Dockerfile b/src/runtime/11.0/alpine3.23/amd64/Dockerfile
index 05714828bc..4ea8332d28 100644
--- a/src/runtime/11.0/alpine3.23/amd64/Dockerfile
+++ b/src/runtime/11.0/alpine3.23/amd64/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
+        https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \
@@ -17,10 +18,10 @@ RUN dotnet_version=11.0.0-preview.1.00000.1 \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64
+FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile b/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile
index fcf8491a8c..0790cd6a2b 100644
--- a/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
+        https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \
@@ -17,10 +18,10 @@ RUN dotnet_version=11.0.0-preview.1.00000.1 \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile b/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile
index 3353b66c1a..f675e44f26 100644
--- a/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile
@@ -1,13 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
+        https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \
@@ -17,10 +18,10 @@ RUN dotnet_version=11.0.0-preview.1.00000.1 \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
index 9599522a1f..eec7640da6 100644
--- a/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
@@ -10,10 +10,11 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
@@ -26,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-amd64
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
index c370555fba..f8171b7809 100644
--- a/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
@@ -10,10 +10,11 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
@@ -26,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-extra-arm64v8
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile
index 480c382ed9..b7b52bc363 100644
--- a/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile
@@ -10,10 +10,11 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
@@ -26,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-amd64
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
index b23299420f..f9977449eb 100644
--- a/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
@@ -10,10 +10,11 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
@@ -26,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-distroless-arm64v8
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile b/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile
index 689b7c9d8b..0655c46cfb 100644
--- a/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile
@@ -1,17 +1,18 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-amd64 AS installer
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-amd64 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \
@@ -21,10 +22,10 @@ RUN dotnet_version=11.0.0-preview.1.00000.1 \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-amd64
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile
index fece9dfbbc..44a08cea32 100644
--- a/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile
@@ -1,17 +1,18 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8 AS installer
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-arm64v8 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \
@@ -21,10 +22,10 @@ RUN dotnet_version=11.0.0-preview.1.00000.1 \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile
index a3578b4629..dcb0e49193 100644
--- a/src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile
+++ b/src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile
@@ -8,12 +8,13 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '11.0.0-preview.1.00000.1'; `
+        $dotnet_version = '11.0.0-alpha.1'; `
+        $dotnet_build_version = $dotnet_version + '.25609.108'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_build_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
@@ -36,7 +37,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1
+    DOTNET_VERSION=11.0.0-alpha.1
 
 # In order to set system PATH, ContainerAdministrator must be used
 USER ContainerAdministrator
diff --git a/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile
index 06d1812249..b8dd855486 100644
--- a/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -8,12 +8,13 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '11.0.0-preview.1.00000.1'; `
+        $dotnet_version = '11.0.0-alpha.1'; `
+        $dotnet_build_version = $dotnet_version + '.25609.108'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_build_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
@@ -36,7 +37,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1
+    DOTNET_VERSION=11.0.0-alpha.1
 
 # In order to set system PATH, ContainerAdministrator must be used
 USER ContainerAdministrator
diff --git a/src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile
index 81ed4066c7..50604658dd 100644
--- a/src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile
+++ b/src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
@@ -20,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-amd64
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile
index 73a8861df0..21735db288 100644
--- a/src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile
+++ b/src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
@@ -20,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-arm32v7
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile
index 00911ed70a..d487037f5a 100644
--- a/src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile
+++ b/src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
@@ -20,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-extra-arm64v8
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/noble-chiseled/amd64/Dockerfile b/src/runtime/11.0/noble-chiseled/amd64/Dockerfile
index 1b64563f31..6b2563781a 100644
--- a/src/runtime/11.0/noble-chiseled/amd64/Dockerfile
+++ b/src/runtime/11.0/noble-chiseled/amd64/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
@@ -20,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-amd64
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile b/src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile
index 07a8921497..4cfb8701d9 100644
--- a/src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile
+++ b/src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
@@ -20,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-arm32v7
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile
index c8caae1e11..d8a98212aa 100644
--- a/src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile
+++ b/src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
@@ -20,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-chiseled-arm64v8
+FROM $REPO:11.0.0-alpha.1-noble-chiseled-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/noble/amd64/Dockerfile b/src/runtime/11.0/noble/amd64/Dockerfile
index bce1833cfa..ae89a443d9 100644
--- a/src/runtime/11.0/noble/amd64/Dockerfile
+++ b/src/runtime/11.0/noble/amd64/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \
@@ -17,10 +18,10 @@ RUN dotnet_version=11.0.0-preview.1.00000.1 \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-amd64
+FROM $REPO:11.0.0-alpha.1-noble-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/noble/arm32v7/Dockerfile b/src/runtime/11.0/noble/arm32v7/Dockerfile
index 65eb6d8d08..341ba81b8f 100644
--- a/src/runtime/11.0/noble/arm32v7/Dockerfile
+++ b/src/runtime/11.0/noble/arm32v7/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /dotnet \
@@ -17,10 +18,10 @@ RUN dotnet_version=11.0.0-preview.1.00000.1 \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-arm32v7
+FROM $REPO:11.0.0-alpha.1-noble-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/noble/arm64v8/Dockerfile b/src/runtime/11.0/noble/arm64v8/Dockerfile
index 2ee4e20b5b..a8e859fe86 100644
--- a/src/runtime/11.0/noble/arm64v8/Dockerfile
+++ b/src/runtime/11.0/noble/arm64v8/Dockerfile
@@ -4,10 +4,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.1.00000.1 \
+RUN dotnet_version=11.0.0-alpha.1 \
+    && dotnet_build_version=$dotnet_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \
@@ -17,10 +18,10 @@ RUN dotnet_version=11.0.0-preview.1.00000.1 \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-arm64v8
+FROM $REPO:11.0.0-alpha.1-noble-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.1.00000.1
+ENV DOTNET_VERSION=11.0.0-alpha.1
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
index cbcb10f6e6..50b6cfc3cd 100644
--- a/src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
+++ b/src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
@@ -8,12 +8,13 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '11.0.0-preview.1.00000.1'; `
+        $dotnet_version = '11.0.0-alpha.1'; `
+        $dotnet_build_version = $dotnet_version + '.25609.108'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_build_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
@@ -36,7 +37,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1
+    DOTNET_VERSION=11.0.0-alpha.1
 
 RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
 
diff --git a/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
index 57cd4bb2e0..23be1ed9b9 100644
--- a/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -8,12 +8,13 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '11.0.0-preview.1.00000.1'; `
+        $dotnet_version = '11.0.0-alpha.1'; `
+        $dotnet_build_version = $dotnet_version + '.25609.108'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_build_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
@@ -36,7 +37,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.1.00000.1
+    DOTNET_VERSION=11.0.0-alpha.1
 
 RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
 
diff --git a/src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile b/src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile
index 1b912db318..3bb369bb25 100644
--- a/src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile
+++ b/src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:11.0.100-preview.1-alpine3.22-amd64
+FROM $REPO:11.0.100-alpha.1-alpine3.22-amd64
 
 RUN apk add --upgrade --no-cache \
         build-base \
diff --git a/src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile
index 2cfdc7285c..182dd6dac1 100644
--- a/src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile
+++ b/src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:11.0.100-preview.1-alpine3.22-arm64v8
+FROM $REPO:11.0.100-alpha.1-alpine3.22-arm64v8
 
 RUN apk add --upgrade --no-cache \
         build-base \
diff --git a/src/sdk/11.0/alpine3.22/amd64/Dockerfile b/src/sdk/11.0/alpine3.22/amd64/Dockerfile
index 05139089c4..c6ce5b212f 100644
--- a/src/sdk/11.0/alpine3.22/amd64/Dockerfile
+++ b/src/sdk/11.0/alpine3.22/amd64/Dockerfile
@@ -1,12 +1,13 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-preview.1 \
+RUN dotnet_sdk_version=11.0.100-alpha.1 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
+        https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
@@ -16,7 +17,7 @@ RUN dotnet_sdk_version=11.0.100-preview.1 \
 
 
 # .NET SDK image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-amd64
+FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64
 
 ENV \
     # Do not generate certificate
@@ -24,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/11.0/alpine3.22/arm32v7/Dockerfile b/src/sdk/11.0/alpine3.22/arm32v7/Dockerfile
index 9ee9ea28c5..c2c6ef0b82 100644
--- a/src/sdk/11.0/alpine3.22/arm32v7/Dockerfile
+++ b/src/sdk/11.0/alpine3.22/arm32v7/Dockerfile
@@ -1,12 +1,13 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-preview.1 \
+RUN dotnet_sdk_version=11.0.100-alpha.1 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
+        https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
@@ -16,7 +17,7 @@ RUN dotnet_sdk_version=11.0.100-preview.1 \
 
 
 # .NET SDK image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm32v7
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -24,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/11.0/alpine3.22/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.22/arm64v8/Dockerfile
index cd6362a80e..6d0209fce4 100644
--- a/src/sdk/11.0/alpine3.22/arm64v8/Dockerfile
+++ b/src/sdk/11.0/alpine3.22/arm64v8/Dockerfile
@@ -1,12 +1,13 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-preview.1 \
+RUN dotnet_sdk_version=11.0.100-alpha.1 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
+        https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
@@ -16,7 +17,7 @@ RUN dotnet_sdk_version=11.0.100-preview.1 \
 
 
 # .NET SDK image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.22-arm64v8
+FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -24,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile b/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile
index 944fd94369..30577464f7 100644
--- a/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile
+++ b/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:11.0.100-preview.1-alpine3.23-amd64
+FROM $REPO:11.0.100-alpha.1-alpine3.23-amd64
 
 RUN apk add --upgrade --no-cache \
         build-base \
diff --git a/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile
index 022526a3c2..7685998c3a 100644
--- a/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile
+++ b/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:11.0.100-preview.1-alpine3.23-arm64v8
+FROM $REPO:11.0.100-alpha.1-alpine3.23-arm64v8
 
 RUN apk add --upgrade --no-cache \
         build-base \
diff --git a/src/sdk/11.0/alpine3.23/amd64/Dockerfile b/src/sdk/11.0/alpine3.23/amd64/Dockerfile
index 7e019c4586..c22daca9f4 100644
--- a/src/sdk/11.0/alpine3.23/amd64/Dockerfile
+++ b/src/sdk/11.0/alpine3.23/amd64/Dockerfile
@@ -1,12 +1,13 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-preview.1 \
+RUN dotnet_sdk_version=11.0.100-alpha.1 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
+        https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
@@ -16,7 +17,7 @@ RUN dotnet_sdk_version=11.0.100-preview.1 \
 
 
 # .NET SDK image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-amd64
+FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64
 
 ENV \
     # Do not generate certificate
@@ -24,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile b/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile
index 81eb2ea70e..165d207497 100644
--- a/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile
@@ -1,12 +1,13 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-preview.1 \
+RUN dotnet_sdk_version=11.0.100-alpha.1 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
+        https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
@@ -16,7 +17,7 @@ RUN dotnet_sdk_version=11.0.100-preview.1 \
 
 
 # .NET SDK image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm32v7
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -24,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile
index 71bb3b0b22..e6b44da8e8 100644
--- a/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile
@@ -1,12 +1,13 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8 AS installer
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-preview.1 \
+RUN dotnet_sdk_version=11.0.100-alpha.1 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
     && wget \
-        https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
+        https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
@@ -16,7 +17,7 @@ RUN dotnet_sdk_version=11.0.100-preview.1 \
 
 
 # .NET SDK image
-FROM $REPO:11.0.0-preview.1.00000.1-alpine3.23-arm64v8
+FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -24,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile b/src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile
index daa777a711..5e24a3f70f 100644
--- a/src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile
+++ b/src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:11.0.100-preview.1-azurelinux3.0-amd64
+FROM $REPO:11.0.100-alpha.1-azurelinux3.0-amd64
 
 RUN tdnf install -y \
         build-essential \
diff --git a/src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile b/src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile
index 6c42369005..fff607674e 100644
--- a/src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile
+++ b/src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:11.0.100-preview.1-azurelinux3.0-arm64v8
+FROM $REPO:11.0.100-alpha.1-azurelinux3.0-arm64v8
 
 RUN tdnf install -y \
         build-essential \
diff --git a/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile b/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile
index b60866a97d..8ddafa8940 100644
--- a/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile
@@ -1,16 +1,17 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-amd64 AS installer
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-amd64 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-preview.1 \
+RUN dotnet_sdk_version=11.0.100-alpha.1 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
@@ -20,7 +21,7 @@ RUN dotnet_sdk_version=11.0.100-preview.1 \
 
 
 # .NET SDK image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-amd64
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-amd64
 
 ENV \
     # Do not generate certificate
@@ -28,7 +29,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile
index ebee18a412..64a7a7eab4 100644
--- a/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile
@@ -1,16 +1,17 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8 AS installer
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-arm64v8 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-preview.1 \
+RUN dotnet_sdk_version=11.0.100-alpha.1 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
@@ -20,7 +21,7 @@ RUN dotnet_sdk_version=11.0.100-preview.1 \
 
 
 # .NET SDK image
-FROM $REPO:11.0.0-preview.1.00000.1-azurelinux3.0-arm64v8
+FROM $REPO:11.0.0-alpha.1-azurelinux3.0-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -28,7 +29,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile
index 471c727f6a..9d1985c9b1 100644
--- a/src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile
+++ b/src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile
@@ -25,12 +25,13 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '11.0.100-preview.1'; `
+        $dotnet_sdk_version = '11.0.100-alpha.1'; `
+        $dotnet_sdk_build_version = $dotnet_sdk_version + '.25609.108'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
@@ -64,7 +65,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:11.0.0-preview.1.00000.1-nanoserver-ltsc2022
+FROM $REPO:11.0.0-alpha.1-nanoserver-ltsc2022
 
 ENV `
     # Do not generate certificate
@@ -72,7 +73,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-preview.1 `
+    DOTNET_SDK_VERSION=11.0.100-alpha.1 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile
index 3b72439b6c..c425d053e3 100644
--- a/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -25,12 +25,13 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '11.0.100-preview.1'; `
+        $dotnet_sdk_version = '11.0.100-alpha.1'; `
+        $dotnet_sdk_build_version = $dotnet_sdk_version + '.25609.108'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
@@ -64,7 +65,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:11.0.0-preview.1.00000.1-nanoserver-ltsc2025
+FROM $REPO:11.0.0-alpha.1-nanoserver-ltsc2025
 
 ENV `
     # Do not generate certificate
@@ -72,7 +73,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-preview.1 `
+    DOTNET_SDK_VERSION=11.0.100-alpha.1 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/11.0/noble-aot/amd64/Dockerfile b/src/sdk/11.0/noble-aot/amd64/Dockerfile
index ad92933845..8cd7b1faba 100644
--- a/src/sdk/11.0/noble-aot/amd64/Dockerfile
+++ b/src/sdk/11.0/noble-aot/amd64/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:11.0.100-preview.1-noble-amd64
+FROM $REPO:11.0.100-alpha.1-noble-amd64
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
diff --git a/src/sdk/11.0/noble-aot/arm64v8/Dockerfile b/src/sdk/11.0/noble-aot/arm64v8/Dockerfile
index 6198ab4091..eae2fe9407 100644
--- a/src/sdk/11.0/noble-aot/arm64v8/Dockerfile
+++ b/src/sdk/11.0/noble-aot/arm64v8/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:11.0.100-preview.1-noble-arm64v8
+FROM $REPO:11.0.100-alpha.1-noble-arm64v8
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
diff --git a/src/sdk/11.0/noble/amd64/Dockerfile b/src/sdk/11.0/noble/amd64/Dockerfile
index cf961ba65d..0daf12f625 100644
--- a/src/sdk/11.0/noble/amd64/Dockerfile
+++ b/src/sdk/11.0/noble/amd64/Dockerfile
@@ -3,10 +3,11 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-preview.1 \
+RUN dotnet_sdk_version=11.0.100-alpha.1 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
@@ -16,7 +17,7 @@ RUN dotnet_sdk_version=11.0.100-preview.1 \
 
 
 # .NET SDK image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-amd64
+FROM $REPO:11.0.0-alpha.1-noble-amd64
 
 ENV \
     # Do not generate certificate
@@ -24,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/11.0/noble/arm32v7/Dockerfile b/src/sdk/11.0/noble/arm32v7/Dockerfile
index c5f07ecb62..db737c21eb 100644
--- a/src/sdk/11.0/noble/arm32v7/Dockerfile
+++ b/src/sdk/11.0/noble/arm32v7/Dockerfile
@@ -3,10 +3,11 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-preview.1 \
+RUN dotnet_sdk_version=11.0.100-alpha.1 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
@@ -16,7 +17,7 @@ RUN dotnet_sdk_version=11.0.100-preview.1 \
 
 
 # .NET SDK image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-arm32v7
+FROM $REPO:11.0.0-alpha.1-noble-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -24,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/11.0/noble/arm64v8/Dockerfile b/src/sdk/11.0/noble/arm64v8/Dockerfile
index 3d834e70fb..6b41ce23dd 100644
--- a/src/sdk/11.0/noble/arm64v8/Dockerfile
+++ b/src/sdk/11.0/noble/arm64v8/Dockerfile
@@ -3,10 +3,11 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-preview.1 \
+RUN dotnet_sdk_version=11.0.100-alpha.1 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
@@ -16,7 +17,7 @@ RUN dotnet_sdk_version=11.0.100-preview.1 \
 
 
 # .NET SDK image
-FROM $REPO:11.0.0-preview.1.00000.1-noble-arm64v8
+FROM $REPO:11.0.0-alpha.1-noble-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -24,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-preview.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
index c12b8badbe..5eed40acb6 100644
--- a/src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
+++ b/src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
@@ -25,12 +25,13 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '11.0.100-preview.1'; `
+        $dotnet_sdk_version = '11.0.100-alpha.1'; `
+        $dotnet_sdk_build_version = $dotnet_sdk_version + '.25609.108'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
@@ -64,7 +65,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:11.0.0-preview.1.00000.1-windowsservercore-ltsc2022
+FROM $REPO:11.0.0-alpha.1-windowsservercore-ltsc2022
 
 ENV `
     # Do not generate certificate
@@ -72,7 +73,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-preview.1 `
+    DOTNET_SDK_VERSION=11.0.100-alpha.1 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
index e596dcc4d5..90773de419 100644
--- a/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -25,12 +25,13 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '11.0.100-preview.1'; `
+        $dotnet_sdk_version = '11.0.100-alpha.1'; `
+        $dotnet_sdk_build_version = $dotnet_sdk_version + '.25609.108'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
@@ -64,7 +65,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:11.0.0-preview.1.00000.1-windowsservercore-ltsc2025
+FROM $REPO:11.0.0-alpha.1-windowsservercore-ltsc2025
 
 ENV `
     # Do not generate certificate
@@ -72,7 +73,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-preview.1 `
+    DOTNET_SDK_VERSION=11.0.100-alpha.1 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-amd64-Dockerfile.approved.txt
index 57cc13e47c..9068f85424 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-amd64-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
index fecc264cad..65f34758e6 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
index 8b582b3053..86cadbe030 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-amd64-Dockerfile.approved.txt
index 934bed0d0b..1b4ba481c4 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-amd64-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm32v7-Dockerfile.approved.txt
index d4f7e29776..46a8ba7239 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm32v7-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm64v8-Dockerfile.approved.txt
index 971ff2df28..1f4f83d7f5 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.22-composite-arm64v8-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt
index 57cc13e47c..9068f85424 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
index fecc264cad..65f34758e6 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
index 8b582b3053..86cadbe030 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt
index 934bed0d0b..1b4ba481c4 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt
index d4f7e29776..46a8ba7239 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt
index 971ff2df28..1f4f83d7f5 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
index d5dfad3088..c7b8830d9b 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
@@ -11,9 +11,10 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
index c44ba14e88..a4edd6d68b 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
@@ -11,9 +11,10 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
index 7903185595..dbb90ffad3 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
@@ -13,9 +13,10 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
index 5bf3e8670b..a7a7858828 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
@@ -13,9 +13,10 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt
index a1242a0b86..77932f0870 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt
@@ -13,9 +13,10 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt
index a2b9dca9fa..f100092cd1 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt
@@ -13,9 +13,10 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt
index 8342b60432..90a60d84e1 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt
@@ -13,9 +13,10 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt
index c3128df0d3..5754d8469b 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt
@@ -13,9 +13,10 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
index 9e473c85ca..1d4e0dbdfc 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
@@ -13,9 +13,10 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
index 55647a6beb..0dd7271377 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
@@ -13,9 +13,10 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
index 055b3dfa1d..d333d34fc7 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
@@ -13,6 +13,7 @@ RUN powershell -Command `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         $aspnetcore_version = '0.0.0'; `
+        $aspnetcore_build_version = $aspnetcore_version + '.25609.108'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
         `
@@ -20,8 +21,8 @@ RUN powershell -Command `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
index c2cb3ef7d3..6f28c73063 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
@@ -13,6 +13,7 @@ RUN powershell -Command `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         $aspnetcore_version = '0.0.0'; `
+        $aspnetcore_build_version = $aspnetcore_version + '.25609.108'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
         `
@@ -20,8 +21,8 @@ RUN powershell -Command `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-amd64-Dockerfile.approved.txt
index 8dc91c999a..b68c8d2281 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-amd64-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm32v7-Dockerfile.approved.txt
index 7a3ff00ae2..813eddda2f 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm32v7-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm64v8-Dockerfile.approved.txt
index d28739a32d..296b9d430f 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm64v8-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
index d258da52bc..348732dddb 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
index c7f6fb134a..22513254a6 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
index 2c44a5970a..0b2eb02446 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-amd64-Dockerfile.approved.txt
index b3c5467a81..a93a9ae370 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-amd64-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm32v7-Dockerfile.approved.txt
index d47198e5fd..12493dcb5a 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm32v7-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm64v8-Dockerfile.approved.txt
index c3ae522b01..c85d083e0b 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm64v8-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-amd64-Dockerfile.approved.txt
index 63ffb52700..5c6a6848ce 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-amd64-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
index 0003363e50..7b56626ddf 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
index 96f71a926a..6cd0494495 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
index e699dbf047..53620c2b3f 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
index 3abf5598f7..3e0b5f4fe8 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
index b0c49aaffe..aeba0be286 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
index 7911975006..108abd23b5 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
@@ -13,6 +13,7 @@ RUN powershell -Command `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         $aspnetcore_version = '0.0.0'; `
+        $aspnetcore_build_version = $aspnetcore_version + '.25609.108'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
         `
@@ -20,8 +21,8 @@ RUN powershell -Command `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
index 0c0fc95cdf..f69ca1c53f 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
@@ -13,6 +13,7 @@ RUN powershell -Command `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         $aspnetcore_version = '0.0.0'; `
+        $aspnetcore_build_version = $aspnetcore_version + '.25609.108'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
         `
@@ -20,8 +21,8 @@ RUN powershell -Command `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-amd64-Dockerfile.approved.txt
index 32b28e65af..5de9d41bc9 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-amd64-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
index 531f790cac..231c812ac3 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
index 3bb298e1ca..a5fcd904ae 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt
index 32b28e65af..5de9d41bc9 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
index 531f790cac..231c812ac3 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
index 3bb298e1ca..a5fcd904ae 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
index 1661f6e865..011eddd49e 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
@@ -11,9 +11,10 @@ RUN tdnf install -y \
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
index 561daf3a1a..8f772fda4c 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
@@ -11,9 +11,10 @@ RUN tdnf install -y \
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
index c0eb0dfd5b..de3f4ef01a 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
@@ -13,9 +13,10 @@ RUN tdnf install -y \
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
index 64f97a946d..442fe49870 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
@@ -13,9 +13,10 @@ RUN tdnf install -y \
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
index 7b89b776aa..1bb59a810a 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
@@ -13,9 +13,10 @@ RUN tdnf install -y \
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
index 660a144524..33c606ceb2 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
@@ -13,9 +13,10 @@ RUN tdnf install -y \
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
index 9011152344..c5e0ab688f 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
@@ -11,6 +11,7 @@ RUN powershell -Command `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         $dotnet_version = '0.0.0'; `
+        $dotnet_build_version = $dotnet_version + '.25609.108'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
@@ -18,8 +19,8 @@ RUN powershell -Command `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
index d4f1527b5a..869ff75710 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
@@ -11,6 +11,7 @@ RUN powershell -Command `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         $dotnet_version = '0.0.0'; `
+        $dotnet_build_version = $dotnet_version + '.25609.108'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
@@ -18,8 +19,8 @@ RUN powershell -Command `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-amd64-Dockerfile.approved.txt
index dc2de68df3..03acf17fd1 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-amd64-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm32v7-Dockerfile.approved.txt
index 72897c32a4..527e145375 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm32v7-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm64v8-Dockerfile.approved.txt
index 8984eaa268..91fd8cd40e 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm64v8-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
index fc6f1f23d2..e369a0ead2 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
index 57bd96f297..c932546204 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
index d115a80a78..d1b014623c 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
index b36195ea03..96c7f21e28 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
index d2e5f24442..a2ea289ff6 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
index 4b01581877..0112418c3d 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
@@ -7,9 +7,10 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
index 064d0a1b00..e0b7570c73 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
@@ -11,6 +11,7 @@ RUN powershell -Command `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         $dotnet_version = '0.0.0'; `
+        $dotnet_build_version = $dotnet_version + '.25609.108'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
@@ -18,8 +19,8 @@ RUN powershell -Command `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
index a161d997f0..4723617cdb 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
@@ -11,6 +11,7 @@ RUN powershell -Command `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         $dotnet_version = '0.0.0'; `
+        $dotnet_build_version = $dotnet_version + '.25609.108'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
@@ -18,8 +19,8 @@ RUN powershell -Command `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-amd64-Dockerfile.approved.txt
index f3aeb7a6eb..9c802571ba 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-amd64-Dockerfile.approved.txt
@@ -6,9 +6,10 @@ ARG ACCESSTOKEN
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
+    && dotnet_sdk_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
index 34dc206b0e..e65958efad 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm32v7-Dockerfile.approved.txt
@@ -6,9 +6,10 @@ ARG ACCESSTOKEN
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
+    && dotnet_sdk_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
index 691687fa4a..3087254b38 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.22-arm64v8-Dockerfile.approved.txt
@@ -6,9 +6,10 @@ ARG ACCESSTOKEN
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
+    && dotnet_sdk_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt
index e5cce2b97f..850c64ca6b 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt
@@ -6,9 +6,10 @@ ARG ACCESSTOKEN
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
+    && dotnet_sdk_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
index 34dc206b0e..e65958efad 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
@@ -6,9 +6,10 @@ ARG ACCESSTOKEN
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
+    && dotnet_sdk_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
index 691687fa4a..3087254b38 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
@@ -6,9 +6,10 @@ ARG ACCESSTOKEN
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
+    && dotnet_sdk_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
index 0f6b1c0d8c..fc9d466378 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
@@ -10,9 +10,10 @@ RUN tdnf install -y \
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
+    && dotnet_sdk_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
index cba4d6df79..5134936c1e 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
@@ -10,9 +10,10 @@ RUN tdnf install -y \
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
+    && dotnet_sdk_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
index 2514713dfc..b40945361a 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt
@@ -29,6 +29,7 @@ RUN `
         `
         # Retrieve .NET SDK
         $dotnet_sdk_version = '0.0.0'; `
+        $dotnet_sdk_build_version = $dotnet_sdk_version + '.25609.108'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
@@ -36,8 +37,8 @@ RUN `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
index 126cf83a04..0dbd8f62c4 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
@@ -29,6 +29,7 @@ RUN `
         `
         # Retrieve .NET SDK
         $dotnet_sdk_version = '0.0.0'; `
+        $dotnet_sdk_build_version = $dotnet_sdk_version + '.25609.108'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
@@ -36,8 +37,8 @@ RUN `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-amd64-Dockerfile.approved.txt
index 809f546e2b..928ac11581 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-amd64-Dockerfile.approved.txt
@@ -6,9 +6,10 @@ ARG ACCESSTOKEN
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
+    && dotnet_sdk_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm32v7-Dockerfile.approved.txt
index 74368d911a..fe28bdd3bc 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm32v7-Dockerfile.approved.txt
@@ -6,9 +6,10 @@ ARG ACCESSTOKEN
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
+    && dotnet_sdk_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm64v8-Dockerfile.approved.txt
index d7087ff840..91b9a28a85 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm64v8-Dockerfile.approved.txt
@@ -6,9 +6,10 @@ ARG ACCESSTOKEN
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
+    && dotnet_sdk_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
index fb8a140661..06dad30859 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt
@@ -29,6 +29,7 @@ RUN `
         `
         # Retrieve .NET SDK
         $dotnet_sdk_version = '0.0.0'; `
+        $dotnet_sdk_build_version = $dotnet_sdk_version + '.25609.108'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
@@ -36,8 +37,8 @@ RUN `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
index 5aa5d6d377..2b9c409bb5 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
@@ -29,6 +29,7 @@ RUN `
         `
         # Retrieve .NET SDK
         $dotnet_sdk_version = '0.0.0'; `
+        $dotnet_sdk_build_version = $dotnet_sdk_version + '.25609.108'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
@@ -36,8 +37,8 @@ RUN `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `

From 2d12967e67e9fb59ba44d4f563043220d91639ef Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Wed, 10 Dec 2025 13:30:16 -0800
Subject: [PATCH 03/23] Remove .NET 11 Alpine 3.23 and Windows Server 2022
 images

---
 manifest.json                                 | 586 ++----------------
 manifest.versions.json                        |   2 +-
 .../alpine3.22-composite/amd64/Dockerfile     |  30 -
 .../alpine3.22-composite/arm32v7/Dockerfile   |  30 -
 .../alpine3.22-composite/arm64v8/Dockerfile   |  30 -
 src/aspnet/11.0/alpine3.22/amd64/Dockerfile   |  26 -
 src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile |  26 -
 src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile |  26 -
 .../11.0/nanoserver-ltsc2022/amd64/Dockerfile |  39 --
 .../amd64/Dockerfile                          |  39 --
 .../11.0/alpine3.22-extra/amd64/Dockerfile    |  30 -
 .../11.0/alpine3.22-extra/arm32v7/Dockerfile  |  30 -
 .../11.0/alpine3.22-extra/arm64v8/Dockerfile  |  30 -
 .../11.0/alpine3.22/amd64/Dockerfile          |  29 -
 .../11.0/alpine3.22/arm32v7/Dockerfile        |  29 -
 .../11.0/alpine3.22/arm64v8/Dockerfile        |  29 -
 src/runtime/11.0/alpine3.22/amd64/Dockerfile  |  28 -
 .../11.0/alpine3.22/arm32v7/Dockerfile        |  28 -
 .../11.0/alpine3.22/arm64v8/Dockerfile        |  28 -
 .../11.0/nanoserver-ltsc2022/amd64/Dockerfile |  47 --
 .../amd64/Dockerfile                          |  44 --
 src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile  |   8 -
 .../11.0/alpine3.22-aot/arm64v8/Dockerfile    |   8 -
 src/sdk/11.0/alpine3.22/amd64/Dockerfile      |  68 --
 src/sdk/11.0/alpine3.22/arm32v7/Dockerfile    |  48 --
 src/sdk/11.0/alpine3.22/arm64v8/Dockerfile    |  48 --
 .../11.0/nanoserver-ltsc2022/amd64/Dockerfile |  96 ---
 .../amd64/Dockerfile                          |  93 ---
 28 files changed, 55 insertions(+), 1500 deletions(-)
 delete mode 100644 src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.22/amd64/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile
 delete mode 100644 src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile
 delete mode 100644 src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
 delete mode 100644 src/runtime-deps/11.0/alpine3.22-extra/amd64/Dockerfile
 delete mode 100644 src/runtime-deps/11.0/alpine3.22-extra/arm32v7/Dockerfile
 delete mode 100644 src/runtime-deps/11.0/alpine3.22-extra/arm64v8/Dockerfile
 delete mode 100644 src/runtime-deps/11.0/alpine3.22/amd64/Dockerfile
 delete mode 100644 src/runtime-deps/11.0/alpine3.22/arm32v7/Dockerfile
 delete mode 100644 src/runtime-deps/11.0/alpine3.22/arm64v8/Dockerfile
 delete mode 100644 src/runtime/11.0/alpine3.22/amd64/Dockerfile
 delete mode 100644 src/runtime/11.0/alpine3.22/arm32v7/Dockerfile
 delete mode 100644 src/runtime/11.0/alpine3.22/arm64v8/Dockerfile
 delete mode 100644 src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile
 delete mode 100644 src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
 delete mode 100644 src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile
 delete mode 100644 src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile
 delete mode 100644 src/sdk/11.0/alpine3.22/amd64/Dockerfile
 delete mode 100644 src/sdk/11.0/alpine3.22/arm32v7/Dockerfile
 delete mode 100644 src/sdk/11.0/alpine3.22/arm64v8/Dockerfile
 delete mode 100644 src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile
 delete mode 100644 src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile

diff --git a/manifest.json b/manifest.json
index d1d1b5467d..b4e757adfa 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2431,132 +2431,12 @@
             }
           ]
         },
-        {
-          "productVersion": "$(dotnet|11.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|11.0|minor-tag)-alpine": {}
-          },
-          "platforms": [
-            {
-              "dockerfile": "src/runtime-deps/11.0/alpine3.22/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine-amd64": {}
-              }
-            },
-            {
-              "architecture": "arm",
-              "dockerfile": "src/runtime-deps/11.0/alpine3.22/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine-arm32v7": {}
-              },
-              "variant": "v7"
-            },
-            {
-              "architecture": "arm64",
-              "dockerfile": "src/runtime-deps/11.0/alpine3.22/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine-arm64v8": {}
-              },
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|11.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-alpine3.22-extra": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.22-extra": {},
-            "$(dotnet|11.0|minor-tag)-alpine-extra": {}
-          },
-          "platforms": [
-            {
-              "dockerfile": "src/runtime-deps/11.0/alpine3.22-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.22-extra-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.22-extra-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine-extra-amd64": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.22-amd64"
-                  ]
-                }
-              ]
-            },
-            {
-              "architecture": "arm",
-              "dockerfile": "src/runtime-deps/11.0/alpine3.22-extra/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.22-extra-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.22-extra-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine-extra-arm32v7": {}
-              },
-              "variant": "v7",
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.22-arm32v7"
-                  ]
-                }
-              ]
-            },
-            {
-              "architecture": "arm64",
-              "dockerfile": "src/runtime-deps/11.0/alpine3.22-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.22-extra-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.22-extra-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine-extra-arm64v8": {}
-              },
-              "variant": "v8",
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.22-arm64v8"
-                  ]
-                }
-              ]
-            }
-          ]
-        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
             "$(dotnet|11.0|fixed-tag)-alpine3.23": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.23": {}
+            "$(dotnet|11.0|minor-tag)-alpine3.23": {},
+            "$(dotnet|11.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -2566,7 +2446,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-amd64": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.23-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -2577,7 +2458,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -2589,7 +2471,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -2599,7 +2482,8 @@
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
             "$(dotnet|11.0|fixed-tag)-alpine3.23-extra": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.23-extra": {}
+            "$(dotnet|11.0|minor-tag)-alpine3.23-extra": {},
+            "$(dotnet|11.0|minor-tag)-alpine-extra": {}
           },
           "platforms": [
             {
@@ -2609,7 +2493,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.23-extra-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-extra-amd64": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.23-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
@@ -2629,7 +2514,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.23-extra-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-extra-arm32v7": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.23-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-extra-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -2650,7 +2536,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.23-extra-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-extra-arm64v8": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.23-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -5222,67 +5109,12 @@
             }
           ]
         },
-        {
-          "productVersion": "$(dotnet|11.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|11.0|minor-tag)-alpine": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/11.0/alpine3.22/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine-amd64": {}
-              }
-            },
-            {
-              "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/11.0/alpine3.22/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine-arm32v7": {}
-              },
-              "variant": "v7"
-            },
-            {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/11.0/alpine3.22/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine-arm64v8": {}
-              },
-              "variant": "v8"
-            }
-          ]
-        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
             "$(dotnet|11.0|fixed-tag)-alpine3.23": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.23": {}
+            "$(dotnet|11.0|minor-tag)-alpine3.23": {},
+            "$(dotnet|11.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -5295,7 +5127,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-amd64": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.23-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -5309,7 +5142,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -5324,7 +5158,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -5670,21 +5505,6 @@
             }
           ]
         },
-        {
-          "productVersion": "$(dotnet|11.0|product-version)",
-          "platforms": [
-            {
-              "dockerfile": "src/runtime/11.0/nanoserver-ltsc2022/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "nanoserver-ltsc2022",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-nanoserver-ltsc2022": {},
-                "$(dotnet|11.0|minor-tag)-nanoserver-ltsc2022": {}
-              }
-            }
-          ]
-        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "platforms": [
@@ -5700,21 +5520,6 @@
             }
           ]
         },
-        {
-          "productVersion": "$(dotnet|11.0|product-version)",
-          "platforms": [
-            {
-              "dockerfile": "src/runtime/11.0/windowsservercore-ltsc2022/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "windowsservercore-ltsc2022",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-windowsservercore-ltsc2022": {},
-                "$(dotnet|11.0|minor-tag)-windowsservercore-ltsc2022": {}
-              }
-            }
-          ]
-        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "platforms": [
@@ -9328,123 +9133,12 @@
             }
           ]
         },
-        {
-          "productVersion": "$(dotnet|11.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|11.0|minor-tag)-alpine": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/11.0/alpine3.22/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine-amd64": {}
-              }
-            },
-            {
-              "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/11.0/alpine3.22/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine-arm32v7": {}
-              },
-              "variant": "v7"
-            },
-            {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/11.0/alpine3.22/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine-arm64v8": {}
-              },
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|11.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-alpine3.22-composite": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.22-composite": {},
-            "$(dotnet|11.0|minor-tag)-alpine-composite": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/aspnet/11.0/alpine3.22-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.22-composite-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.22-composite-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine-composite-amd64": {}
-              }
-            },
-            {
-              "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/aspnet/11.0/alpine3.22-composite/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.22-composite-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.22-composite-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine-composite-arm32v7": {}
-              },
-              "variant": "v7"
-            },
-            {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/aspnet/11.0/alpine3.22-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.22-composite-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.22-composite-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine-composite-arm64v8": {}
-              },
-              "variant": "v8"
-            }
-          ]
-        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
             "$(dotnet|11.0|fixed-tag)-alpine3.23": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.23": {}
+            "$(dotnet|11.0|minor-tag)-alpine3.23": {},
+            "$(dotnet|11.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -9457,7 +9151,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-amd64": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.23-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -9471,7 +9166,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -9486,7 +9182,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -9496,7 +9193,8 @@
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
             "$(dotnet|11.0|fixed-tag)-alpine3.23-composite": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.23-composite": {}
+            "$(dotnet|11.0|minor-tag)-alpine3.23-composite": {},
+            "$(dotnet|11.0|minor-tag)-alpine-composite": {}
           },
           "platforms": [
             {
@@ -9509,7 +9207,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.23-composite-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-composite-amd64": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.23-composite-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-composite-amd64": {}
               }
             },
             {
@@ -9523,7 +9222,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.23-composite-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-composite-arm32v7": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.23-composite-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-composite-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -9538,7 +9238,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-composite-arm64v8": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.23-composite-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine-composite-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -10140,24 +9841,6 @@
             }
           ]
         },
-        {
-          "productVersion": "$(dotnet|11.0|product-version)",
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/11.0/nanoserver-ltsc2022/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "nanoserver-ltsc2022",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-nanoserver-ltsc2022": {},
-                "$(dotnet|11.0|minor-tag)-nanoserver-ltsc2022": {}
-              }
-            }
-          ]
-        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "platforms": [
@@ -10176,24 +9859,6 @@
             }
           ]
         },
-        {
-          "productVersion": "$(dotnet|11.0|product-version)",
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/11.0/windowsservercore-ltsc2022/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "windowsservercore-ltsc2022",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-windowsservercore-ltsc2022": {},
-                "$(dotnet|11.0|minor-tag)-windowsservercore-ltsc2022": {}
-              }
-            }
-          ]
-        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "platforms": [
@@ -11600,125 +11265,12 @@
             }
           ]
         },
-        {
-          "productVersion": "$(sdk|11.0|product-version)",
-          "sharedTags": {
-            "$(sdk|11.0|fixed-tag)-alpine3.22": {},
-            "$(sdk|11.0|minor-tag)-alpine3.22": {},
-            "$(sdk|11.0|minor-tag)-alpine": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "dockerfile": "src/sdk/11.0/alpine3.22/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(sdk|11.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(sdk|11.0|minor-tag)-alpine3.22-amd64": {},
-                "$(sdk|11.0|minor-tag)-alpine-amd64": {}
-              }
-            },
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "architecture": "arm",
-              "dockerfile": "src/sdk/11.0/alpine3.22/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(sdk|11.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(sdk|11.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(sdk|11.0|minor-tag)-alpine-arm32v7": {}
-              },
-              "variant": "v7"
-            },
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "architecture": "arm64",
-              "dockerfile": "src/sdk/11.0/alpine3.22/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(sdk|11.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(sdk|11.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(sdk|11.0|minor-tag)-alpine-arm64v8": {}
-              },
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "productVersion": "$(sdk|11.0|product-version)",
-          "sharedTags": {
-            "$(sdk|11.0|fixed-tag)-alpine3.22-aot": {},
-            "$(sdk|11.0|minor-tag)-alpine3.22-aot": {},
-            "$(sdk|11.0|minor-tag)-alpine-aot": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:sdk)"
-              },
-              "dockerfile": "src/sdk/11.0/alpine3.22-aot/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(sdk|11.0|fixed-tag)-alpine3.22-aot-amd64": {},
-                "$(sdk|11.0|minor-tag)-alpine3.22-aot-amd64": {},
-                "$(sdk|11.0|minor-tag)-alpine-aot-amd64": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.22-amd64"
-                  ]
-                }
-              ]
-            },
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:sdk)"
-              },
-              "architecture": "arm64",
-              "dockerfile": "src/sdk/11.0/alpine3.22-aot/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
-              "os": "linux",
-              "osVersion": "alpine3.22",
-              "tags": {
-                "$(sdk|11.0|fixed-tag)-alpine3.22-aot-arm64v8": {},
-                "$(sdk|11.0|minor-tag)-alpine3.22-aot-arm64v8": {},
-                "$(sdk|11.0|minor-tag)-alpine-aot-arm64v8": {}
-              },
-              "variant": "v8",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.22-arm64v8"
-                  ]
-                }
-              ]
-            }
-          ]
-        },
         {
           "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
             "$(sdk|11.0|fixed-tag)-alpine3.23": {},
-            "$(sdk|11.0|minor-tag)-alpine3.23": {}
+            "$(sdk|11.0|minor-tag)-alpine3.23": {},
+            "$(sdk|11.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -11731,7 +11283,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|11.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(sdk|11.0|minor-tag)-alpine3.23-amd64": {}
+                "$(sdk|11.0|minor-tag)-alpine3.23-amd64": {},
+                "$(sdk|11.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -11745,7 +11298,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|11.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(sdk|11.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(sdk|11.0|minor-tag)-alpine3.23-arm32v7": {},
+                "$(sdk|11.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -11760,7 +11314,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|11.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(sdk|11.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(sdk|11.0|minor-tag)-alpine3.23-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -11770,7 +11325,8 @@
           "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
             "$(sdk|11.0|fixed-tag)-alpine3.23-aot": {},
-            "$(sdk|11.0|minor-tag)-alpine3.23-aot": {}
+            "$(sdk|11.0|minor-tag)-alpine3.23-aot": {},
+            "$(sdk|11.0|minor-tag)-alpine-aot": {}
           },
           "platforms": [
             {
@@ -11783,7 +11339,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|11.0|fixed-tag)-alpine3.23-aot-amd64": {},
-                "$(sdk|11.0|minor-tag)-alpine3.23-aot-amd64": {}
+                "$(sdk|11.0|minor-tag)-alpine3.23-aot-amd64": {},
+                "$(sdk|11.0|minor-tag)-alpine-aot-amd64": {}
               },
               "customBuildLegGroups": [
                 {
@@ -11806,7 +11363,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|11.0|fixed-tag)-alpine3.23-aot-arm64v8": {},
-                "$(sdk|11.0|minor-tag)-alpine3.23-aot-arm64v8": {}
+                "$(sdk|11.0|minor-tag)-alpine3.23-aot-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-alpine-aot-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -11895,24 +11453,6 @@
             }
           ]
         },
-        {
-          "productVersion": "$(sdk|11.0|product-version)",
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "dockerfile": "src/sdk/11.0/nanoserver-ltsc2022/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "nanoserver-ltsc2022",
-              "tags": {
-                "$(sdk|11.0|fixed-tag)-nanoserver-ltsc2022": {},
-                "$(sdk|11.0|minor-tag)-nanoserver-ltsc2022": {}
-              }
-            }
-          ]
-        },
         {
           "productVersion": "$(sdk|11.0|product-version)",
           "platforms": [
@@ -11931,24 +11471,6 @@
             }
           ]
         },
-        {
-          "productVersion": "$(sdk|11.0|product-version)",
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "dockerfile": "src/sdk/11.0/windowsservercore-ltsc2022/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.windows",
-              "os": "windows",
-              "osVersion": "windowsservercore-ltsc2022",
-              "tags": {
-                "$(sdk|11.0|fixed-tag)-windowsservercore-ltsc2022": {},
-                "$(sdk|11.0|minor-tag)-windowsservercore-ltsc2022": {}
-              }
-            }
-          ]
-        },
         {
           "productVersion": "$(sdk|11.0|product-version)",
           "platforms": [
diff --git a/manifest.versions.json b/manifest.versions.json
index 39997bc244..713ec64dc5 100644
--- a/manifest.versions.json
+++ b/manifest.versions.json
@@ -13,7 +13,7 @@
     "base-url|public-checksums|preview|nightly": "https://ci.dot.net/public-checksums",
 
     "alpine|floating-tag-version": "alpine3.22",
-    "alpine|11.0|floating-tag-version": "$(alpine|floating-tag-version)",
+    "alpine|11.0|floating-tag-version": "alpine3.23",
     "alpine|10.0|floating-tag-version": "$(alpine|floating-tag-version)",
     "alpine|9.0|floating-tag-version": "$(alpine|floating-tag-version)",
     "alpine|8.0|floating-tag-version": "$(alpine|floating-tag-version)",
diff --git a/src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile b/src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile
deleted file mode 100644
index c1f524d5f5..0000000000
--- a/src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64 AS installer
-
-# Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
-    && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
-    && mkdir --parents /dotnet \
-    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \
-    && rm \
-        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
-        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512
-
-
-# ASP.NET Composite Image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64
-
-ENV \
-    # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
-    # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
-RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile
deleted file mode 100644
index 72b6814d47..0000000000
--- a/src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7 AS installer
-
-# Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
-    && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
-    && mkdir --parents /dotnet \
-    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \
-    && rm \
-        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
-        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512
-
-
-# ASP.NET Composite Image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7
-
-ENV \
-    # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
-    # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
-RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile
deleted file mode 100644
index aea515b68c..0000000000
--- a/src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8 AS installer
-
-# Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
-    && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
-    && mkdir --parents /dotnet \
-    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \
-    && rm \
-        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512
-
-
-# ASP.NET Composite Image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8
-
-ENV \
-    # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
-    # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
-RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.22/amd64/Dockerfile b/src/aspnet/11.0/alpine3.22/amd64/Dockerfile
deleted file mode 100644
index 80fd3eb45c..0000000000
--- a/src/aspnet/11.0/alpine3.22/amd64/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime
-
-# Installer image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64 AS installer
-
-# Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
-    && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
-    && mkdir --parents /dotnet \
-    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
-    && rm \
-        aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
-        aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512
-
-
-# ASP.NET Core image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64
-
-# ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile
deleted file mode 100644
index 202f14ea68..0000000000
--- a/src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime
-
-# Installer image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7 AS installer
-
-# Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
-    && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
-    && mkdir --parents /dotnet \
-    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
-    && rm \
-        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
-        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512
-
-
-# ASP.NET Core image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7
-
-# ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile
deleted file mode 100644
index 3a8c3cadad..0000000000
--- a/src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime
-
-# Installer image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8 AS installer
-
-# Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
-    && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
-    && mkdir --parents /dotnet \
-    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
-    && rm \
-        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512
-
-
-# ASP.NET Core image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8
-
-# ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile
deleted file mode 100644
index 7355a02941..0000000000
--- a/src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-# escape=`
-
-ARG REPO=mcr.microsoft.com/dotnet/runtime
-
-# Installer image
-FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
-
-# Install ASP.NET Core Runtime
-RUN powershell -Command `
-        $ErrorActionPreference = 'Stop'; `
-        $ProgressPreference = 'SilentlyContinue'; `
-        `
-        $aspnetcore_version = '11.0.0-alpha.1'; `
-        $aspnetcore_build_version = $aspnetcore_version + '.25609.108'; `
-        $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
-        $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
-        `
-        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file; `
-        `
-        if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
-            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
-            exit 1; `
-        }; `
-        `
-        mkdir dotnet; `
-        tar --gzip --extract --no-same-owner --file $aspnetcore_file --directory dotnet ./shared/Microsoft.AspNetCore.App; `
-        Remove-Item -Force `
-            $aspnetcore_file, `
-            $dotnet_sha512_file
-
-
-# ASP.NET Core image
-FROM $REPO:11.0.0-alpha.1-nanoserver-ltsc2022
-
-# ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
-
-COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
deleted file mode 100644
index d29bff4d8b..0000000000
--- a/src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-# escape=`
-
-ARG REPO=mcr.microsoft.com/dotnet/runtime
-
-# Installer image
-FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
-
-# Install ASP.NET Core Runtime
-RUN powershell -Command `
-        $ErrorActionPreference = 'Stop'; `
-        $ProgressPreference = 'SilentlyContinue'; `
-        `
-        $aspnetcore_version = '11.0.0-alpha.1'; `
-        $aspnetcore_build_version = $aspnetcore_version + '.25609.108'; `
-        $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
-        $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
-        `
-        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file; `
-        `
-        if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
-            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
-            exit 1; `
-        }; `
-        `
-        mkdir dotnet; `
-        tar --gzip --extract --no-same-owner --file $aspnetcore_file --directory dotnet ./shared/Microsoft.AspNetCore.App; `
-        Remove-Item -Force `
-            $aspnetcore_file, `
-            $dotnet_sha512_file
-
-
-# ASP.NET Core image
-FROM $REPO:11.0.0-alpha.1-windowsservercore-ltsc2022
-
-# ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
-
-COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/runtime-deps/11.0/alpine3.22-extra/amd64/Dockerfile b/src/runtime-deps/11.0/alpine3.22-extra/amd64/Dockerfile
deleted file mode 100644
index c9dc3b1da2..0000000000
--- a/src/runtime-deps/11.0/alpine3.22-extra/amd64/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM amd64/alpine:3.22
-
-ENV \
-    # UID of the non-root user 'app'
-    APP_UID=1654 \
-    # Configure web servers to bind to port 8080 when present
-    ASPNETCORE_HTTP_PORTS=8080 \
-    # Enable detection of running in a container
-    DOTNET_RUNNING_IN_CONTAINER=true
-
-RUN apk add --upgrade --no-cache \
-        ca-certificates-bundle \
-        \
-        # .NET dependencies
-        icu-data-full \
-        icu-libs \
-        libgcc \
-        libssl3 \
-        libstdc++ \
-        tzdata
-
-# Create a non-root user and group
-RUN addgroup \
-        --gid=$APP_UID \
-        app \
-    && adduser \
-        --uid=$APP_UID \
-        --ingroup=app \
-        --disabled-password \
-        app
diff --git a/src/runtime-deps/11.0/alpine3.22-extra/arm32v7/Dockerfile b/src/runtime-deps/11.0/alpine3.22-extra/arm32v7/Dockerfile
deleted file mode 100644
index dfa4053e2f..0000000000
--- a/src/runtime-deps/11.0/alpine3.22-extra/arm32v7/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM arm32v7/alpine:3.22
-
-ENV \
-    # UID of the non-root user 'app'
-    APP_UID=1654 \
-    # Configure web servers to bind to port 8080 when present
-    ASPNETCORE_HTTP_PORTS=8080 \
-    # Enable detection of running in a container
-    DOTNET_RUNNING_IN_CONTAINER=true
-
-RUN apk add --upgrade --no-cache \
-        ca-certificates-bundle \
-        \
-        # .NET dependencies
-        icu-data-full \
-        icu-libs \
-        libgcc \
-        libssl3 \
-        libstdc++ \
-        tzdata
-
-# Create a non-root user and group
-RUN addgroup \
-        --gid=$APP_UID \
-        app \
-    && adduser \
-        --uid=$APP_UID \
-        --ingroup=app \
-        --disabled-password \
-        app
diff --git a/src/runtime-deps/11.0/alpine3.22-extra/arm64v8/Dockerfile b/src/runtime-deps/11.0/alpine3.22-extra/arm64v8/Dockerfile
deleted file mode 100644
index 7c25ae6f2e..0000000000
--- a/src/runtime-deps/11.0/alpine3.22-extra/arm64v8/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM arm64v8/alpine:3.22
-
-ENV \
-    # UID of the non-root user 'app'
-    APP_UID=1654 \
-    # Configure web servers to bind to port 8080 when present
-    ASPNETCORE_HTTP_PORTS=8080 \
-    # Enable detection of running in a container
-    DOTNET_RUNNING_IN_CONTAINER=true
-
-RUN apk add --upgrade --no-cache \
-        ca-certificates-bundle \
-        \
-        # .NET dependencies
-        icu-data-full \
-        icu-libs \
-        libgcc \
-        libssl3 \
-        libstdc++ \
-        tzdata
-
-# Create a non-root user and group
-RUN addgroup \
-        --gid=$APP_UID \
-        app \
-    && adduser \
-        --uid=$APP_UID \
-        --ingroup=app \
-        --disabled-password \
-        app
diff --git a/src/runtime-deps/11.0/alpine3.22/amd64/Dockerfile b/src/runtime-deps/11.0/alpine3.22/amd64/Dockerfile
deleted file mode 100644
index c3042512d9..0000000000
--- a/src/runtime-deps/11.0/alpine3.22/amd64/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM amd64/alpine:3.22
-
-ENV \
-    # UID of the non-root user 'app'
-    APP_UID=1654 \
-    # Configure web servers to bind to port 8080 when present
-    ASPNETCORE_HTTP_PORTS=8080 \
-    # Enable detection of running in a container
-    DOTNET_RUNNING_IN_CONTAINER=true \
-    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
-
-RUN apk add --upgrade --no-cache \
-        ca-certificates-bundle \
-        \
-        # .NET dependencies
-        libgcc \
-        libssl3 \
-        libstdc++
-
-# Create a non-root user and group
-RUN addgroup \
-        --gid=$APP_UID \
-        app \
-    && adduser \
-        --uid=$APP_UID \
-        --ingroup=app \
-        --disabled-password \
-        app
diff --git a/src/runtime-deps/11.0/alpine3.22/arm32v7/Dockerfile b/src/runtime-deps/11.0/alpine3.22/arm32v7/Dockerfile
deleted file mode 100644
index a543d8c074..0000000000
--- a/src/runtime-deps/11.0/alpine3.22/arm32v7/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM arm32v7/alpine:3.22
-
-ENV \
-    # UID of the non-root user 'app'
-    APP_UID=1654 \
-    # Configure web servers to bind to port 8080 when present
-    ASPNETCORE_HTTP_PORTS=8080 \
-    # Enable detection of running in a container
-    DOTNET_RUNNING_IN_CONTAINER=true \
-    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
-
-RUN apk add --upgrade --no-cache \
-        ca-certificates-bundle \
-        \
-        # .NET dependencies
-        libgcc \
-        libssl3 \
-        libstdc++
-
-# Create a non-root user and group
-RUN addgroup \
-        --gid=$APP_UID \
-        app \
-    && adduser \
-        --uid=$APP_UID \
-        --ingroup=app \
-        --disabled-password \
-        app
diff --git a/src/runtime-deps/11.0/alpine3.22/arm64v8/Dockerfile b/src/runtime-deps/11.0/alpine3.22/arm64v8/Dockerfile
deleted file mode 100644
index ab50a7bde1..0000000000
--- a/src/runtime-deps/11.0/alpine3.22/arm64v8/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM arm64v8/alpine:3.22
-
-ENV \
-    # UID of the non-root user 'app'
-    APP_UID=1654 \
-    # Configure web servers to bind to port 8080 when present
-    ASPNETCORE_HTTP_PORTS=8080 \
-    # Enable detection of running in a container
-    DOTNET_RUNNING_IN_CONTAINER=true \
-    # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20)
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
-
-RUN apk add --upgrade --no-cache \
-        ca-certificates-bundle \
-        \
-        # .NET dependencies
-        libgcc \
-        libssl3 \
-        libstdc++
-
-# Create a non-root user and group
-RUN addgroup \
-        --gid=$APP_UID \
-        app \
-    && adduser \
-        --uid=$APP_UID \
-        --ingroup=app \
-        --disabled-password \
-        app
diff --git a/src/runtime/11.0/alpine3.22/amd64/Dockerfile b/src/runtime/11.0/alpine3.22/amd64/Dockerfile
deleted file mode 100644
index 6c72e8b1f0..0000000000
--- a/src/runtime/11.0/alpine3.22/amd64/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64 AS installer
-
-# Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
-    && wget \
-        https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \
-    && mkdir --parents /dotnet \
-    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \
-    && rm \
-        dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
-        dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512
-
-
-# .NET runtime image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64
-
-# .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
-
-RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/alpine3.22/arm32v7/Dockerfile b/src/runtime/11.0/alpine3.22/arm32v7/Dockerfile
deleted file mode 100644
index a0bb0efa72..0000000000
--- a/src/runtime/11.0/alpine3.22/arm32v7/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7 AS installer
-
-# Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
-    && wget \
-        https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \
-    && mkdir --parents /dotnet \
-    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \
-    && rm \
-        dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
-        dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512
-
-
-# .NET runtime image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7
-
-# .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
-
-RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/alpine3.22/arm64v8/Dockerfile b/src/runtime/11.0/alpine3.22/arm64v8/Dockerfile
deleted file mode 100644
index c716542fc1..0000000000
--- a/src/runtime/11.0/alpine3.22/arm64v8/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8 AS installer
-
-# Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
-    && wget \
-        https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
-    && mkdir --parents /dotnet \
-    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \
-    && rm \
-        dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
-        dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512
-
-
-# .NET runtime image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8
-
-# .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
-
-RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile
deleted file mode 100644
index dcb0e49193..0000000000
--- a/src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile
+++ /dev/null
@@ -1,47 +0,0 @@
-# escape=`
-
-# Installer image
-FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
-
-# Retrieve .NET Runtime
-RUN powershell -Command `
-        $ErrorActionPreference = 'Stop'; `
-        $ProgressPreference = 'SilentlyContinue'; `
-        `
-        $dotnet_version = '11.0.0-alpha.1'; `
-        $dotnet_build_version = $dotnet_version + '.25609.108'; `
-        $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
-        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
-        `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_build_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/$dotnet_sha512_file; `
-        `
-        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
-            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
-            exit 1; `
-        }; `
-        `
-        mkdir dotnet; `
-        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
-        Remove-Item -Force `
-            $dotnet_file, `
-            $dotnet_sha512_file
-
-
-# Runtime image
-FROM mcr.microsoft.com/windows/nanoserver:ltsc2022-amd64
-
-ENV `
-    # Configure web servers to bind to port 8080 when present
-    ASPNETCORE_HTTP_PORTS=8080 `
-    # Enable detection of running in a container
-    DOTNET_RUNNING_IN_CONTAINER=true `
-    # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1
-
-# In order to set system PATH, ContainerAdministrator must be used
-USER ContainerAdministrator
-RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
-USER ContainerUser
-
-COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
diff --git a/src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
deleted file mode 100644
index 50b6cfc3cd..0000000000
--- a/src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
+++ /dev/null
@@ -1,44 +0,0 @@
-# escape=`
-
-# Installer image
-FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
-
-# Retrieve .NET Runtime
-RUN powershell -Command `
-        $ErrorActionPreference = 'Stop'; `
-        $ProgressPreference = 'SilentlyContinue'; `
-        `
-        $dotnet_version = '11.0.0-alpha.1'; `
-        $dotnet_build_version = $dotnet_version + '.25609.108'; `
-        $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
-        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
-        `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_build_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/$dotnet_sha512_file; `
-        `
-        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
-            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
-            exit 1; `
-        }; `
-        `
-        mkdir dotnet; `
-        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
-        Remove-Item -Force `
-            $dotnet_file, `
-            $dotnet_sha512_file
-
-
-# Runtime image
-FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64
-
-ENV `
-    # Configure web servers to bind to port 8080 when present
-    ASPNETCORE_HTTP_PORTS=8080 `
-    # Enable detection of running in a container
-    DOTNET_RUNNING_IN_CONTAINER=true `
-    # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1
-
-RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
-
-COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
diff --git a/src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile b/src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile
deleted file mode 100644
index 3bb369bb25..0000000000
--- a/src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# syntax=docker/dockerfile:1
-ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:11.0.100-alpha.1-alpine3.22-amd64
-
-RUN apk add --upgrade --no-cache \
-        build-base \
-        clang \
-        zlib-dev
diff --git a/src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile
deleted file mode 100644
index 182dd6dac1..0000000000
--- a/src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# syntax=docker/dockerfile:1
-ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:11.0.100-alpha.1-alpine3.22-arm64v8
-
-RUN apk add --upgrade --no-cache \
-        build-base \
-        clang \
-        zlib-dev
diff --git a/src/sdk/11.0/alpine3.22/amd64/Dockerfile b/src/sdk/11.0/alpine3.22/amd64/Dockerfile
deleted file mode 100644
index c6ce5b212f..0000000000
--- a/src/sdk/11.0/alpine3.22/amd64/Dockerfile
+++ /dev/null
@@ -1,68 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-# Installer image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64 AS installer
-
-# Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-alpha.1 \
-    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
-    && wget \
-        https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
-    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" | sha512sum -c - \
-    && mkdir --parents /dotnet \
-    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
-    && rm \
-        dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
-        dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512
-
-
-# .NET SDK image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-amd64
-
-ENV \
-    # Do not generate certificate
-    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
-    # Do not show first run text
-    DOTNET_NOLOGO=true \
-    # SDK version
-    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
-    # Disable the invariant mode (set in base image)
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    # Enable correct mode for dotnet watch (only mode supported in a container)
-    DOTNET_USE_POLLING_FILE_WATCHER=true \
-    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
-    NUGET_XMLDOC_MODE=skip \
-    # PowerShell telemetry for docker image usage
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.22 \
-    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
-    DOTNET_ROLL_FORWARD=Major
-
-RUN apk add --upgrade --no-cache \
-        curl \
-        git \
-        icu-data-full \
-        icu-libs \
-        libatomic \
-        tzdata
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
-
-RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
-    # Trigger first run experience by running arbitrary cmd
-    && dotnet help
-
-# Install PowerShell global tool
-RUN powershell_version=7.6.0-preview.4 \
-    && wget --output-document PowerShell.Linux.Alpine.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.Alpine.$powershell_version.nupkg \
-    && powershell_sha512='d0b0e5822a49371f632605a087aed11e71943899c7e910ba510dd848270e56b449b02d425f23333139054ae37f298241c071ca15a77c945af7d4d39c15ac74a6' \
-    && echo "$powershell_sha512  PowerShell.Linux.Alpine.$powershell_version.nupkg" | sha512sum -c - \
-    && mkdir --parents /usr/share/powershell \
-    && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.Alpine \
-    && dotnet nuget locals all --clear \
-    && rm PowerShell.Linux.Alpine.$powershell_version.nupkg \
-    && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \
-    && chmod 755 /usr/share/powershell/pwsh \
-    # To reduce image size, remove the copy nupkg that nuget keeps.
-    && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm \
-    # Add ncurses-terminfo-base to resolve psreadline dependency
-    && apk add --no-cache ncurses-terminfo-base
diff --git a/src/sdk/11.0/alpine3.22/arm32v7/Dockerfile b/src/sdk/11.0/alpine3.22/arm32v7/Dockerfile
deleted file mode 100644
index c2c6ef0b82..0000000000
--- a/src/sdk/11.0/alpine3.22/arm32v7/Dockerfile
+++ /dev/null
@@ -1,48 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-# Installer image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7 AS installer
-
-# Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-alpha.1 \
-    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
-    && wget \
-        https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
-    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" | sha512sum -c - \
-    && mkdir --parents /dotnet \
-    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
-    && rm \
-        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
-        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512
-
-
-# .NET SDK image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm32v7
-
-ENV \
-    # Do not generate certificate
-    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
-    # Do not show first run text
-    DOTNET_NOLOGO=true \
-    # SDK version
-    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
-    # Disable the invariant mode (set in base image)
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    # Enable correct mode for dotnet watch (only mode supported in a container)
-    DOTNET_USE_POLLING_FILE_WATCHER=true \
-    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
-    NUGET_XMLDOC_MODE=skip 
-
-RUN apk add --upgrade --no-cache \
-        curl \
-        git \
-        icu-data-full \
-        icu-libs \
-        libatomic \
-        tzdata
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
-
-RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
-    # Trigger first run experience by running arbitrary cmd
-    && dotnet help
diff --git a/src/sdk/11.0/alpine3.22/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.22/arm64v8/Dockerfile
deleted file mode 100644
index 6d0209fce4..0000000000
--- a/src/sdk/11.0/alpine3.22/arm64v8/Dockerfile
+++ /dev/null
@@ -1,48 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-# Installer image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8 AS installer
-
-# Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-alpha.1 \
-    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
-    && wget \
-        https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
-    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
-    && mkdir --parents /dotnet \
-    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
-    && rm \
-        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
-        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512
-
-
-# .NET SDK image
-FROM $REPO:11.0.0-alpha.1-alpine3.22-arm64v8
-
-ENV \
-    # Do not generate certificate
-    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
-    # Do not show first run text
-    DOTNET_NOLOGO=true \
-    # SDK version
-    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
-    # Disable the invariant mode (set in base image)
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    # Enable correct mode for dotnet watch (only mode supported in a container)
-    DOTNET_USE_POLLING_FILE_WATCHER=true \
-    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
-    NUGET_XMLDOC_MODE=skip 
-
-RUN apk add --upgrade --no-cache \
-        curl \
-        git \
-        icu-data-full \
-        icu-libs \
-        libatomic \
-        tzdata
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
-
-RUN ln -s /usr/share/dotnet/dnx /usr/bin/dnx \
-    # Trigger first run experience by running arbitrary cmd
-    && dotnet help
diff --git a/src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile
deleted file mode 100644
index 9d1985c9b1..0000000000
--- a/src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile
+++ /dev/null
@@ -1,96 +0,0 @@
-# escape=`
-
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-
-# Installer image
-FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
-
-# Download MinGit
-RUN powershell -Command " `
-        $ErrorActionPreference = 'Stop'; `
-        $ProgressPreference = 'SilentlyContinue'; `
-        `
-        Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; `
-        $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; `
-        if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { `
-            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
-            exit 1; `
-        }; `
-        mkdir MinGit; `
-        tar --gzip --extract --no-same-owner --file mingit.zip --directory MinGit; `
-        Remove-Item -Force mingit.zip"
-
-RUN powershell -Command " `
-        $ErrorActionPreference = 'Stop'; `
-        $ProgressPreference = 'SilentlyContinue'; `
-        `
-        # Retrieve .NET SDK
-        $dotnet_sdk_version = '11.0.100-alpha.1'; `
-        $dotnet_sdk_build_version = $dotnet_sdk_version + '.25609.108'; `
-        $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
-        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
-        `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file; `
-        `
-        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
-            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
-            exit 1; `
-        }; `
-        `
-        mkdir dotnet; `
-        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
-        Remove-Item -Force `
-            $dotnet_file, `
-            $dotnet_sha512_file; `
-        `
-        # Install PowerShell global tool
-        $powershell_version = '7.6.0-preview.4'; `
-        Invoke-WebRequest -OutFile PowerShell.Windows.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Windows.x64.$powershell_version.nupkg; `
-        $powershell_sha512 = 'a529408a93ca2be753d84137bff8ed95dc9301faf2da62fbd9d7bfb29fe502bfca9427736b1004884e839e3f2585ac613349f0fbbb97ea6f979b115dcf06aa0c'; `
-        if ((Get-FileHash PowerShell.Windows.x64.$powershell_version.nupkg -Algorithm sha512).Hash -ne $powershell_sha512) { `
-            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
-            exit 1; `
-        }; `
-        & \dotnet\dotnet tool install --add-source . --tool-path \powershell --version $powershell_version PowerShell.Windows.x64; `
-        & \dotnet\dotnet nuget locals all --clear; `
-        Remove-Item -Force PowerShell.Windows.x64.$powershell_version.nupkg; `
-        Remove-Item -Path \powershell\.store\powershell.windows.x64\$powershell_version\powershell.windows.x64\$powershell_version\powershell.windows.x64.$powershell_version.nupkg -Force; `
-        `
-        # Delete everything in the dotnet folder that's not needed in the SDK layer but will instead be derived from base layers
-        Get-ChildItem -Exclude 'dnx.cmd','dnx.ps1','LICENSE.txt','ThirdPartyNotices.txt','packs','sdk','sdk-manifests','templates','shared' -Path dotnet `
-            | Remove-Item -Force -Recurse; `
-        Get-ChildItem -Exclude 'Microsoft.WindowsDesktop.App' -Path dotnet\shared `
-            | Remove-Item -Force -Recurse"
-
-
-# SDK image
-FROM $REPO:11.0.0-alpha.1-nanoserver-ltsc2022
-
-ENV `
-    # Do not generate certificate
-    DOTNET_GENERATE_ASPNET_CERTIFICATE=false `
-    # Do not show first run text
-    DOTNET_NOLOGO=true `
-    # SDK version
-    DOTNET_SDK_VERSION=11.0.100-alpha.1 `
-    # Enable correct mode for dotnet watch (only mode supported in a container)
-    DOTNET_USE_POLLING_FILE_WATCHER=true `
-    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
-    NUGET_XMLDOC_MODE=skip `
-    # PowerShell telemetry for docker image usage
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2022 `
-    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
-    DOTNET_ROLL_FORWARD=Major
-
-# In order to set system PATH, ContainerAdministrator must be used
-USER ContainerAdministrator
-RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd"
-USER ContainerUser
-
-COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
-COPY --from=installer ["/powershell", "/Program Files/powershell"]
-COPY --from=installer ["/MinGit", "/Program Files/MinGit"]
-
-# Trigger first run experience by running arbitrary cmd
-RUN dotnet help
diff --git a/src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
deleted file mode 100644
index 5eed40acb6..0000000000
--- a/src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile
+++ /dev/null
@@ -1,93 +0,0 @@
-# escape=`
-
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-
-# Installer image
-FROM mcr.microsoft.com/windows/servercore:ltsc2022-amd64 AS installer
-
-# Download MinGit
-RUN powershell -Command " `
-        $ErrorActionPreference = 'Stop'; `
-        $ProgressPreference = 'SilentlyContinue'; `
-        `
-        Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; `
-        $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; `
-        if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { `
-            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
-            exit 1; `
-        }; `
-        mkdir MinGit; `
-        tar --gzip --extract --no-same-owner --file mingit.zip --directory MinGit; `
-        Remove-Item -Force mingit.zip"
-
-RUN powershell -Command " `
-        $ErrorActionPreference = 'Stop'; `
-        $ProgressPreference = 'SilentlyContinue'; `
-        `
-        # Retrieve .NET SDK
-        $dotnet_sdk_version = '11.0.100-alpha.1'; `
-        $dotnet_sdk_build_version = $dotnet_sdk_version + '.25609.108'; `
-        $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
-        $dotnet_sha512_file = $dotnet_file + '.sha512'; `
-        `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file; `
-        `
-        if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
-            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
-            exit 1; `
-        }; `
-        `
-        mkdir dotnet; `
-        tar --gzip --extract --no-same-owner --file $dotnet_file --directory dotnet; `
-        Remove-Item -Force `
-            $dotnet_file, `
-            $dotnet_sha512_file; `
-        `
-        # Install PowerShell global tool
-        $powershell_version = '7.6.0-preview.4'; `
-        Invoke-WebRequest -OutFile PowerShell.Windows.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Windows.x64.$powershell_version.nupkg; `
-        $powershell_sha512 = 'a529408a93ca2be753d84137bff8ed95dc9301faf2da62fbd9d7bfb29fe502bfca9427736b1004884e839e3f2585ac613349f0fbbb97ea6f979b115dcf06aa0c'; `
-        if ((Get-FileHash PowerShell.Windows.x64.$powershell_version.nupkg -Algorithm sha512).Hash -ne $powershell_sha512) { `
-            Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
-            exit 1; `
-        }; `
-        & \dotnet\dotnet tool install --add-source . --tool-path \powershell --version $powershell_version PowerShell.Windows.x64; `
-        & \dotnet\dotnet nuget locals all --clear; `
-        Remove-Item -Force PowerShell.Windows.x64.$powershell_version.nupkg; `
-        Remove-Item -Path \powershell\.store\powershell.windows.x64\$powershell_version\powershell.windows.x64\$powershell_version\powershell.windows.x64.$powershell_version.nupkg -Force; `
-        `
-        # Delete everything in the dotnet folder that's not needed in the SDK layer but will instead be derived from base layers
-        Get-ChildItem -Exclude 'dnx.cmd','dnx.ps1','LICENSE.txt','ThirdPartyNotices.txt','packs','sdk','sdk-manifests','templates','shared' -Path dotnet `
-            | Remove-Item -Force -Recurse; `
-        Get-ChildItem -Exclude 'Microsoft.WindowsDesktop.App' -Path dotnet\shared `
-            | Remove-Item -Force -Recurse"
-
-
-# SDK image
-FROM $REPO:11.0.0-alpha.1-windowsservercore-ltsc2022
-
-ENV `
-    # Do not generate certificate
-    DOTNET_GENERATE_ASPNET_CERTIFICATE=false `
-    # Do not show first run text
-    DOTNET_NOLOGO=true `
-    # SDK version
-    DOTNET_SDK_VERSION=11.0.100-alpha.1 `
-    # Enable correct mode for dotnet watch (only mode supported in a container)
-    DOTNET_USE_POLLING_FILE_WATCHER=true `
-    # Skip extraction of XML docs - generally not useful within an image/container - helps performance
-    NUGET_XMLDOC_MODE=skip `
-    # PowerShell telemetry for docker image usage
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2022 `
-    # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
-    DOTNET_ROLL_FORWARD=Major
-
-RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd"
-
-COPY --from=installer ["/dotnet", "/Program Files/dotnet"]
-COPY --from=installer ["/powershell", "/Program Files/powershell"]
-COPY --from=installer ["/MinGit", "/Program Files/MinGit"]
-
-# Trigger first run experience by running arbitrary cmd
-RUN dotnet help

From 65b7611488b3aa391116f26625c1e3aeb3d34d41 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Wed, 10 Dec 2025 13:30:32 -0800
Subject: [PATCH 04/23] Update readmes

---
 README.aspnet.md                              | 78 ++++++++++---------
 README.runtime-deps.md                        | 42 +++++-----
 README.runtime.md                             | 49 ++++++------
 README.sdk.md                                 | 43 +++++-----
 .../aspnet-tags.yml                           | 30 ++++---
 .../runtime-deps-tags.yml                     | 16 ++--
 .../runtime-tags.yml                          | 19 ++---
 eng/mcr-tags-metadata-templates/sdk-tags.yml  | 18 ++---
 8 files changed, 143 insertions(+), 152 deletions(-)

diff --git a/README.aspnet.md b/README.aspnet.md
index 50663cd82f..93a213392c 100644
--- a/README.aspnet.md
+++ b/README.aspnet.md
@@ -89,19 +89,6 @@ For more information, see the [composite images section in the Image Variants do
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-composite-amd64, 11.0-preview-noble-chiseled-composite-amd64, 11.0.0-alpha.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-composite-extra-amd64, 11.0-preview-noble-chiseled-composite-extra-amd64, 11.0.0-alpha.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
-11.0.0-alpha.1-alpine3.22-composite-amd64, 11.0-preview-alpine3.22-composite-amd64, 11.0-preview-alpine-composite-amd64, 11.0.0-alpha.1-alpine3.22-composite, 11.0-preview-alpine3.22-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.22-composite/amd64/Dockerfile) | Alpine 3.22
-11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/aspnet/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
-11.0.0-alpha.1-alpine3.23-composite-amd64, 11.0-preview-alpine3.23-composite-amd64, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
-11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-composite-amd64, 11.0-preview-azurelinux3.0-distroless-composite-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-composite, 11.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-composite-extra-amd64, 11.0-preview-azurelinux3.0-distroless-composite-extra-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-composite-extra, 11.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0
 10.0.1-noble-amd64, 10.0-noble-amd64, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/aspnet/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -157,24 +144,22 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-composite-amd64, 11.0-preview-noble-chiseled-composite-amd64, 11.0.0-alpha.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-composite-extra-amd64, 11.0-preview-noble-chiseled-composite-extra-amd64, 11.0.0-alpha.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-composite-amd64, 11.0-preview-alpine3.23-composite-amd64, 11.0-preview-alpine-composite-amd64, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-composite-amd64, 11.0-preview-azurelinux3.0-distroless-composite-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-composite, 11.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-composite-extra-amd64, 11.0-preview-azurelinux3.0-distroless-composite-extra-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-composite-extra, 11.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-composite-arm64v8, 11.0-preview-noble-chiseled-composite-arm64v8, 11.0.0-alpha.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-composite-extra-arm64v8, 11.0-preview-noble-chiseled-composite-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
-11.0.0-alpha.1-alpine3.22-composite-arm64v8, 11.0-preview-alpine3.22-composite-arm64v8, 11.0-preview-alpine-composite-arm64v8, 11.0.0-alpha.1-alpine3.22-composite, 11.0-preview-alpine3.22-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.22-composite/arm64v8/Dockerfile) | Alpine 3.22
-11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
-11.0.0-alpha.1-alpine3.23-composite-arm64v8, 11.0-preview-alpine3.23-composite-arm64v8, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
-11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-composite-arm64v8, 11.0-preview-azurelinux3.0-distroless-composite-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-composite, 11.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-composite-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-composite-extra-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-composite-extra, 11.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.1-noble-arm64v8, 10.0-noble-arm64v8, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/aspnet/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -230,19 +215,22 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-composite-arm64v8, 11.0-preview-noble-chiseled-composite-arm64v8, 11.0.0-alpha.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-composite-extra-arm64v8, 11.0-preview-noble-chiseled-composite-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-composite-arm64v8, 11.0-preview-alpine3.23-composite-arm64v8, 11.0-preview-alpine-composite-arm64v8, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-composite-arm64v8, 11.0-preview-azurelinux3.0-distroless-composite-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-composite, 11.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-composite-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-composite-extra-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-composite-extra, 11.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-composite-arm32v7, 11.0-preview-noble-chiseled-composite-arm32v7, 11.0.0-alpha.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-composite-extra-arm32v7, 11.0-preview-noble-chiseled-composite-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
-11.0.0-alpha.1-alpine3.22-composite-arm32v7, 11.0-preview-alpine3.22-composite-arm32v7, 11.0-preview-alpine-composite-arm32v7, 11.0.0-alpha.1-alpine3.22-composite, 11.0-preview-alpine3.22-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.22-composite/arm32v7/Dockerfile) | Alpine 3.22
-11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
-11.0.0-alpha.1-alpine3.23-composite-arm32v7, 11.0-preview-alpine3.23-composite-arm32v7, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
 10.0.1-noble-arm32v7, 10.0-noble-arm32v7, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/aspnet/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
@@ -278,30 +266,45 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-composite-arm32v7, 11.0-preview-noble-chiseled-composite-arm32v7, 11.0.0-alpha.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-composite-extra-arm32v7, 11.0-preview-noble-chiseled-composite-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-composite-arm32v7, 11.0-preview-alpine3.23-composite-arm32v7, 11.0-preview-alpine-composite-arm32v7, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
 
 ### Nano Server 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-alpha.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile)
 10.0.1-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile)
 9.0.11-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
 8.0.22-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
 
+#### .NET 11 Preview Tags
+
+Tag | Dockerfile
+---------| ---------------
+11.0.0-alpha.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile)
+
 ### Windows Server Core 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-alpha.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 10.0.1-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 9.0.11-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 8.0.22-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 
+#### .NET 11 Preview Tags
+
+Tag | Dockerfile
+---------| ---------------
+11.0.0-alpha.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+
 ### Nano Server 2022 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-alpha.1-nanoserver-ltsc2022, 11.0-preview-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/11.0/nanoserver-ltsc2022/amd64/Dockerfile)
 10.0.1-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile)
 9.0.11-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
 8.0.22-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/8.0/nanoserver-ltsc2022/amd64/Dockerfile)
@@ -310,7 +313,6 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-alpha.1-windowsservercore-ltsc2022, 11.0-preview-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/11.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 10.0.1-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 9.0.11-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 8.0.22-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)
diff --git a/README.runtime-deps.md b/README.runtime-deps.md
index 4a77f55190..17d3c71d52 100644
--- a/README.runtime-deps.md
+++ b/README.runtime-deps.md
@@ -71,15 +71,6 @@ They contain the following features:
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
-11.0.0-alpha.1-alpine3.22-extra-amd64, 11.0-preview-alpine3.22-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-alpha.1-alpine3.22-extra, 11.0-preview-alpine3.22-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
-11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
-11.0.0-alpha.1-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
-11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
 10.0.1-noble-amd64, 10.0-noble-amd64, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime-deps/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -121,20 +112,18 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
-11.0.0-alpha.1-alpine3.22-extra-arm64v8, 11.0-preview-alpine3.22-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-alpha.1-alpine3.22-extra, 11.0-preview-alpine3.22-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
-11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
-11.0.0-alpha.1-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
-11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.1-noble-arm64v8, 10.0-noble-arm64v8, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime-deps/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -176,17 +165,18 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
-11.0.0-alpha.1-alpine3.22-extra-arm32v7, 11.0-preview-alpine3.22-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-alpha.1-alpine3.22-extra, 11.0-preview-alpine3.22-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
-11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
-11.0.0-alpha.1-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
 10.0.1-noble-arm32v7, 10.0-noble-arm32v7, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime-deps/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
@@ -216,6 +206,10 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
 <!--End of generated tags-->
 
 *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/nightly/runtime-deps/tags/list) for all supported and unsupported tags.*
diff --git a/README.runtime.md b/README.runtime.md
index ac14c566a1..12bbd7305c 100644
--- a/README.runtime.md
+++ b/README.runtime.md
@@ -78,13 +78,6 @@ They contain the following features:
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
-11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
-11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
 10.0.1-noble-amd64, 10.0-noble-amd64, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -120,18 +113,17 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
-11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
-11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.1-noble-arm64v8, 10.0-noble-arm64v8, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -167,15 +159,17 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
-11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/runtime/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
 10.0.1-noble-arm32v7, 10.0-noble-arm32v7, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0 | [Dockerfile](src/runtime/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
@@ -199,30 +193,42 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
 
 ### Nano Server 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-alpha.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile)
 10.0.1-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile)
 9.0.11-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
 8.0.22-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
 
+#### .NET 11 Preview Tags
+
+Tag | Dockerfile
+---------| ---------------
+11.0.0-alpha.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile)
+
 ### Windows Server Core 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-alpha.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 10.0.1-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 9.0.11-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 8.0.22-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 
+#### .NET 11 Preview Tags
+
+Tag | Dockerfile
+---------| ---------------
+11.0.0-alpha.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+
 ### Nano Server 2022 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-alpha.1-nanoserver-ltsc2022, 11.0-preview-nanoserver-ltsc2022 | [Dockerfile](src/runtime/11.0/nanoserver-ltsc2022/amd64/Dockerfile)
 10.0.1-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile)
 9.0.11-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
 8.0.22-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/8.0/nanoserver-ltsc2022/amd64/Dockerfile)
@@ -231,7 +237,6 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.0-alpha.1-windowsservercore-ltsc2022, 11.0-preview-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/11.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 10.0.1-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 9.0.11-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 8.0.22-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)
diff --git a/README.sdk.md b/README.sdk.md
index 8d06901048..3e3be38b87 100644
--- a/README.sdk.md
+++ b/README.sdk.md
@@ -74,13 +74,6 @@ The [Image Variants documentation](https://github.com/dotnet/dotnet-docker/blob/
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.100-alpha.1-noble-aot-amd64, 11.0-preview-noble-aot-amd64, 11.0.100-alpha.1-noble-aot, 11.0-preview-noble-aot, 11.0.100-alpha.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/noble-aot/amd64/Dockerfile) | Ubuntu 24.04
-11.0.100-alpha.1-alpine3.22-amd64, 11.0-preview-alpine3.22-amd64, 11.0-preview-alpine-amd64, 11.0.100-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
-11.0.100-alpha.1-alpine3.22-aot-amd64, 11.0-preview-alpine3.22-aot-amd64, 11.0-preview-alpine-aot-amd64, 11.0.100-alpha.1-alpine3.22-aot, 11.0-preview-alpine3.22-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.22-aot/amd64/Dockerfile) | Alpine 3.22
-11.0.100-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0.100-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/sdk/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
-11.0.100-alpha.1-alpine3.23-aot-amd64, 11.0-preview-alpine3.23-aot-amd64, 11.0.100-alpha.1-alpine3.23-aot, 11.0-preview-alpine3.23-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile) | Alpine 3.23
-11.0.100-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.100-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-11.0.100-alpha.1-azurelinux3.0-aot-amd64, 11.0-preview-azurelinux3.0-aot-amd64, 11.0.100-alpha.1-azurelinux3.0-aot, 11.0-preview-azurelinux3.0-aot | [Dockerfile](src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile) | Azure Linux 3.0
 10.0.101-noble-amd64, 10.0-noble-amd64, 10.0.101-noble, 10.0-noble, 10.0.101, 10.0 | [Dockerfile](src/sdk/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 10.0.101-noble-aot-amd64, 10.0-noble-aot-amd64, 10.0.101-noble-aot, 10.0-noble-aot, 10.0.101-aot, 10.0-aot | [Dockerfile](src/sdk/10.0/noble-aot/amd64/Dockerfile) | Ubuntu 24.04
 10.0.101-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.101-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
@@ -106,18 +99,16 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.100-alpha.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.100-alpha.1-noble, 11.0-preview-noble, 11.0.100-alpha.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+11.0.100-alpha.1-noble-aot-amd64, 11.0-preview-noble-aot-amd64, 11.0.100-alpha.1-noble-aot, 11.0-preview-noble-aot, 11.0.100-alpha.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/noble-aot/amd64/Dockerfile) | Ubuntu 24.04
+11.0.100-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.100-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+11.0.100-alpha.1-alpine3.23-aot-amd64, 11.0-preview-alpine3.23-aot-amd64, 11.0-preview-alpine-aot-amd64, 11.0.100-alpha.1-alpine3.23-aot, 11.0-preview-alpine3.23-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile) | Alpine 3.23
+11.0.100-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.100-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+11.0.100-alpha.1-azurelinux3.0-aot-amd64, 11.0-preview-azurelinux3.0-aot-amd64, 11.0.100-alpha.1-azurelinux3.0-aot, 11.0-preview-azurelinux3.0-aot | [Dockerfile](src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.100-alpha.1-noble-aot-arm64v8, 11.0-preview-noble-aot-arm64v8, 11.0.100-alpha.1-noble-aot, 11.0-preview-noble-aot, 11.0.100-alpha.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/noble-aot/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.100-alpha.1-alpine3.22-arm64v8, 11.0-preview-alpine3.22-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.100-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
-11.0.100-alpha.1-alpine3.22-aot-arm64v8, 11.0-preview-alpine3.22-aot-arm64v8, 11.0-preview-alpine-aot-arm64v8, 11.0.100-alpha.1-alpine3.22-aot, 11.0-preview-alpine3.22-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.22-aot/arm64v8/Dockerfile) | Alpine 3.22
-11.0.100-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0.100-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/sdk/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
-11.0.100-alpha.1-alpine3.23-aot-arm64v8, 11.0-preview-alpine3.23-aot-arm64v8, 11.0.100-alpha.1-alpine3.23-aot, 11.0-preview-alpine3.23-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile) | Alpine 3.23
-11.0.100-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.100-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-11.0.100-alpha.1-azurelinux3.0-aot-arm64v8, 11.0-preview-azurelinux3.0-aot-arm64v8, 11.0.100-alpha.1-azurelinux3.0-aot, 11.0-preview-azurelinux3.0-aot | [Dockerfile](src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.101-noble-arm64v8, 10.0-noble-arm64v8, 10.0.101-noble, 10.0-noble, 10.0.101, 10.0 | [Dockerfile](src/sdk/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.101-noble-aot-arm64v8, 10.0-noble-aot-arm64v8, 10.0.101-noble-aot, 10.0-noble-aot, 10.0.101-aot, 10.0-aot | [Dockerfile](src/sdk/10.0/noble-aot/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.101-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.101-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
@@ -143,13 +134,16 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.100-alpha.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.100-alpha.1-noble, 11.0-preview-noble, 11.0.100-alpha.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.100-alpha.1-noble-aot-arm64v8, 11.0-preview-noble-aot-arm64v8, 11.0.100-alpha.1-noble-aot, 11.0-preview-noble-aot, 11.0.100-alpha.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/noble-aot/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.100-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.100-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+11.0.100-alpha.1-alpine3.23-aot-arm64v8, 11.0-preview-alpine3.23-aot-arm64v8, 11.0-preview-alpine-aot-arm64v8, 11.0.100-alpha.1-alpine3.23-aot, 11.0-preview-alpine3.23-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile) | Alpine 3.23
+11.0.100-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.100-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+11.0.100-alpha.1-azurelinux3.0-aot-arm64v8, 11.0-preview-azurelinux3.0-aot-arm64v8, 11.0.100-alpha.1-azurelinux3.0-aot, 11.0-preview-azurelinux3.0-aot | [Dockerfile](src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.100-alpha.1-alpine3.22-arm32v7, 11.0-preview-alpine3.22-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.100-alpha.1-alpine3.22, 11.0-preview-alpine3.22, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
-11.0.100-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0.100-alpha.1-alpine3.23, 11.0-preview-alpine3.23 | [Dockerfile](src/sdk/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
 10.0.101-noble-arm32v7, 10.0-noble-arm32v7, 10.0.101-noble, 10.0-noble, 10.0.101, 10.0 | [Dockerfile](src/sdk/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.101-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.101-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
 10.0.101-alpine3.23-arm32v7, 10.0-alpine3.23-arm32v7, 10.0.101-alpine3.23, 10.0-alpine3.23 | [Dockerfile](src/sdk/10.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
@@ -167,30 +161,40 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.100-alpha.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.100-alpha.1-noble, 11.0-preview-noble, 11.0.100-alpha.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.100-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.100-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
 
 ### Nano Server 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.100-alpha.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile)
 10.0.101-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile)
 9.0.308-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
 8.0.416-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
 
+#### .NET 11 Preview Tags
+
+Tag | Dockerfile
+---------| ---------------
+11.0.100-alpha.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile)
+
 ### Windows Server Core 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.100-alpha.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 10.0.101-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 9.0.308-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 8.0.416-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 
+#### .NET 11 Preview Tags
+
+Tag | Dockerfile
+---------| ---------------
+11.0.100-alpha.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+
 ### Nano Server 2022 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.100-alpha.1-nanoserver-ltsc2022, 11.0-preview-nanoserver-ltsc2022 | [Dockerfile](src/sdk/11.0/nanoserver-ltsc2022/amd64/Dockerfile)
 10.0.101-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile)
 9.0.308-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
 8.0.416-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/8.0/nanoserver-ltsc2022/amd64/Dockerfile)
@@ -199,7 +203,6 @@ Tag | Dockerfile
 
 Tag | Dockerfile
 ---------| ---------------
-11.0.100-alpha.1-windowsservercore-ltsc2022, 11.0-preview-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/11.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 10.0.101-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 9.0.308-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 8.0.416-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)
diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
index f66f2ad9ff..b027f6edde 100644
--- a/eng/mcr-tags-metadata-templates/aspnet-tags.yml
+++ b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
@@ -1,22 +1,18 @@
 $(McrTagsYmlRepo:aspnet)
 $(McrTagsYmlTagGroup:11.0-preview-noble|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-extra)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-composite)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-composite-extra)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.22)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.22-composite)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.23)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-composite)
-$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0)
-$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless)
-$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-extra)
-$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-composite)
-$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-composite-extra)
-$(McrTagsYmlTagGroup:11.0-preview-nanoserver-ltsc2025)
-$(McrTagsYmlTagGroup:11.0-preview-windowsservercore-ltsc2025)
-$(McrTagsYmlTagGroup:11.0-preview-nanoserver-ltsc2022)
-$(McrTagsYmlTagGroup:11.0-preview-windowsservercore-ltsc2022)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-composite|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-composite-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-composite|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-composite|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-composite-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-nanoserver-ltsc2025|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-windowsservercore-ltsc2025|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:10.0-noble)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled-extra)
diff --git a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml
index fb4e9d6911..65f0d1e52e 100644
--- a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml
+++ b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml
@@ -1,14 +1,12 @@
 $(McrTagsYmlRepo:runtime-deps)
 $(McrTagsYmlTagGroup:11.0-preview-noble|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-extra)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.22)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.22-extra)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.23)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-extra)
-$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0)
-$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless)
-$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-extra)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-extra|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:10.0-noble)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled-extra)
diff --git a/eng/mcr-tags-metadata-templates/runtime-tags.yml b/eng/mcr-tags-metadata-templates/runtime-tags.yml
index 80efb039f2..8d90775ed5 100644
--- a/eng/mcr-tags-metadata-templates/runtime-tags.yml
+++ b/eng/mcr-tags-metadata-templates/runtime-tags.yml
@@ -1,16 +1,13 @@
 $(McrTagsYmlRepo:runtime)
 $(McrTagsYmlTagGroup:11.0-preview-noble|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-extra)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.22)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.23)
-$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0)
-$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless)
-$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-extra)
-$(McrTagsYmlTagGroup:11.0-preview-nanoserver-ltsc2025)
-$(McrTagsYmlTagGroup:11.0-preview-windowsservercore-ltsc2025)
-$(McrTagsYmlTagGroup:11.0-preview-nanoserver-ltsc2022)
-$(McrTagsYmlTagGroup:11.0-preview-windowsservercore-ltsc2022)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-nanoserver-ltsc2025|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-windowsservercore-ltsc2025|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:10.0-noble)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled-extra)
diff --git a/eng/mcr-tags-metadata-templates/sdk-tags.yml b/eng/mcr-tags-metadata-templates/sdk-tags.yml
index 9ea66a6647..933412b661 100644
--- a/eng/mcr-tags-metadata-templates/sdk-tags.yml
+++ b/eng/mcr-tags-metadata-templates/sdk-tags.yml
@@ -1,16 +1,12 @@
 $(McrTagsYmlRepo:sdk)
 $(McrTagsYmlTagGroup:11.0-preview-noble|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-noble-aot)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.22)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.22-aot)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.23)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-aot)
-$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0)
-$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-aot)
-$(McrTagsYmlTagGroup:11.0-preview-nanoserver-ltsc2025)
-$(McrTagsYmlTagGroup:11.0-preview-windowsservercore-ltsc2025)
-$(McrTagsYmlTagGroup:11.0-preview-nanoserver-ltsc2022)
-$(McrTagsYmlTagGroup:11.0-preview-windowsservercore-ltsc2022)
+$(McrTagsYmlTagGroup:11.0-preview-noble-aot|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-aot|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-aot|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-nanoserver-ltsc2025|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-windowsservercore-ltsc2025|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:10.0-noble)
 $(McrTagsYmlTagGroup:10.0-noble-aot)
 $(McrTagsYmlTagGroup:10.0-alpine3.22)

From a9ec718d318795d54bb0f93102a25cbca478a7c3 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Wed, 10 Dec 2025 14:40:15 -0800
Subject: [PATCH 05/23] Replace noble with resolute for .NET 11

---
 README.aspnet.md                              |  30 +-
 README.runtime-deps.md                        |  18 +-
 README.runtime.md                             |  18 +-
 README.sdk.md                                 |  10 +-
 .../aspnet-tags.yml                           |  10 +-
 .../runtime-deps-tags.yml                     |   6 +-
 .../runtime-tags.yml                          |   6 +-
 eng/mcr-tags-metadata-templates/sdk-tags.yml  |   4 +-
 manifest.json                                 | 360 +++++++++---------
 manifest.versions.json                        |   2 +
 .../amd64/Dockerfile                          |   0
 .../arm32v7/Dockerfile                        |   0
 .../arm64v8/Dockerfile                        |   0
 .../amd64/Dockerfile                          |   0
 .../arm32v7/Dockerfile                        |   0
 .../arm64v8/Dockerfile                        |   0
 .../amd64/Dockerfile                          |   0
 .../arm32v7/Dockerfile                        |   0
 .../arm64v8/Dockerfile                        |   0
 .../amd64/Dockerfile                          |   0
 .../arm32v7/Dockerfile                        |   0
 .../arm64v8/Dockerfile                        |   0
 .../11.0/{noble => resolute}/amd64/Dockerfile |   4 +-
 .../{noble => resolute}/arm32v7/Dockerfile    |   4 +-
 .../{noble => resolute}/arm64v8/Dockerfile    |   4 +-
 .../amd64/Dockerfile                          |   0
 .../arm32v7/Dockerfile                        |   0
 .../arm64v8/Dockerfile                        |   0
 .../amd64/Dockerfile                          |   0
 .../arm32v7/Dockerfile                        |   0
 .../arm64v8/Dockerfile                        |   0
 .../11.0/resolute/amd64/Dockerfile            |   5 +-
 .../11.0/resolute/arm32v7/Dockerfile          |   5 +-
 .../11.0/resolute/arm64v8/Dockerfile          |   5 +-
 .../amd64/Dockerfile                          |   0
 .../arm32v7/Dockerfile                        |   0
 .../arm64v8/Dockerfile                        |   0
 .../amd64/Dockerfile                          |   0
 .../arm32v7/Dockerfile                        |   0
 .../arm64v8/Dockerfile                        |   0
 .../11.0/{noble => resolute}/amd64/Dockerfile |   4 +-
 .../{noble => resolute}/arm32v7/Dockerfile    |   4 +-
 .../{noble => resolute}/arm64v8/Dockerfile    |   4 +-
 .../amd64/Dockerfile                          |   2 +-
 .../arm64v8/Dockerfile                        |   2 +-
 .../11.0/{noble => resolute}/amd64/Dockerfile |   6 +-
 .../{noble => resolute}/arm32v7/Dockerfile    |   6 +-
 .../{noble => resolute}/arm64v8/Dockerfile    |   6 +-
 ....0-resolute-amd64-Dockerfile.approved.txt} |   0
 ...-resolute-arm32v7-Dockerfile.approved.txt} |   0
 ...-resolute-arm64v8-Dockerfile.approved.txt} |   0
 ...te-chiseled-amd64-Dockerfile.approved.txt} |   0
 ...-chiseled-arm32v7-Dockerfile.approved.txt} |   0
 ...-chiseled-arm64v8-Dockerfile.approved.txt} |   0
 ...d-composite-amd64-Dockerfile.approved.txt} |   0
 ...composite-arm32v7-Dockerfile.approved.txt} |   0
 ...composite-arm64v8-Dockerfile.approved.txt} |   0
 ...osite-extra-amd64-Dockerfile.approved.txt} |   0
 ...ite-extra-arm32v7-Dockerfile.approved.txt} |   0
 ...ite-extra-arm64v8-Dockerfile.approved.txt} |   0
 ...seled-extra-amd64-Dockerfile.approved.txt} |   0
 ...led-extra-arm32v7-Dockerfile.approved.txt} |   0
 ...led-extra-arm64v8-Dockerfile.approved.txt} |   0
 ....0-resolute-amd64-Dockerfile.approved.txt} |   0
 ...-resolute-arm32v7-Dockerfile.approved.txt} |   0
 ...-resolute-arm64v8-Dockerfile.approved.txt} |   0
 ...te-chiseled-amd64-Dockerfile.approved.txt} |   0
 ...-chiseled-arm32v7-Dockerfile.approved.txt} |   0
 ...-chiseled-arm64v8-Dockerfile.approved.txt} |   0
 ...seled-extra-amd64-Dockerfile.approved.txt} |   0
 ...led-extra-arm32v7-Dockerfile.approved.txt} |   0
 ...led-extra-arm64v8-Dockerfile.approved.txt} |   0
 ...1.0-resolute-amd64-Dockerfile.approved.txt |   0
 ...0-resolute-arm32v7-Dockerfile.approved.txt |   0
 ...0-resolute-arm64v8-Dockerfile.approved.txt |   0
 ...te-chiseled-amd64-Dockerfile.approved.txt} |   0
 ...-chiseled-arm32v7-Dockerfile.approved.txt} |   0
 ...-chiseled-arm64v8-Dockerfile.approved.txt} |   0
 ...seled-extra-amd64-Dockerfile.approved.txt} |   0
 ...led-extra-arm32v7-Dockerfile.approved.txt} |   0
 ...led-extra-arm64v8-Dockerfile.approved.txt} |   0
 ....0-resolute-amd64-Dockerfile.approved.txt} |   0
 ...esolute-aot-amd64-Dockerfile.approved.txt} |   0
 ...olute-aot-arm64v8-Dockerfile.approved.txt} |   0
 ...-resolute-arm32v7-Dockerfile.approved.txt} |   0
 ...-resolute-arm64v8-Dockerfile.approved.txt} |   0
 tests/Microsoft.DotNet.Docker.Tests/OS.cs     |   2 +
 .../Microsoft.DotNet.Docker.Tests/TestData.cs |  34 +-
 88 files changed, 281 insertions(+), 280 deletions(-)
 rename src/aspnet/11.0/{noble-chiseled-composite-extra => resolute-chiseled-composite-extra}/amd64/Dockerfile (100%)
 rename src/aspnet/11.0/{noble-chiseled-composite-extra => resolute-chiseled-composite-extra}/arm32v7/Dockerfile (100%)
 rename src/aspnet/11.0/{noble-chiseled-composite-extra => resolute-chiseled-composite-extra}/arm64v8/Dockerfile (100%)
 rename src/aspnet/11.0/{noble-chiseled-composite => resolute-chiseled-composite}/amd64/Dockerfile (100%)
 rename src/aspnet/11.0/{noble-chiseled-composite => resolute-chiseled-composite}/arm32v7/Dockerfile (100%)
 rename src/aspnet/11.0/{noble-chiseled-composite => resolute-chiseled-composite}/arm64v8/Dockerfile (100%)
 rename src/aspnet/11.0/{noble-chiseled-extra => resolute-chiseled-extra}/amd64/Dockerfile (100%)
 rename src/aspnet/11.0/{noble-chiseled-extra => resolute-chiseled-extra}/arm32v7/Dockerfile (100%)
 rename src/aspnet/11.0/{noble-chiseled-extra => resolute-chiseled-extra}/arm64v8/Dockerfile (100%)
 rename src/aspnet/11.0/{noble-chiseled => resolute-chiseled}/amd64/Dockerfile (100%)
 rename src/aspnet/11.0/{noble-chiseled => resolute-chiseled}/arm32v7/Dockerfile (100%)
 rename src/aspnet/11.0/{noble-chiseled => resolute-chiseled}/arm64v8/Dockerfile (100%)
 rename src/aspnet/11.0/{noble => resolute}/amd64/Dockerfile (92%)
 rename src/aspnet/11.0/{noble => resolute}/arm32v7/Dockerfile (92%)
 rename src/aspnet/11.0/{noble => resolute}/arm64v8/Dockerfile (92%)
 rename src/runtime-deps/11.0/{noble-chiseled-extra => resolute-chiseled-extra}/amd64/Dockerfile (100%)
 rename src/runtime-deps/11.0/{noble-chiseled-extra => resolute-chiseled-extra}/arm32v7/Dockerfile (100%)
 rename src/runtime-deps/11.0/{noble-chiseled-extra => resolute-chiseled-extra}/arm64v8/Dockerfile (100%)
 rename src/runtime-deps/11.0/{noble-chiseled => resolute-chiseled}/amd64/Dockerfile (100%)
 rename src/runtime-deps/11.0/{noble-chiseled => resolute-chiseled}/arm32v7/Dockerfile (100%)
 rename src/runtime-deps/11.0/{noble-chiseled => resolute-chiseled}/arm64v8/Dockerfile (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-amd64-Dockerfile.approved.txt => src/runtime-deps/11.0/resolute/amd64/Dockerfile (90%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm32v7-Dockerfile.approved.txt => src/runtime-deps/11.0/resolute/arm32v7/Dockerfile (90%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm64v8-Dockerfile.approved.txt => src/runtime-deps/11.0/resolute/arm64v8/Dockerfile (90%)
 rename src/runtime/11.0/{noble-chiseled-extra => resolute-chiseled-extra}/amd64/Dockerfile (100%)
 rename src/runtime/11.0/{noble-chiseled-extra => resolute-chiseled-extra}/arm32v7/Dockerfile (100%)
 rename src/runtime/11.0/{noble-chiseled-extra => resolute-chiseled-extra}/arm64v8/Dockerfile (100%)
 rename src/runtime/11.0/{noble-chiseled => resolute-chiseled}/amd64/Dockerfile (100%)
 rename src/runtime/11.0/{noble-chiseled => resolute-chiseled}/arm32v7/Dockerfile (100%)
 rename src/runtime/11.0/{noble-chiseled => resolute-chiseled}/arm64v8/Dockerfile (100%)
 rename src/runtime/11.0/{noble => resolute}/amd64/Dockerfile (92%)
 rename src/runtime/11.0/{noble => resolute}/arm32v7/Dockerfile (91%)
 rename src/runtime/11.0/{noble => resolute}/arm64v8/Dockerfile (92%)
 rename src/sdk/11.0/{noble-aot => resolute-aot}/amd64/Dockerfile (84%)
 rename src/sdk/11.0/{noble-aot => resolute-aot}/arm64v8/Dockerfile (83%)
 rename src/sdk/11.0/{noble => resolute}/amd64/Dockerfile (95%)
 rename src/sdk/11.0/{noble => resolute}/arm32v7/Dockerfile (95%)
 rename src/sdk/11.0/{noble => resolute}/arm64v8/Dockerfile (95%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{aspnet-11.0-noble-amd64-Dockerfile.approved.txt => aspnet-11.0-resolute-amd64-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{aspnet-11.0-noble-arm32v7-Dockerfile.approved.txt => aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{aspnet-11.0-noble-arm64v8-Dockerfile.approved.txt => aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{aspnet-11.0-noble-chiseled-amd64-Dockerfile.approved.txt => aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{aspnet-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt => aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{aspnet-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt => aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{aspnet-11.0-noble-chiseled-composite-amd64-Dockerfile.approved.txt => aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{aspnet-11.0-noble-chiseled-composite-arm32v7-Dockerfile.approved.txt => aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{aspnet-11.0-noble-chiseled-composite-arm64v8-Dockerfile.approved.txt => aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{aspnet-11.0-noble-chiseled-composite-extra-amd64-Dockerfile.approved.txt => aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{aspnet-11.0-noble-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt => aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{aspnet-11.0-noble-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt => aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{aspnet-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt => aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{aspnet-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt => aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{aspnet-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt => aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{runtime-11.0-noble-amd64-Dockerfile.approved.txt => runtime-11.0-resolute-amd64-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{runtime-11.0-noble-arm32v7-Dockerfile.approved.txt => runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{runtime-11.0-noble-arm64v8-Dockerfile.approved.txt => runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{runtime-11.0-noble-chiseled-amd64-Dockerfile.approved.txt => runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{runtime-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt => runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{runtime-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt => runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{runtime-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt => runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{runtime-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt => runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{runtime-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt => runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt} (100%)
 rename src/runtime-deps/11.0/noble/amd64/Dockerfile => tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-amd64-Dockerfile.approved.txt (100%)
 rename src/runtime-deps/11.0/noble/arm32v7/Dockerfile => tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm32v7-Dockerfile.approved.txt (100%)
 rename src/runtime-deps/11.0/noble/arm64v8/Dockerfile => tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm64v8-Dockerfile.approved.txt (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{runtime-deps-11.0-noble-chiseled-amd64-Dockerfile.approved.txt => runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{runtime-deps-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt => runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{runtime-deps-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt => runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{runtime-deps-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt => runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{runtime-deps-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt => runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{runtime-deps-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt => runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{sdk-11.0-noble-amd64-Dockerfile.approved.txt => sdk-11.0-resolute-amd64-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{sdk-11.0-noble-aot-amd64-Dockerfile.approved.txt => sdk-11.0-resolute-aot-amd64-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{sdk-11.0-noble-aot-arm64v8-Dockerfile.approved.txt => sdk-11.0-resolute-aot-arm64v8-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{sdk-11.0-noble-arm32v7-Dockerfile.approved.txt => sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt} (100%)
 rename tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/{sdk-11.0-noble-arm64v8-Dockerfile.approved.txt => sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt} (100%)

diff --git a/README.aspnet.md b/README.aspnet.md
index 93a213392c..07975254a2 100644
--- a/README.aspnet.md
+++ b/README.aspnet.md
@@ -143,11 +143,11 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-composite-amd64, 11.0-preview-noble-chiseled-composite-amd64, 11.0.0-alpha.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-composite-extra-amd64, 11.0-preview-noble-chiseled-composite-extra-amd64, 11.0.0-alpha.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-composite-amd64, 11.0-preview-resolute-chiseled-composite-amd64, 11.0.0-alpha.1-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-composite-extra-amd64, 11.0-preview-resolute-chiseled-composite-extra-amd64, 11.0.0-alpha.1-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 24.04
 11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-alpine3.23-composite-amd64, 11.0-preview-alpine3.23-composite-amd64, 11.0-preview-alpine-composite-amd64, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
@@ -214,11 +214,11 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-composite-arm64v8, 11.0-preview-noble-chiseled-composite-arm64v8, 11.0.0-alpha.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-composite-extra-arm64v8, 11.0-preview-noble-chiseled-composite-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-composite-arm64v8, 11.0-preview-resolute-chiseled-composite-arm64v8, 11.0.0-alpha.1-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-composite-extra-arm64v8, 11.0-preview-resolute-chiseled-composite-extra-arm64v8, 11.0.0-alpha.1-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 24.04
 11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-alpine3.23-composite-arm64v8, 11.0-preview-alpine3.23-composite-arm64v8, 11.0-preview-alpine-composite-arm64v8, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
@@ -265,11 +265,11 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-composite-arm32v7, 11.0-preview-noble-chiseled-composite-arm32v7, 11.0.0-alpha.1-noble-chiseled-composite, 11.0-preview-noble-chiseled-composite | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-composite-extra-arm32v7, 11.0-preview-noble-chiseled-composite-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-composite-extra, 11.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-composite-arm32v7, 11.0-preview-resolute-chiseled-composite-arm32v7, 11.0.0-alpha.1-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-composite-extra-arm32v7, 11.0-preview-resolute-chiseled-composite-extra-arm32v7, 11.0.0-alpha.1-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 24.04
 11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-alpine3.23-composite-arm32v7, 11.0-preview-alpine3.23-composite-arm32v7, 11.0-preview-alpine-composite-arm32v7, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
 
diff --git a/README.runtime-deps.md b/README.runtime-deps.md
index 17d3c71d52..472b65be1a 100644
--- a/README.runtime-deps.md
+++ b/README.runtime-deps.md
@@ -111,9 +111,9 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
 11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
@@ -164,9 +164,9 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
 11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
@@ -205,9 +205,9 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime-deps/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
 11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
 <!--End of generated tags-->
diff --git a/README.runtime.md b/README.runtime.md
index 12bbd7305c..16eb145247 100644
--- a/README.runtime.md
+++ b/README.runtime.md
@@ -112,9 +112,9 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-amd64, 11.0-preview-noble-chiseled-amd64, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-amd64, 11.0-preview-noble-chiseled-extra-amd64, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
 11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 11.0.0-alpha.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
@@ -158,9 +158,9 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-arm64v8, 11.0-preview-noble-chiseled-arm64v8, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-arm64v8, 11.0-preview-noble-chiseled-extra-arm64v8, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
 11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
@@ -192,9 +192,9 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.0-alpha.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.0-alpha.1-noble, 11.0-preview-noble, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-arm32v7, 11.0-preview-noble-chiseled-arm32v7, 11.0.0-alpha.1-noble-chiseled, 11.0-preview-noble-chiseled | [Dockerfile](src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-noble-chiseled-extra-arm32v7, 11.0-preview-noble-chiseled-extra-arm32v7, 11.0.0-alpha.1-noble-chiseled-extra, 11.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
 11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
 
 ### Nano Server 2025 amd64 Tags
diff --git a/README.sdk.md b/README.sdk.md
index 3e3be38b87..5bc71ca098 100644
--- a/README.sdk.md
+++ b/README.sdk.md
@@ -98,8 +98,8 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.100-alpha.1-noble-amd64, 11.0-preview-noble-amd64, 11.0.100-alpha.1-noble, 11.0-preview-noble, 11.0.100-alpha.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/noble/amd64/Dockerfile) | Ubuntu 24.04
-11.0.100-alpha.1-noble-aot-amd64, 11.0-preview-noble-aot-amd64, 11.0.100-alpha.1-noble-aot, 11.0-preview-noble-aot, 11.0.100-alpha.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/noble-aot/amd64/Dockerfile) | Ubuntu 24.04
+11.0.100-alpha.1-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.100-alpha.1-resolute, 11.0-preview-resolute, 11.0.100-alpha.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04
+11.0.100-alpha.1-resolute-aot-amd64, 11.0-preview-resolute-aot-amd64, 11.0.100-alpha.1-resolute-aot, 11.0-preview-resolute-aot, 11.0.100-alpha.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/resolute-aot/amd64/Dockerfile) | Ubuntu 26.04
 11.0.100-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.100-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
 11.0.100-alpha.1-alpine3.23-aot-amd64, 11.0-preview-alpine3.23-aot-amd64, 11.0-preview-alpine-aot-amd64, 11.0.100-alpha.1-alpine3.23-aot, 11.0-preview-alpine3.23-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile) | Alpine 3.23
 11.0.100-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.100-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
@@ -133,8 +133,8 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.100-alpha.1-noble-arm64v8, 11.0-preview-noble-arm64v8, 11.0.100-alpha.1-noble, 11.0-preview-noble, 11.0.100-alpha.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.100-alpha.1-noble-aot-arm64v8, 11.0-preview-noble-aot-arm64v8, 11.0.100-alpha.1-noble-aot, 11.0-preview-noble-aot, 11.0.100-alpha.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/noble-aot/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.100-alpha.1-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.100-alpha.1-resolute, 11.0-preview-resolute, 11.0.100-alpha.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04
+11.0.100-alpha.1-resolute-aot-arm64v8, 11.0-preview-resolute-aot-arm64v8, 11.0.100-alpha.1-resolute-aot, 11.0-preview-resolute-aot, 11.0.100-alpha.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/resolute-aot/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.100-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.100-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
 11.0.100-alpha.1-alpine3.23-aot-arm64v8, 11.0-preview-alpine3.23-aot-arm64v8, 11.0-preview-alpine-aot-arm64v8, 11.0.100-alpha.1-alpine3.23-aot, 11.0-preview-alpine3.23-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile) | Alpine 3.23
 11.0.100-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.100-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
@@ -160,7 +160,7 @@ Tags | Dockerfile | OS Version
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-11.0.100-alpha.1-noble-arm32v7, 11.0-preview-noble-arm32v7, 11.0.100-alpha.1-noble, 11.0-preview-noble, 11.0.100-alpha.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.100-alpha.1-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.100-alpha.1-resolute, 11.0-preview-resolute, 11.0.100-alpha.1, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04
 11.0.100-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.100-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
 
 ### Nano Server 2025 amd64 Tags
diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
index b027f6edde..0bc2d2a428 100644
--- a/eng/mcr-tags-metadata-templates/aspnet-tags.yml
+++ b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
@@ -1,9 +1,9 @@
 $(McrTagsYmlRepo:aspnet)
-$(McrTagsYmlTagGroup:11.0-preview-noble|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-extra|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-composite|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-composite-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-resolute|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-resolute-chiseled|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-resolute-chiseled-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-resolute-chiseled-composite|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-resolute-chiseled-composite-extra|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23-composite|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0|.NET 11 Preview Tags)
diff --git a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml
index 65f0d1e52e..8579f67329 100644
--- a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml
+++ b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml
@@ -1,7 +1,7 @@
 $(McrTagsYmlRepo:runtime-deps)
-$(McrTagsYmlTagGroup:11.0-preview-noble|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-resolute|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-resolute-chiseled|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-resolute-chiseled-extra|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23-extra|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0|.NET 11 Preview Tags)
diff --git a/eng/mcr-tags-metadata-templates/runtime-tags.yml b/eng/mcr-tags-metadata-templates/runtime-tags.yml
index 8d90775ed5..f2dd14c973 100644
--- a/eng/mcr-tags-metadata-templates/runtime-tags.yml
+++ b/eng/mcr-tags-metadata-templates/runtime-tags.yml
@@ -1,7 +1,7 @@
 $(McrTagsYmlRepo:runtime)
-$(McrTagsYmlTagGroup:11.0-preview-noble|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-noble-chiseled-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-resolute|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-resolute-chiseled|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-resolute-chiseled-extra|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless|.NET 11 Preview Tags)
diff --git a/eng/mcr-tags-metadata-templates/sdk-tags.yml b/eng/mcr-tags-metadata-templates/sdk-tags.yml
index 933412b661..9d80d03a8b 100644
--- a/eng/mcr-tags-metadata-templates/sdk-tags.yml
+++ b/eng/mcr-tags-metadata-templates/sdk-tags.yml
@@ -1,6 +1,6 @@
 $(McrTagsYmlRepo:sdk)
-$(McrTagsYmlTagGroup:11.0-preview-noble|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-noble-aot|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-resolute|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-resolute-aot|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23-aot|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0|.NET 11 Preview Tags)
diff --git a/manifest.json b/manifest.json
index b4e757adfa..a3488aee9b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2388,44 +2388,44 @@
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-noble": {},
-            "$(dotnet|11.0|minor-tag)-noble": {},
+            "$(dotnet|11.0|fixed-tag)-resolute": {},
+            "$(dotnet|11.0|minor-tag)-resolute": {},
             "$(dotnet|11.0|fixed-tag)": {},
             "$(dotnet|11.0|minor-tag)": {},
             "latest": {}
           },
           "platforms": [
             {
-              "dockerfile": "src/runtime-deps/11.0/noble/amd64",
+              "dockerfile": "src/runtime-deps/11.0/resolute/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "resolute",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-amd64": {},
-                "$(dotnet|11.0|minor-tag)-noble-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-amd64": {},
+                "$(dotnet|11.0|minor-tag)-resolute-amd64": {}
               }
             },
             {
               "architecture": "arm",
-              "dockerfile": "src/runtime-deps/11.0/noble/arm32v7",
+              "dockerfile": "src/runtime-deps/11.0/resolute/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "resolute",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-noble-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-resolute-arm32v7": {}
               },
               "variant": "v7"
             },
             {
               "architecture": "arm64",
-              "dockerfile": "src/runtime-deps/11.0/noble/arm64v8",
+              "dockerfile": "src/runtime-deps/11.0/resolute/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "resolute",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-noble-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-resolute-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -2684,45 +2684,45 @@
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-noble-chiseled": {},
-            "$(dotnet|11.0|minor-tag)-noble-chiseled": {}
+            "$(dotnet|11.0|fixed-tag)-resolute-chiseled": {},
+            "$(dotnet|11.0|minor-tag)-resolute-chiseled": {}
           },
           "platforms": [
             {
-              "dockerfile": "src/runtime-deps/11.0/noble-chiseled/amd64",
+              "dockerfile": "src/runtime-deps/11.0/resolute-chiseled/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-amd64": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-amd64": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "test-dependencies",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-amd64"
                   ]
                 },
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-amd64"
                   ]
                 }
               ]
             },
             {
               "architecture": "arm64",
-              "dockerfile": "src/runtime-deps/11.0/noble-chiseled/arm64v8",
+              "dockerfile": "src/runtime-deps/11.0/resolute-chiseled/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -2730,27 +2730,27 @@
                   "name": "test-dependencies",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-arm64v8"
                   ]
                 },
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-arm64v8"
                   ]
                 }
               ]
             },
             {
               "architecture": "arm",
-              "dockerfile": "src/runtime-deps/11.0/noble-chiseled/arm32v7",
+              "dockerfile": "src/runtime-deps/11.0/resolute-chiseled/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -2758,7 +2758,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm32v7"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-arm32v7"
                   ]
                 }
               ]
@@ -2768,38 +2768,38 @@
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra": {},
-            "$(dotnet|11.0|minor-tag)-noble-chiseled-extra": {}
+            "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra": {},
+            "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra": {}
           },
           "platforms": [
             {
-              "dockerfile": "src/runtime-deps/11.0/noble-chiseled-extra/amd64",
+              "dockerfile": "src/runtime-deps/11.0/resolute-chiseled-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu.extra",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-amd64": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-amd64"
                   ]
                 }
               ]
             },
             {
               "architecture": "arm64",
-              "dockerfile": "src/runtime-deps/11.0/noble-chiseled-extra/arm64v8",
+              "dockerfile": "src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu.extra",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -2807,20 +2807,20 @@
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-arm64v8"
                   ]
                 }
               ]
             },
             {
               "architecture": "arm",
-              "dockerfile": "src/runtime-deps/11.0/noble-chiseled-extra/arm32v7",
+              "dockerfile": "src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu.extra",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -2828,7 +2828,7 @@
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm32v7"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-arm32v7"
                   ]
                 }
               ]
@@ -5057,8 +5057,8 @@
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-noble": {},
-            "$(dotnet|11.0|minor-tag)-noble": {},
+            "$(dotnet|11.0|fixed-tag)-resolute": {},
+            "$(dotnet|11.0|minor-tag)-resolute": {},
             "$(dotnet|11.0|fixed-tag)": {},
             "$(dotnet|11.0|minor-tag)": {},
             "latest": {}
@@ -5068,13 +5068,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/11.0/noble/amd64",
+              "dockerfile": "src/runtime/11.0/resolute/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "resolute",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-amd64": {},
-                "$(dotnet|11.0|minor-tag)-noble-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-amd64": {},
+                "$(dotnet|11.0|minor-tag)-resolute-amd64": {}
               }
             },
             {
@@ -5082,13 +5082,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/11.0/noble/arm32v7",
+              "dockerfile": "src/runtime/11.0/resolute/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "resolute",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-noble-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-resolute-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -5097,13 +5097,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/11.0/noble/arm64v8",
+              "dockerfile": "src/runtime/11.0/resolute/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "resolute",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-noble-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-resolute-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -5329,28 +5329,28 @@
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-noble-chiseled": {},
-            "$(dotnet|11.0|minor-tag)-noble-chiseled": {}
+            "$(dotnet|11.0|fixed-tag)-resolute-chiseled": {},
+            "$(dotnet|11.0|minor-tag)-resolute-chiseled": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/11.0/noble-chiseled/amd64",
+              "dockerfile": "src/runtime/11.0/resolute-chiseled/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-amd64": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-amd64": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-amd64"
                   ]
                 }
               ]
@@ -5360,13 +5360,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/11.0/noble-chiseled/arm64v8",
+              "dockerfile": "src/runtime/11.0/resolute-chiseled/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -5374,7 +5374,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-arm64v8"
                   ]
                 }
               ]
@@ -5384,13 +5384,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/11.0/noble-chiseled/arm32v7",
+              "dockerfile": "src/runtime/11.0/resolute-chiseled/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -5398,7 +5398,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm32v7"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-arm32v7"
                   ]
                 }
               ]
@@ -5408,35 +5408,35 @@
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra": {},
-            "$(dotnet|11.0|minor-tag)-noble-chiseled-extra": {}
+            "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra": {},
+            "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/11.0/noble-chiseled-extra/amd64",
+              "dockerfile": "src/runtime/11.0/resolute-chiseled-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-amd64": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-amd64"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:runtime):$(dotnet|11.0|minor-tag)-noble-chiseled-amd64"
+                    "$(Repo:runtime):$(dotnet|11.0|minor-tag)-resolute-chiseled-amd64"
                   ]
                 }
               ]
@@ -5446,13 +5446,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/11.0/noble-chiseled-extra/arm64v8",
+              "dockerfile": "src/runtime/11.0/resolute-chiseled-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -5460,14 +5460,14 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-arm64v8"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:runtime):$(dotnet|11.0|minor-tag)-noble-chiseled-arm64v8"
+                    "$(Repo:runtime):$(dotnet|11.0|minor-tag)-resolute-chiseled-arm64v8"
                   ]
                 }
               ]
@@ -5477,13 +5477,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/11.0/noble-chiseled-extra/arm32v7",
+              "dockerfile": "src/runtime/11.0/resolute-chiseled-extra/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -5491,14 +5491,14 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm32v7"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-arm32v7"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:runtime):$(dotnet|11.0|minor-tag)-noble-chiseled-arm32v7"
+                    "$(Repo:runtime):$(dotnet|11.0|minor-tag)-resolute-chiseled-arm32v7"
                   ]
                 }
               ]
@@ -9081,8 +9081,8 @@
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-noble": {},
-            "$(dotnet|11.0|minor-tag)-noble": {},
+            "$(dotnet|11.0|fixed-tag)-resolute": {},
+            "$(dotnet|11.0|minor-tag)-resolute": {},
             "$(dotnet|11.0|fixed-tag)": {},
             "$(dotnet|11.0|minor-tag)": {},
             "latest": {}
@@ -9092,13 +9092,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/11.0/noble/amd64",
+              "dockerfile": "src/aspnet/11.0/resolute/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "resolute",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-amd64": {},
-                "$(dotnet|11.0|minor-tag)-noble-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-amd64": {},
+                "$(dotnet|11.0|minor-tag)-resolute-amd64": {}
               }
             },
             {
@@ -9106,13 +9106,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/11.0/noble/arm32v7",
+              "dockerfile": "src/aspnet/11.0/resolute/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "resolute",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-noble-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-resolute-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -9121,13 +9121,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/11.0/noble/arm64v8",
+              "dockerfile": "src/aspnet/11.0/resolute/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "resolute",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-noble-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-resolute-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -9561,28 +9561,28 @@
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-noble-chiseled": {},
-            "$(dotnet|11.0|minor-tag)-noble-chiseled": {}
+            "$(dotnet|11.0|fixed-tag)-resolute-chiseled": {},
+            "$(dotnet|11.0|minor-tag)-resolute-chiseled": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/11.0/noble-chiseled/amd64",
+              "dockerfile": "src/aspnet/11.0/resolute-chiseled/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-amd64": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-amd64": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-amd64"
                   ]
                 }
               ]
@@ -9592,13 +9592,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/11.0/noble-chiseled/arm64v8",
+              "dockerfile": "src/aspnet/11.0/resolute-chiseled/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -9606,7 +9606,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-arm64v8"
                   ]
                 }
               ]
@@ -9616,13 +9616,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/11.0/noble-chiseled/arm32v7",
+              "dockerfile": "src/aspnet/11.0/resolute-chiseled/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -9630,7 +9630,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm32v7"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-arm32v7"
                   ]
                 }
               ]
@@ -9640,35 +9640,35 @@
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra": {},
-            "$(dotnet|11.0|minor-tag)-noble-chiseled-extra": {}
+            "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra": {},
+            "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/11.0/noble-chiseled-extra/amd64",
+              "dockerfile": "src/aspnet/11.0/resolute-chiseled-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-amd64": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-amd64"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:aspnet):$(dotnet|11.0|minor-tag)-noble-chiseled-amd64"
+                    "$(Repo:aspnet):$(dotnet|11.0|minor-tag)-resolute-chiseled-amd64"
                   ]
                 }
               ]
@@ -9678,13 +9678,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/11.0/noble-chiseled-extra/arm64v8",
+              "dockerfile": "src/aspnet/11.0/resolute-chiseled-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -9692,14 +9692,14 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-arm64v8"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:aspnet):$(dotnet|11.0|minor-tag)-noble-chiseled-arm64v8"
+                    "$(Repo:aspnet):$(dotnet|11.0|minor-tag)-resolute-chiseled-arm64v8"
                   ]
                 }
               ]
@@ -9709,13 +9709,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/11.0/noble-chiseled-extra/arm32v7",
+              "dockerfile": "src/aspnet/11.0/resolute-chiseled-extra/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-extra-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-extra-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -9723,14 +9723,14 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-noble-arm32v7"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-resolute-arm32v7"
                   ]
                 },
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:aspnet):$(dotnet|11.0|minor-tag)-noble-chiseled-arm32v7"
+                    "$(Repo:aspnet):$(dotnet|11.0|minor-tag)-resolute-chiseled-arm32v7"
                   ]
                 }
               ]
@@ -9740,21 +9740,21 @@
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite-extra": {},
-            "$(dotnet|11.0|minor-tag)-noble-chiseled-composite-extra": {}
+            "$(dotnet|11.0|fixed-tag)-resolute-chiseled-composite-extra": {},
+            "$(dotnet|11.0|minor-tag)-resolute-chiseled-composite-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/11.0/noble-chiseled-composite-extra/amd64",
+              "dockerfile": "src/aspnet/11.0/resolute-chiseled-composite-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite-extra-amd64": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-composite-extra-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-composite-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-composite-extra-amd64": {}
               }
             },
             {
@@ -9762,13 +9762,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8",
+              "dockerfile": "src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite-extra-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-composite-extra-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-composite-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-composite-extra-arm64v8": {}
               },
               "variant": "v8"
             },
@@ -9777,13 +9777,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7",
+              "dockerfile": "src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite-extra-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-composite-extra-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-composite-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-composite-extra-arm32v7": {}
               },
               "variant": "v7"
             }
@@ -9792,21 +9792,21 @@
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite": {},
-            "$(dotnet|11.0|minor-tag)-noble-chiseled-composite": {}
+            "$(dotnet|11.0|fixed-tag)-resolute-chiseled-composite": {},
+            "$(dotnet|11.0|minor-tag)-resolute-chiseled-composite": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/11.0/noble-chiseled-composite/amd64",
+              "dockerfile": "src/aspnet/11.0/resolute-chiseled-composite/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite-amd64": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-composite-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-composite-amd64": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-composite-amd64": {}
               }
             },
             {
@@ -9814,13 +9814,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/11.0/noble-chiseled-composite/arm64v8",
+              "dockerfile": "src/aspnet/11.0/resolute-chiseled-composite/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-composite-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-composite-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-composite-arm64v8": {}
               },
               "variant": "v8"
             },
@@ -9829,13 +9829,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/11.0/noble-chiseled-composite/arm32v7",
+              "dockerfile": "src/aspnet/11.0/resolute-chiseled-composite/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "noble-chiseled",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-noble-chiseled-composite-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-noble-chiseled-composite-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-resolute-chiseled-composite-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-resolute-chiseled-composite-arm32v7": {}
               },
               "variant": "v7"
             }
@@ -11174,8 +11174,8 @@
         {
           "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
-            "$(sdk|11.0|fixed-tag)-noble": {},
-            "$(sdk|11.0|minor-tag)-noble": {},
+            "$(sdk|11.0|fixed-tag)-resolute": {},
+            "$(sdk|11.0|minor-tag)-resolute": {},
             "$(sdk|11.0|fixed-tag)": {},
             "$(sdk|11.0|minor-tag)": {},
             "latest": {}
@@ -11185,13 +11185,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:aspnet)"
               },
-              "dockerfile": "src/sdk/11.0/noble/amd64",
+              "dockerfile": "src/sdk/11.0/resolute/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "resolute",
               "tags": {
-                "$(sdk|11.0|fixed-tag)-noble-amd64": {},
-                "$(sdk|11.0|minor-tag)-noble-amd64": {}
+                "$(sdk|11.0|fixed-tag)-resolute-amd64": {},
+                "$(sdk|11.0|minor-tag)-resolute-amd64": {}
               }
             },
             {
@@ -11199,13 +11199,13 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm",
-              "dockerfile": "src/sdk/11.0/noble/arm32v7",
+              "dockerfile": "src/sdk/11.0/resolute/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "resolute",
               "tags": {
-                "$(sdk|11.0|fixed-tag)-noble-arm32v7": {},
-                "$(sdk|11.0|minor-tag)-noble-arm32v7": {}
+                "$(sdk|11.0|fixed-tag)-resolute-arm32v7": {},
+                "$(sdk|11.0|minor-tag)-resolute-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -11214,13 +11214,13 @@
                 "REPO": "$(Repo:aspnet)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/11.0/noble/arm64v8",
+              "dockerfile": "src/sdk/11.0/resolute/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "resolute",
               "tags": {
-                "$(sdk|11.0|fixed-tag)-noble-arm64v8": {},
-                "$(sdk|11.0|minor-tag)-noble-arm64v8": {}
+                "$(sdk|11.0|fixed-tag)-resolute-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-resolute-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -11229,8 +11229,8 @@
         {
           "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
-            "$(sdk|11.0|fixed-tag)-noble-aot": {},
-            "$(sdk|11.0|minor-tag)-noble-aot": {},
+            "$(sdk|11.0|fixed-tag)-resolute-aot": {},
+            "$(sdk|11.0|minor-tag)-resolute-aot": {},
             "$(sdk|11.0|fixed-tag)-aot": {},
             "$(sdk|11.0|minor-tag)-aot": {}
           },
@@ -11239,13 +11239,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:sdk)"
               },
-              "dockerfile": "src/sdk/11.0/noble-aot/amd64",
+              "dockerfile": "src/sdk/11.0/resolute-aot/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "resolute",
               "tags": {
-                "$(sdk|11.0|fixed-tag)-noble-aot-amd64": {},
-                "$(sdk|11.0|minor-tag)-noble-aot-amd64": {}
+                "$(sdk|11.0|fixed-tag)-resolute-aot-amd64": {},
+                "$(sdk|11.0|minor-tag)-resolute-aot-amd64": {}
               }
             },
             {
@@ -11253,13 +11253,13 @@
                 "REPO": "$(Repo:sdk)"
               },
               "architecture": "arm64",
-              "dockerfile": "src/sdk/11.0/noble-aot/arm64v8",
+              "dockerfile": "src/sdk/11.0/resolute-aot/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "resolute",
               "tags": {
-                "$(sdk|11.0|fixed-tag)-noble-aot-arm64v8": {},
-                "$(sdk|11.0|minor-tag)-noble-aot-arm64v8": {}
+                "$(sdk|11.0|fixed-tag)-resolute-aot-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-resolute-aot-arm64v8": {}
               },
               "variant": "v8"
             }
diff --git a/manifest.versions.json b/manifest.versions.json
index 713ec64dc5..22ff8780a0 100644
--- a/manifest.versions.json
+++ b/manifest.versions.json
@@ -112,6 +112,7 @@
     "libicu|focal": 66,
     "libicu|jammy": 70,
     "libicu|noble": 74,
+    "libicu|resolute": 76,
 
     "libssl|alpine3.22": "3",
     "libssl|alpine3.23": "3",
@@ -120,6 +121,7 @@
     "libssl|focal": "1.1",
     "libssl|jammy": "3",
     "libssl|noble": "3t64",
+    "libssl|resolute": "3t64",
 
     "mingit|latest|x64|url": "https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip",
     "mingit|latest|x64|sha": "f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2",
diff --git a/src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile
similarity index 100%
rename from src/aspnet/11.0/noble-chiseled-composite-extra/amd64/Dockerfile
rename to src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile
diff --git a/src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
similarity index 100%
rename from src/aspnet/11.0/noble-chiseled-composite-extra/arm32v7/Dockerfile
rename to src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
diff --git a/src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile
similarity index 100%
rename from src/aspnet/11.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
rename to src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile
diff --git a/src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile
similarity index 100%
rename from src/aspnet/11.0/noble-chiseled-composite/amd64/Dockerfile
rename to src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile
diff --git a/src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
similarity index 100%
rename from src/aspnet/11.0/noble-chiseled-composite/arm32v7/Dockerfile
rename to src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
diff --git a/src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile
similarity index 100%
rename from src/aspnet/11.0/noble-chiseled-composite/arm64v8/Dockerfile
rename to src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile
diff --git a/src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile
similarity index 100%
rename from src/aspnet/11.0/noble-chiseled-extra/amd64/Dockerfile
rename to src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile
diff --git a/src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
similarity index 100%
rename from src/aspnet/11.0/noble-chiseled-extra/arm32v7/Dockerfile
rename to src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
diff --git a/src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
similarity index 100%
rename from src/aspnet/11.0/noble-chiseled-extra/arm64v8/Dockerfile
rename to src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
diff --git a/src/aspnet/11.0/noble-chiseled/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile
similarity index 100%
rename from src/aspnet/11.0/noble-chiseled/amd64/Dockerfile
rename to src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile
diff --git a/src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
similarity index 100%
rename from src/aspnet/11.0/noble-chiseled/arm32v7/Dockerfile
rename to src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
diff --git a/src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile
similarity index 100%
rename from src/aspnet/11.0/noble-chiseled/arm64v8/Dockerfile
rename to src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile
diff --git a/src/aspnet/11.0/noble/amd64/Dockerfile b/src/aspnet/11.0/resolute/amd64/Dockerfile
similarity index 92%
rename from src/aspnet/11.0/noble/amd64/Dockerfile
rename to src/aspnet/11.0/resolute/amd64/Dockerfile
index 895454d8d6..d29e3eedfe 100644
--- a/src/aspnet/11.0/noble/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute/amd64/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=11.0.0-alpha.1 \
@@ -18,7 +18,7 @@ RUN aspnetcore_version=11.0.0-alpha.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-alpha.1-noble-amd64
+FROM $REPO:11.0.0-alpha.1-resolute-amd64
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=11.0.0-alpha.1
diff --git a/src/aspnet/11.0/noble/arm32v7/Dockerfile b/src/aspnet/11.0/resolute/arm32v7/Dockerfile
similarity index 92%
rename from src/aspnet/11.0/noble/arm32v7/Dockerfile
rename to src/aspnet/11.0/resolute/arm32v7/Dockerfile
index d2909beab2..4485f69479 100644
--- a/src/aspnet/11.0/noble/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=11.0.0-alpha.1 \
@@ -18,7 +18,7 @@ RUN aspnetcore_version=11.0.0-alpha.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-alpha.1-noble-arm32v7
+FROM $REPO:11.0.0-alpha.1-resolute-arm32v7
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=11.0.0-alpha.1
diff --git a/src/aspnet/11.0/noble/arm64v8/Dockerfile b/src/aspnet/11.0/resolute/arm64v8/Dockerfile
similarity index 92%
rename from src/aspnet/11.0/noble/arm64v8/Dockerfile
rename to src/aspnet/11.0/resolute/arm64v8/Dockerfile
index 1ba947e9e3..4a21a63403 100644
--- a/src/aspnet/11.0/noble/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute/arm64v8/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=11.0.0-alpha.1 \
@@ -18,7 +18,7 @@ RUN aspnetcore_version=11.0.0-alpha.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-alpha.1-noble-arm64v8
+FROM $REPO:11.0.0-alpha.1-resolute-arm64v8
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=11.0.0-alpha.1
diff --git a/src/runtime-deps/11.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile
similarity index 100%
rename from src/runtime-deps/11.0/noble-chiseled-extra/amd64/Dockerfile
rename to src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile
diff --git a/src/runtime-deps/11.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
similarity index 100%
rename from src/runtime-deps/11.0/noble-chiseled-extra/arm32v7/Dockerfile
rename to src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
diff --git a/src/runtime-deps/11.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
similarity index 100%
rename from src/runtime-deps/11.0/noble-chiseled-extra/arm64v8/Dockerfile
rename to src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
diff --git a/src/runtime-deps/11.0/noble-chiseled/amd64/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile
similarity index 100%
rename from src/runtime-deps/11.0/noble-chiseled/amd64/Dockerfile
rename to src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile
diff --git a/src/runtime-deps/11.0/noble-chiseled/arm32v7/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile
similarity index 100%
rename from src/runtime-deps/11.0/noble-chiseled/arm32v7/Dockerfile
rename to src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile
diff --git a/src/runtime-deps/11.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile
similarity index 100%
rename from src/runtime-deps/11.0/noble-chiseled/arm64v8/Dockerfile
rename to src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-amd64-Dockerfile.approved.txt b/src/runtime-deps/11.0/resolute/amd64/Dockerfile
similarity index 90%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-amd64-Dockerfile.approved.txt
rename to src/runtime-deps/11.0/resolute/amd64/Dockerfile
index 1be9446078..79b4af5af5 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-amd64-Dockerfile.approved.txt
+++ b/src/runtime-deps/11.0/resolute/amd64/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu.azurecr.io/ubuntu:noble
+FROM ubuntu.azurecr.io/ubuntu:resolute
 
 ENV \
     # UID of the non-root user 'app'
@@ -15,11 +15,10 @@ RUN apt-get update \
         # .NET dependencies
         libc6 \
         libgcc-s1 \
-        libicu74 \
+        libicu76 \
         libssl3t64 \
         libstdc++6 \
         tzdata \
-        tzdata-legacy \
     && rm -rf /var/lib/apt/lists/*
 
 # Create a non-root user and group
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm32v7-Dockerfile.approved.txt b/src/runtime-deps/11.0/resolute/arm32v7/Dockerfile
similarity index 90%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm32v7-Dockerfile.approved.txt
rename to src/runtime-deps/11.0/resolute/arm32v7/Dockerfile
index 1be9446078..79b4af5af5 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm32v7-Dockerfile.approved.txt
+++ b/src/runtime-deps/11.0/resolute/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu.azurecr.io/ubuntu:noble
+FROM ubuntu.azurecr.io/ubuntu:resolute
 
 ENV \
     # UID of the non-root user 'app'
@@ -15,11 +15,10 @@ RUN apt-get update \
         # .NET dependencies
         libc6 \
         libgcc-s1 \
-        libicu74 \
+        libicu76 \
         libssl3t64 \
         libstdc++6 \
         tzdata \
-        tzdata-legacy \
     && rm -rf /var/lib/apt/lists/*
 
 # Create a non-root user and group
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm64v8-Dockerfile.approved.txt b/src/runtime-deps/11.0/resolute/arm64v8/Dockerfile
similarity index 90%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm64v8-Dockerfile.approved.txt
rename to src/runtime-deps/11.0/resolute/arm64v8/Dockerfile
index 1be9446078..79b4af5af5 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-arm64v8-Dockerfile.approved.txt
+++ b/src/runtime-deps/11.0/resolute/arm64v8/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu.azurecr.io/ubuntu:noble
+FROM ubuntu.azurecr.io/ubuntu:resolute
 
 ENV \
     # UID of the non-root user 'app'
@@ -15,11 +15,10 @@ RUN apt-get update \
         # .NET dependencies
         libc6 \
         libgcc-s1 \
-        libicu74 \
+        libicu76 \
         libssl3t64 \
         libstdc++6 \
         tzdata \
-        tzdata-legacy \
     && rm -rf /var/lib/apt/lists/*
 
 # Create a non-root user and group
diff --git a/src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile
similarity index 100%
rename from src/runtime/11.0/noble-chiseled-extra/amd64/Dockerfile
rename to src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile
diff --git a/src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
similarity index 100%
rename from src/runtime/11.0/noble-chiseled-extra/arm32v7/Dockerfile
rename to src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
diff --git a/src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
similarity index 100%
rename from src/runtime/11.0/noble-chiseled-extra/arm64v8/Dockerfile
rename to src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
diff --git a/src/runtime/11.0/noble-chiseled/amd64/Dockerfile b/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile
similarity index 100%
rename from src/runtime/11.0/noble-chiseled/amd64/Dockerfile
rename to src/runtime/11.0/resolute-chiseled/amd64/Dockerfile
diff --git a/src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile b/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
similarity index 100%
rename from src/runtime/11.0/noble-chiseled/arm32v7/Dockerfile
rename to src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
diff --git a/src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile
similarity index 100%
rename from src/runtime/11.0/noble-chiseled/arm64v8/Dockerfile
rename to src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile
diff --git a/src/runtime/11.0/noble/amd64/Dockerfile b/src/runtime/11.0/resolute/amd64/Dockerfile
similarity index 92%
rename from src/runtime/11.0/noble/amd64/Dockerfile
rename to src/runtime/11.0/resolute/amd64/Dockerfile
index ae89a443d9..dd9c038ce1 100644
--- a/src/runtime/11.0/noble/amd64/Dockerfile
+++ b/src/runtime/11.0/resolute/amd64/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
 RUN dotnet_version=11.0.0-alpha.1 \
@@ -18,7 +18,7 @@ RUN dotnet_version=11.0.0-alpha.1 \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-alpha.1-noble-amd64
+FROM $REPO:11.0.0-alpha.1-resolute-amd64
 
 # .NET Runtime version
 ENV DOTNET_VERSION=11.0.0-alpha.1
diff --git a/src/runtime/11.0/noble/arm32v7/Dockerfile b/src/runtime/11.0/resolute/arm32v7/Dockerfile
similarity index 91%
rename from src/runtime/11.0/noble/arm32v7/Dockerfile
rename to src/runtime/11.0/resolute/arm32v7/Dockerfile
index 341ba81b8f..f9a876db7c 100644
--- a/src/runtime/11.0/noble/arm32v7/Dockerfile
+++ b/src/runtime/11.0/resolute/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
 RUN dotnet_version=11.0.0-alpha.1 \
@@ -18,7 +18,7 @@ RUN dotnet_version=11.0.0-alpha.1 \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-alpha.1-noble-arm32v7
+FROM $REPO:11.0.0-alpha.1-resolute-arm32v7
 
 # .NET Runtime version
 ENV DOTNET_VERSION=11.0.0-alpha.1
diff --git a/src/runtime/11.0/noble/arm64v8/Dockerfile b/src/runtime/11.0/resolute/arm64v8/Dockerfile
similarity index 92%
rename from src/runtime/11.0/noble/arm64v8/Dockerfile
rename to src/runtime/11.0/resolute/arm64v8/Dockerfile
index a8e859fe86..d063733ab3 100644
--- a/src/runtime/11.0/noble/arm64v8/Dockerfile
+++ b/src/runtime/11.0/resolute/arm64v8/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
 RUN dotnet_version=11.0.0-alpha.1 \
@@ -18,7 +18,7 @@ RUN dotnet_version=11.0.0-alpha.1 \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-alpha.1-noble-arm64v8
+FROM $REPO:11.0.0-alpha.1-resolute-arm64v8
 
 # .NET Runtime version
 ENV DOTNET_VERSION=11.0.0-alpha.1
diff --git a/src/sdk/11.0/noble-aot/amd64/Dockerfile b/src/sdk/11.0/resolute-aot/amd64/Dockerfile
similarity index 84%
rename from src/sdk/11.0/noble-aot/amd64/Dockerfile
rename to src/sdk/11.0/resolute-aot/amd64/Dockerfile
index 8cd7b1faba..492515f691 100644
--- a/src/sdk/11.0/noble-aot/amd64/Dockerfile
+++ b/src/sdk/11.0/resolute-aot/amd64/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:11.0.100-alpha.1-noble-amd64
+FROM $REPO:11.0.100-alpha.1-resolute-amd64
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
diff --git a/src/sdk/11.0/noble-aot/arm64v8/Dockerfile b/src/sdk/11.0/resolute-aot/arm64v8/Dockerfile
similarity index 83%
rename from src/sdk/11.0/noble-aot/arm64v8/Dockerfile
rename to src/sdk/11.0/resolute-aot/arm64v8/Dockerfile
index eae2fe9407..81dd5a9b67 100644
--- a/src/sdk/11.0/noble-aot/arm64v8/Dockerfile
+++ b/src/sdk/11.0/resolute-aot/arm64v8/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:11.0.100-alpha.1-noble-arm64v8
+FROM $REPO:11.0.100-alpha.1-resolute-arm64v8
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
diff --git a/src/sdk/11.0/noble/amd64/Dockerfile b/src/sdk/11.0/resolute/amd64/Dockerfile
similarity index 95%
rename from src/sdk/11.0/noble/amd64/Dockerfile
rename to src/sdk/11.0/resolute/amd64/Dockerfile
index 0daf12f625..56ae4912e8 100644
--- a/src/sdk/11.0/noble/amd64/Dockerfile
+++ b/src/sdk/11.0/resolute/amd64/Dockerfile
@@ -1,6 +1,6 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Install .NET SDK
 RUN dotnet_sdk_version=11.0.100-alpha.1 \
@@ -17,7 +17,7 @@ RUN dotnet_sdk_version=11.0.100-alpha.1 \
 
 
 # .NET SDK image
-FROM $REPO:11.0.0-alpha.1-noble-amd64
+FROM $REPO:11.0.0-alpha.1-resolute-amd64
 
 ENV \
     # Do not generate certificate
@@ -31,7 +31,7 @@ ENV \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
     NUGET_XMLDOC_MODE=skip \
     # PowerShell telemetry for docker image usage
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04 \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04 \
     # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
     DOTNET_ROLL_FORWARD=Major
 
diff --git a/src/sdk/11.0/noble/arm32v7/Dockerfile b/src/sdk/11.0/resolute/arm32v7/Dockerfile
similarity index 95%
rename from src/sdk/11.0/noble/arm32v7/Dockerfile
rename to src/sdk/11.0/resolute/arm32v7/Dockerfile
index db737c21eb..9adfc81ce4 100644
--- a/src/sdk/11.0/noble/arm32v7/Dockerfile
+++ b/src/sdk/11.0/resolute/arm32v7/Dockerfile
@@ -1,6 +1,6 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Install .NET SDK
 RUN dotnet_sdk_version=11.0.100-alpha.1 \
@@ -17,7 +17,7 @@ RUN dotnet_sdk_version=11.0.100-alpha.1 \
 
 
 # .NET SDK image
-FROM $REPO:11.0.0-alpha.1-noble-arm32v7
+FROM $REPO:11.0.0-alpha.1-resolute-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -31,7 +31,7 @@ ENV \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
     NUGET_XMLDOC_MODE=skip \
     # PowerShell telemetry for docker image usage
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm32 \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm32 \
     # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
     DOTNET_ROLL_FORWARD=Major
 
diff --git a/src/sdk/11.0/noble/arm64v8/Dockerfile b/src/sdk/11.0/resolute/arm64v8/Dockerfile
similarity index 95%
rename from src/sdk/11.0/noble/arm64v8/Dockerfile
rename to src/sdk/11.0/resolute/arm64v8/Dockerfile
index 6b41ce23dd..8c6c5e1a4a 100644
--- a/src/sdk/11.0/noble/arm64v8/Dockerfile
+++ b/src/sdk/11.0/resolute/arm64v8/Dockerfile
@@ -1,6 +1,6 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Install .NET SDK
 RUN dotnet_sdk_version=11.0.100-alpha.1 \
@@ -17,7 +17,7 @@ RUN dotnet_sdk_version=11.0.100-alpha.1 \
 
 
 # .NET SDK image
-FROM $REPO:11.0.0-alpha.1-noble-arm64v8
+FROM $REPO:11.0.0-alpha.1-resolute-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -31,7 +31,7 @@ ENV \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
     NUGET_XMLDOC_MODE=skip \
     # PowerShell telemetry for docker image usage
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm64 \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm64 \
     # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
     DOTNET_ROLL_FORWARD=Major
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-amd64-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm32v7-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-arm64v8-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-amd64-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm32v7-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-arm64v8-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-amd64-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-amd64-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm32v7-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-arm64v8-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
diff --git a/src/runtime-deps/11.0/noble/amd64/Dockerfile b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-amd64-Dockerfile.approved.txt
similarity index 100%
rename from src/runtime-deps/11.0/noble/amd64/Dockerfile
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-amd64-Dockerfile.approved.txt
diff --git a/src/runtime-deps/11.0/noble/arm32v7/Dockerfile b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm32v7-Dockerfile.approved.txt
similarity index 100%
rename from src/runtime-deps/11.0/noble/arm32v7/Dockerfile
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm32v7-Dockerfile.approved.txt
diff --git a/src/runtime-deps/11.0/noble/arm64v8/Dockerfile b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm64v8-Dockerfile.approved.txt
similarity index 100%
rename from src/runtime-deps/11.0/noble/arm64v8/Dockerfile
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm64v8-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-amd64-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-arm32v7-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-arm64v8-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-amd64-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-aot-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-aot-amd64-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-aot-amd64-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-aot-amd64-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-aot-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-aot-arm64v8-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-aot-arm64v8-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-aot-arm64v8-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm32v7-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt
similarity index 100%
rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-noble-arm64v8-Dockerfile.approved.txt
rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt
diff --git a/tests/Microsoft.DotNet.Docker.Tests/OS.cs b/tests/Microsoft.DotNet.Docker.Tests/OS.cs
index 79f9c718d2..41eb07f3e4 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/OS.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/OS.cs
@@ -33,6 +33,8 @@ public static class OS
         public const string JammyChiseled = $"{Jammy}{ChiseledSuffix}";
         public const string Noble = "noble";
         public const string NobleChiseled = $"{Noble}{ChiseledSuffix}";
+        public const string Resolute = "resolute";
+        public const string ResoluteChiseled = $"{Resolute}{ChiseledSuffix}";
         public const string UbuntuChiseled = $"ubuntu{ChiseledSuffix}";
 
         // Windows
diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
index 9c0d206d45..e430079edf 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
@@ -287,13 +287,13 @@ public static class TestData
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
 
 
-            new ProductImageData { Version = V11_0, OS = OS.Noble,               Arch = Arch.Amd64 },
-            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Amd64,   SdkOS = OS.Noble },
-            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Amd64,   SdkOS = OS.Noble,
+            new ProductImageData { Version = V11_0, OS = OS.Resolute,               Arch = Arch.Amd64 },
+            new ProductImageData { Version = V11_0, OS = OS.ResoluteChiseled,       Arch = Arch.Amd64,   SdkOS = OS.Resolute },
+            new ProductImageData { Version = V11_0, OS = OS.ResoluteChiseled,       Arch = Arch.Amd64,   SdkOS = OS.Resolute,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
-            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Amd64,   SdkOS = OS.Noble,
+            new ProductImageData { Version = V11_0, OS = OS.ResoluteChiseled,       Arch = Arch.Amd64,   SdkOS = OS.Resolute,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
-            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Amd64,   SdkOS = OS.Noble,
+            new ProductImageData { Version = V11_0, OS = OS.ResoluteChiseled,       Arch = Arch.Amd64,   SdkOS = OS.Resolute,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Amd64 },
             new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Amd64,   SdkOS = OS.Alpine322,
@@ -317,7 +317,7 @@ public static class TestData
             new() { Version = V11_0, Arch = Arch.Amd64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine322 },
             new() { Version = V11_0, Arch = Arch.Amd64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine323 },
             new() { Version = V11_0, Arch = Arch.Amd64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.AzureLinux30Distroless, SdkOS = OS.AzureLinux30 },
-            new() { Version = V11_0, Arch = Arch.Amd64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.NobleChiseled, SdkOS = OS.Noble },
+            new() { Version = V11_0, Arch = Arch.Amd64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.ResoluteChiseled, SdkOS = OS.Resolute },
 
             new ProductImageData { Version = V11_0, OS = OS.AzureLinux30,           Arch = Arch.Arm64 },
             new ProductImageData { Version = V11_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Arm64,   SdkOS = OS.AzureLinux30 },
@@ -327,13 +327,13 @@ public static class TestData
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Arm64,   SdkOS = OS.AzureLinux30,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
-            new ProductImageData { Version = V11_0, OS = OS.Noble,               Arch = Arch.Arm64 },
-            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm64,   SdkOS = OS.Noble },
-            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm64,   SdkOS = OS.Noble,
+            new ProductImageData { Version = V11_0, OS = OS.Resolute,               Arch = Arch.Arm64 },
+            new ProductImageData { Version = V11_0, OS = OS.ResoluteChiseled,       Arch = Arch.Arm64,   SdkOS = OS.Resolute },
+            new ProductImageData { Version = V11_0, OS = OS.ResoluteChiseled,       Arch = Arch.Arm64,   SdkOS = OS.Resolute,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
-            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm64,   SdkOS = OS.Noble,
+            new ProductImageData { Version = V11_0, OS = OS.ResoluteChiseled,       Arch = Arch.Arm64,   SdkOS = OS.Resolute,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
-            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm64,   SdkOS = OS.Noble,
+            new ProductImageData { Version = V11_0, OS = OS.ResoluteChiseled,       Arch = Arch.Arm64,   SdkOS = OS.Resolute,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Arm64 },
             new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Arm64,   SdkOS = OS.Alpine322,
@@ -349,7 +349,7 @@ public static class TestData
             new() { Version = V11_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine322 },
             new() { Version = V11_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine323 },
             new() { Version = V11_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.AzureLinux30Distroless, SdkOS = OS.AzureLinux30 },
-            new() { Version = V11_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.NobleChiseled, SdkOS = OS.Noble },
+            new() { Version = V11_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.ResoluteChiseled, SdkOS = OS.Resolute },
 
             new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Arm },
             new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Arm,     SdkOS = OS.Alpine322,
@@ -361,13 +361,13 @@ public static class TestData
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
-            new ProductImageData { Version = V11_0, OS = OS.Noble,               Arch = Arch.Arm },
-            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm,     SdkOS = OS.Noble },
-            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm,     SdkOS = OS.Noble,
+            new ProductImageData { Version = V11_0, OS = OS.Resolute,               Arch = Arch.Arm },
+            new ProductImageData { Version = V11_0, OS = OS.ResoluteChiseled,       Arch = Arch.Arm,     SdkOS = OS.Resolute },
+            new ProductImageData { Version = V11_0, OS = OS.ResoluteChiseled,       Arch = Arch.Arm,     SdkOS = OS.Resolute,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
-            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm,     SdkOS = OS.Noble,
+            new ProductImageData { Version = V11_0, OS = OS.ResoluteChiseled,       Arch = Arch.Arm,     SdkOS = OS.Resolute,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
-            new ProductImageData { Version = V11_0, OS = OS.NobleChiseled,       Arch = Arch.Arm,     SdkOS = OS.Noble,
+            new ProductImageData { Version = V11_0, OS = OS.ResoluteChiseled,       Arch = Arch.Arm,     SdkOS = OS.Resolute,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
         };
 

From 64ee05a068dc03fbd761fc41eee73865c7a90a11 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Thu, 11 Dec 2025 14:46:07 -0800
Subject: [PATCH 06/23] Update baselines for resolute

---
 .../aspnet-11.0-resolute-amd64-Dockerfile.approved.txt      | 4 ++--
 .../aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt    | 4 ++--
 .../aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt    | 4 ++--
 .../runtime-11.0-resolute-amd64-Dockerfile.approved.txt     | 4 ++--
 .../runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt   | 4 ++--
 .../runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt   | 4 ++--
 ...runtime-deps-11.0-resolute-amd64-Dockerfile.approved.txt | 5 ++---
 ...ntime-deps-11.0-resolute-arm32v7-Dockerfile.approved.txt | 5 ++---
 ...ntime-deps-11.0-resolute-arm64v8-Dockerfile.approved.txt | 5 ++---
 .../sdk-11.0-resolute-amd64-Dockerfile.approved.txt         | 6 +++---
 .../sdk-11.0-resolute-aot-amd64-Dockerfile.approved.txt     | 2 +-
 .../sdk-11.0-resolute-aot-arm64v8-Dockerfile.approved.txt   | 2 +-
 .../sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt       | 6 +++---
 .../sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt       | 6 +++---
 14 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt
index b68c8d2281..209b39ca31 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -20,7 +20,7 @@ RUN aspnetcore_version=0.0.0 \
 
 
 # ASP.NET Core image
-FROM $REPO:0.0.0-noble-amd64
+FROM $REPO:0.0.0-resolute-amd64
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt
index 813eddda2f..674423bb81 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -20,7 +20,7 @@ RUN aspnetcore_version=0.0.0 \
 
 
 # ASP.NET Core image
-FROM $REPO:0.0.0-noble-arm32v7
+FROM $REPO:0.0.0-resolute-arm32v7
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt
index 296b9d430f..86beb3266c 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -20,7 +20,7 @@ RUN aspnetcore_version=0.0.0 \
 
 
 # ASP.NET Core image
-FROM $REPO:0.0.0-noble-arm64v8
+FROM $REPO:0.0.0-resolute-arm64v8
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt
index 03acf17fd1..0a2551b782 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -20,7 +20,7 @@ RUN dotnet_version=0.0.0 \
 
 
 # .NET runtime image
-FROM $REPO:0.0.0-noble-amd64
+FROM $REPO:0.0.0-resolute-amd64
 
 # .NET Runtime version
 ENV DOTNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt
index 527e145375..414f350493 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -20,7 +20,7 @@ RUN dotnet_version=0.0.0 \
 
 
 # .NET runtime image
-FROM $REPO:0.0.0-noble-arm32v7
+FROM $REPO:0.0.0-resolute-arm32v7
 
 # .NET Runtime version
 ENV DOTNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt
index 91fd8cd40e..bf71e26102 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -20,7 +20,7 @@ RUN dotnet_version=0.0.0 \
 
 
 # .NET runtime image
-FROM $REPO:0.0.0-noble-arm64v8
+FROM $REPO:0.0.0-resolute-arm64v8
 
 # .NET Runtime version
 ENV DOTNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-amd64-Dockerfile.approved.txt
index 1be9446078..79b4af5af5 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-amd64-Dockerfile.approved.txt
@@ -1,4 +1,4 @@
-FROM ubuntu.azurecr.io/ubuntu:noble
+FROM ubuntu.azurecr.io/ubuntu:resolute
 
 ENV \
     # UID of the non-root user 'app'
@@ -15,11 +15,10 @@ RUN apt-get update \
         # .NET dependencies
         libc6 \
         libgcc-s1 \
-        libicu74 \
+        libicu76 \
         libssl3t64 \
         libstdc++6 \
         tzdata \
-        tzdata-legacy \
     && rm -rf /var/lib/apt/lists/*
 
 # Create a non-root user and group
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm32v7-Dockerfile.approved.txt
index 1be9446078..79b4af5af5 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm32v7-Dockerfile.approved.txt
@@ -1,4 +1,4 @@
-FROM ubuntu.azurecr.io/ubuntu:noble
+FROM ubuntu.azurecr.io/ubuntu:resolute
 
 ENV \
     # UID of the non-root user 'app'
@@ -15,11 +15,10 @@ RUN apt-get update \
         # .NET dependencies
         libc6 \
         libgcc-s1 \
-        libicu74 \
+        libicu76 \
         libssl3t64 \
         libstdc++6 \
         tzdata \
-        tzdata-legacy \
     && rm -rf /var/lib/apt/lists/*
 
 # Create a non-root user and group
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm64v8-Dockerfile.approved.txt
index 1be9446078..79b4af5af5 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm64v8-Dockerfile.approved.txt
@@ -1,4 +1,4 @@
-FROM ubuntu.azurecr.io/ubuntu:noble
+FROM ubuntu.azurecr.io/ubuntu:resolute
 
 ENV \
     # UID of the non-root user 'app'
@@ -15,11 +15,10 @@ RUN apt-get update \
         # .NET dependencies
         libc6 \
         libgcc-s1 \
-        libicu74 \
+        libicu76 \
         libssl3t64 \
         libstdc++6 \
         tzdata \
-        tzdata-legacy \
     && rm -rf /var/lib/apt/lists/*
 
 # Create a non-root user and group
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt
index 928ac11581..8e9bcced6e 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt
@@ -1,6 +1,6 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -19,7 +19,7 @@ RUN dotnet_sdk_version=0.0.0 \
 
 
 # .NET SDK image
-FROM $REPO:0.0.0-noble-amd64
+FROM $REPO:0.0.0-resolute-amd64
 
 ENV \
     # Do not generate certificate
@@ -33,7 +33,7 @@ ENV \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
     NUGET_XMLDOC_MODE=skip \
     # PowerShell telemetry for docker image usage
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04 \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04 \
     # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
     DOTNET_ROLL_FORWARD=Major
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-aot-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-aot-amd64-Dockerfile.approved.txt
index 8846e30906..52e83574dd 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-aot-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-aot-amd64-Dockerfile.approved.txt
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:0.0.0-noble-amd64
+FROM $REPO:0.0.0-resolute-amd64
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-aot-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-aot-arm64v8-Dockerfile.approved.txt
index 8577ac304b..6ccb65edfd 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-aot-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-aot-arm64v8-Dockerfile.approved.txt
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:0.0.0-noble-arm64v8
+FROM $REPO:0.0.0-resolute-arm64v8
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt
index fe28bdd3bc..89b9ecf6fa 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt
@@ -1,6 +1,6 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -19,7 +19,7 @@ RUN dotnet_sdk_version=0.0.0 \
 
 
 # .NET SDK image
-FROM $REPO:0.0.0-noble-arm32v7
+FROM $REPO:0.0.0-resolute-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -33,7 +33,7 @@ ENV \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
     NUGET_XMLDOC_MODE=skip \
     # PowerShell telemetry for docker image usage
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm32 \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm32 \
     # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
     DOTNET_ROLL_FORWARD=Major
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt
index 91b9a28a85..00c1fc0e2d 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt
@@ -1,6 +1,6 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -19,7 +19,7 @@ RUN dotnet_sdk_version=0.0.0 \
 
 
 # .NET SDK image
-FROM $REPO:0.0.0-noble-arm64v8
+FROM $REPO:0.0.0-resolute-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -33,7 +33,7 @@ ENV \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
     NUGET_XMLDOC_MODE=skip \
     # PowerShell telemetry for docker image usage
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm64 \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm64 \
     # Workaround for https://github.com/PowerShell/PowerShell/issues/20685
     DOTNET_ROLL_FORWARD=Major
 

From 04d685a368125387227eb35e502c84f4387d15ce Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Thu, 11 Dec 2025 14:56:09 -0800
Subject: [PATCH 07/23] Fix osVersions for resolute-chiseled images

---
 manifest.json                                 | 48 +++++++++----------
 .../amd64/Dockerfile                          |  4 +-
 .../arm32v7/Dockerfile                        |  4 +-
 .../arm64v8/Dockerfile                        |  4 +-
 .../amd64/Dockerfile                          |  4 +-
 .../arm32v7/Dockerfile                        |  4 +-
 .../arm64v8/Dockerfile                        |  4 +-
 .../resolute-chiseled-extra/amd64/Dockerfile  |  4 +-
 .../arm32v7/Dockerfile                        |  4 +-
 .../arm64v8/Dockerfile                        |  4 +-
 .../11.0/resolute-chiseled/amd64/Dockerfile   |  4 +-
 .../11.0/resolute-chiseled/arm32v7/Dockerfile |  4 +-
 .../11.0/resolute-chiseled/arm64v8/Dockerfile |  4 +-
 .../resolute-chiseled-extra/amd64/Dockerfile  |  8 ++--
 .../arm32v7/Dockerfile                        |  8 ++--
 .../arm64v8/Dockerfile                        |  8 ++--
 .../11.0/resolute-chiseled/amd64/Dockerfile   |  6 +--
 .../11.0/resolute-chiseled/arm32v7/Dockerfile |  6 +--
 .../11.0/resolute-chiseled/arm64v8/Dockerfile |  6 +--
 .../resolute-chiseled-extra/amd64/Dockerfile  |  4 +-
 .../arm32v7/Dockerfile                        |  4 +-
 .../arm64v8/Dockerfile                        |  4 +-
 .../11.0/resolute-chiseled/amd64/Dockerfile   |  4 +-
 .../11.0/resolute-chiseled/arm32v7/Dockerfile |  4 +-
 .../11.0/resolute-chiseled/arm64v8/Dockerfile |  4 +-
 ...ute-chiseled-amd64-Dockerfile.approved.txt |  4 +-
 ...e-chiseled-arm32v7-Dockerfile.approved.txt |  4 +-
 ...e-chiseled-arm64v8-Dockerfile.approved.txt |  4 +-
 ...ed-composite-amd64-Dockerfile.approved.txt |  4 +-
 ...-composite-arm32v7-Dockerfile.approved.txt |  4 +-
 ...-composite-arm64v8-Dockerfile.approved.txt |  4 +-
 ...posite-extra-amd64-Dockerfile.approved.txt |  4 +-
 ...site-extra-arm32v7-Dockerfile.approved.txt |  4 +-
 ...site-extra-arm64v8-Dockerfile.approved.txt |  4 +-
 ...iseled-extra-amd64-Dockerfile.approved.txt |  4 +-
 ...eled-extra-arm32v7-Dockerfile.approved.txt |  4 +-
 ...eled-extra-arm64v8-Dockerfile.approved.txt |  4 +-
 ...ute-chiseled-amd64-Dockerfile.approved.txt |  4 +-
 ...e-chiseled-arm32v7-Dockerfile.approved.txt |  4 +-
 ...e-chiseled-arm64v8-Dockerfile.approved.txt |  4 +-
 ...iseled-extra-amd64-Dockerfile.approved.txt |  4 +-
 ...eled-extra-arm32v7-Dockerfile.approved.txt |  4 +-
 ...eled-extra-arm64v8-Dockerfile.approved.txt |  4 +-
 ...ute-chiseled-amd64-Dockerfile.approved.txt |  6 +--
 ...e-chiseled-arm32v7-Dockerfile.approved.txt |  6 +--
 ...e-chiseled-arm64v8-Dockerfile.approved.txt |  6 +--
 ...iseled-extra-amd64-Dockerfile.approved.txt |  8 ++--
 ...eled-extra-arm32v7-Dockerfile.approved.txt |  8 ++--
 ...eled-extra-arm64v8-Dockerfile.approved.txt |  8 ++--
 49 files changed, 138 insertions(+), 138 deletions(-)

diff --git a/manifest.json b/manifest.json
index a3488aee9b..d6e7f89172 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2692,7 +2692,7 @@
               "dockerfile": "src/runtime-deps/11.0/resolute-chiseled/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-amd64": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-amd64": {}
@@ -2719,7 +2719,7 @@
               "dockerfile": "src/runtime-deps/11.0/resolute-chiseled/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-arm64v8": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-arm64v8": {}
@@ -2747,7 +2747,7 @@
               "dockerfile": "src/runtime-deps/11.0/resolute-chiseled/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-arm32v7": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-arm32v7": {}
@@ -2776,7 +2776,7 @@
               "dockerfile": "src/runtime-deps/11.0/resolute-chiseled-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-amd64": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-amd64": {}
@@ -2796,7 +2796,7 @@
               "dockerfile": "src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-arm64v8": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-arm64v8": {}
@@ -2817,7 +2817,7 @@
               "dockerfile": "src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-arm32v7": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-arm32v7": {}
@@ -5340,7 +5340,7 @@
               "dockerfile": "src/runtime/11.0/resolute-chiseled/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-amd64": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-amd64": {}
@@ -5363,7 +5363,7 @@
               "dockerfile": "src/runtime/11.0/resolute-chiseled/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-arm64v8": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-arm64v8": {}
@@ -5387,7 +5387,7 @@
               "dockerfile": "src/runtime/11.0/resolute-chiseled/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-arm32v7": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-arm32v7": {}
@@ -5419,7 +5419,7 @@
               "dockerfile": "src/runtime/11.0/resolute-chiseled-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-amd64": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-amd64": {}
@@ -5449,7 +5449,7 @@
               "dockerfile": "src/runtime/11.0/resolute-chiseled-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-arm64v8": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-arm64v8": {}
@@ -5480,7 +5480,7 @@
               "dockerfile": "src/runtime/11.0/resolute-chiseled-extra/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-arm32v7": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-arm32v7": {}
@@ -9572,7 +9572,7 @@
               "dockerfile": "src/aspnet/11.0/resolute-chiseled/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-amd64": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-amd64": {}
@@ -9595,7 +9595,7 @@
               "dockerfile": "src/aspnet/11.0/resolute-chiseled/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-arm64v8": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-arm64v8": {}
@@ -9619,7 +9619,7 @@
               "dockerfile": "src/aspnet/11.0/resolute-chiseled/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-arm32v7": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-arm32v7": {}
@@ -9651,7 +9651,7 @@
               "dockerfile": "src/aspnet/11.0/resolute-chiseled-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-amd64": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-amd64": {}
@@ -9681,7 +9681,7 @@
               "dockerfile": "src/aspnet/11.0/resolute-chiseled-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-arm64v8": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-arm64v8": {}
@@ -9712,7 +9712,7 @@
               "dockerfile": "src/aspnet/11.0/resolute-chiseled-extra/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-extra-arm32v7": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-extra-arm32v7": {}
@@ -9751,7 +9751,7 @@
               "dockerfile": "src/aspnet/11.0/resolute-chiseled-composite-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-composite-extra-amd64": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-composite-extra-amd64": {}
@@ -9765,7 +9765,7 @@
               "dockerfile": "src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-composite-extra-arm64v8": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-composite-extra-arm64v8": {}
@@ -9780,7 +9780,7 @@
               "dockerfile": "src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-composite-extra-arm32v7": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-composite-extra-arm32v7": {}
@@ -9803,7 +9803,7 @@
               "dockerfile": "src/aspnet/11.0/resolute-chiseled-composite/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-composite-amd64": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-composite-amd64": {}
@@ -9817,7 +9817,7 @@
               "dockerfile": "src/aspnet/11.0/resolute-chiseled-composite/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-composite-arm64v8": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-composite-arm64v8": {}
@@ -9832,7 +9832,7 @@
               "dockerfile": "src/aspnet/11.0/resolute-chiseled-composite/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "resolute-chiseled",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-resolute-chiseled-composite-arm32v7": {},
                 "$(dotnet|11.0|minor-tag)-resolute-chiseled-composite-arm32v7": {}
diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile
index 49787cfecd..ea24c26860 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=11.0.0-alpha.1 \
@@ -21,7 +21,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-amd64
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-amd64
 
 ENV \
     # .NET Runtime version
diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
index da64218833..bdec967614 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=11.0.0-alpha.1 \
@@ -21,7 +21,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-arm32v7
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-arm32v7
 
 ENV \
     # .NET Runtime version
diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile
index 36ab9cf32f..32a26714d5 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=11.0.0-alpha.1 \
@@ -21,7 +21,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-arm64v8
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-arm64v8
 
 ENV \
     # .NET Runtime version
diff --git a/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile
index f551281762..15edcb111c 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=11.0.0-alpha.1 \
@@ -21,7 +21,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-amd64
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-amd64
 
 ENV \
     # .NET Runtime version
diff --git a/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
index 0e03d3ce39..f576967af7 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=11.0.0-alpha.1 \
@@ -21,7 +21,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-arm32v7
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-arm32v7
 
 ENV \
     # .NET Runtime version
diff --git a/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile
index 2afafe5740..869b4cd088 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=11.0.0-alpha.1 \
@@ -21,7 +21,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-arm64v8
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-arm64v8
 
 ENV \
     # .NET Runtime version
diff --git a/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile
index 81373767df..93cf3e3392 100644
--- a/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=11.0.0-alpha.1 \
@@ -18,7 +18,7 @@ RUN aspnetcore_version=11.0.0-alpha.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-amd64
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-amd64
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=11.0.0-alpha.1
diff --git a/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
index 3ff2ad9f38..aa79093c4f 100644
--- a/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=11.0.0-alpha.1 \
@@ -18,7 +18,7 @@ RUN aspnetcore_version=11.0.0-alpha.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-arm32v7
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-arm32v7
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=11.0.0-alpha.1
diff --git a/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
index a0a4e6b8d3..533f55f51e 100644
--- a/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=11.0.0-alpha.1 \
@@ -18,7 +18,7 @@ RUN aspnetcore_version=11.0.0-alpha.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-arm64v8
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-arm64v8
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=11.0.0-alpha.1
diff --git a/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile
index 8792cea098..f03f103fa8 100644
--- a/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=11.0.0-alpha.1 \
@@ -18,7 +18,7 @@ RUN aspnetcore_version=11.0.0-alpha.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-amd64
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-amd64
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=11.0.0-alpha.1
diff --git a/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
index 42aae78967..42837a4fea 100644
--- a/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=11.0.0-alpha.1 \
@@ -18,7 +18,7 @@ RUN aspnetcore_version=11.0.0-alpha.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-arm32v7
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-arm32v7
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=11.0.0-alpha.1
diff --git a/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile
index 4b9f277ffb..c09597e0f5 100644
--- a/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=11.0.0-alpha.1 \
@@ -18,7 +18,7 @@ RUN aspnetcore_version=11.0.0-alpha.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-arm64v8
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-arm64v8
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=11.0.0-alpha.1
diff --git a/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile
index ecd88fc7b9..6102acaa0f 100644
--- a/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile
@@ -1,4 +1,4 @@
-FROM amd64/buildpack-deps:noble-curl AS chisel
+FROM amd64/buildpack-deps:resolute-curl AS chisel
 
 RUN apt-get update && apt-get install -y file
 
@@ -26,15 +26,15 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-24.04 --root /rootfs \
+        --release ubuntu-26.04 --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libicu74_libs \
-            libssl3t64_libs \
+            libicu76_libs \
+            libssl3_libs \
             libstdc++6_libs \
             tzdata-legacy_zoneinfo \
             tzdata_zoneinfo
diff --git a/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
index d976820ebf..b9f47d25df 100644
--- a/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-FROM arm32v7/buildpack-deps:noble-curl AS chisel
+FROM arm32v7/buildpack-deps:resolute-curl AS chisel
 
 RUN apt-get update && apt-get install -y file
 
@@ -26,15 +26,15 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-24.04 --root /rootfs \
+        --release ubuntu-26.04 --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libicu74_libs \
-            libssl3t64_libs \
+            libicu76_libs \
+            libssl3_libs \
             libstdc++6_libs \
             tzdata-legacy_zoneinfo \
             tzdata_zoneinfo
diff --git a/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
index 4f29219fe8..9dd7f705e6 100644
--- a/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
@@ -1,4 +1,4 @@
-FROM arm64v8/buildpack-deps:noble-curl AS chisel
+FROM arm64v8/buildpack-deps:resolute-curl AS chisel
 
 RUN apt-get update && apt-get install -y file
 
@@ -26,15 +26,15 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-24.04 --root /rootfs \
+        --release ubuntu-26.04 --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libicu74_libs \
-            libssl3t64_libs \
+            libicu76_libs \
+            libssl3_libs \
             libstdc++6_libs \
             tzdata-legacy_zoneinfo \
             tzdata_zoneinfo
diff --git a/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile
index 87acfe8b95..dd159f3fd9 100644
--- a/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile
@@ -1,4 +1,4 @@
-FROM amd64/buildpack-deps:noble-curl AS chisel
+FROM amd64/buildpack-deps:resolute-curl AS chisel
 
 RUN apt-get update && apt-get install -y file
 
@@ -26,14 +26,14 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-24.04 --root /rootfs \
+        --release ubuntu-26.04 --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libssl3t64_libs \
+            libssl3_libs \
             libstdc++6_libs
 
 
diff --git a/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile
index 2be7ef5c00..4cf8c8635f 100644
--- a/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-FROM arm32v7/buildpack-deps:noble-curl AS chisel
+FROM arm32v7/buildpack-deps:resolute-curl AS chisel
 
 RUN apt-get update && apt-get install -y file
 
@@ -26,14 +26,14 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-24.04 --root /rootfs \
+        --release ubuntu-26.04 --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libssl3t64_libs \
+            libssl3_libs \
             libstdc++6_libs
 
 
diff --git a/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile
index 89c07ffc2a..81baacc546 100644
--- a/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile
@@ -1,4 +1,4 @@
-FROM arm64v8/buildpack-deps:noble-curl AS chisel
+FROM arm64v8/buildpack-deps:resolute-curl AS chisel
 
 RUN apt-get update && apt-get install -y file
 
@@ -26,14 +26,14 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-24.04 --root /rootfs \
+        --release ubuntu-26.04 --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libssl3t64_libs \
+            libssl3_libs \
             libstdc++6_libs
 
 
diff --git a/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile
index 50604658dd..3c3d512e2b 100644
--- a/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
 RUN dotnet_version=11.0.0-alpha.1 \
@@ -21,7 +21,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-amd64
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-amd64
 
 # .NET Runtime version
 ENV DOTNET_VERSION=11.0.0-alpha.1
diff --git a/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
index 21735db288..f3a614a27b 100644
--- a/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
 RUN dotnet_version=11.0.0-alpha.1 \
@@ -21,7 +21,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-arm32v7
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-arm32v7
 
 # .NET Runtime version
 ENV DOTNET_VERSION=11.0.0-alpha.1
diff --git a/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
index d487037f5a..ab90d31dc3 100644
--- a/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
 RUN dotnet_version=11.0.0-alpha.1 \
@@ -21,7 +21,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-extra-arm64v8
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-arm64v8
 
 # .NET Runtime version
 ENV DOTNET_VERSION=11.0.0-alpha.1
diff --git a/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile b/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile
index 6b2563781a..698d7acb0c 100644
--- a/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
 RUN dotnet_version=11.0.0-alpha.1 \
@@ -21,7 +21,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-amd64
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-amd64
 
 # .NET Runtime version
 ENV DOTNET_VERSION=11.0.0-alpha.1
diff --git a/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
index 4cfb8701d9..e7fbcc2ebb 100644
--- a/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
 RUN dotnet_version=11.0.0-alpha.1 \
@@ -21,7 +21,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-arm32v7
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-arm32v7
 
 # .NET Runtime version
 ENV DOTNET_VERSION=11.0.0-alpha.1
diff --git a/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile
index d8a98212aa..84b4a93132 100644
--- a/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
 RUN dotnet_version=11.0.0-alpha.1 \
@@ -21,7 +21,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:11.0.0-alpha.1-noble-chiseled-arm64v8
+FROM $REPO:11.0.0-alpha.1-resolute-chiseled-arm64v8
 
 # .NET Runtime version
 ENV DOTNET_VERSION=11.0.0-alpha.1
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
index 348732dddb..509f501c82 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -20,7 +20,7 @@ RUN aspnetcore_version=0.0.0 \
 
 
 # ASP.NET Core image
-FROM $REPO:0.0.0-noble-chiseled-amd64
+FROM $REPO:0.0.0-resolute-chiseled-amd64
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
index 22513254a6..b71dbfe3c6 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -20,7 +20,7 @@ RUN aspnetcore_version=0.0.0 \
 
 
 # ASP.NET Core image
-FROM $REPO:0.0.0-noble-chiseled-arm32v7
+FROM $REPO:0.0.0-resolute-chiseled-arm32v7
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
index 0b2eb02446..3a676a08cf 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -20,7 +20,7 @@ RUN aspnetcore_version=0.0.0 \
 
 
 # ASP.NET Core image
-FROM $REPO:0.0.0-noble-chiseled-arm64v8
+FROM $REPO:0.0.0-resolute-chiseled-arm64v8
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt
index a93a9ae370..7765890c31 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:0.0.0-noble-chiseled-amd64
+FROM $REPO:0.0.0-resolute-chiseled-amd64
 
 ENV \
     # .NET Runtime version
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt
index 12493dcb5a..21ad55a82b 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:0.0.0-noble-chiseled-arm32v7
+FROM $REPO:0.0.0-resolute-chiseled-arm32v7
 
 ENV \
     # .NET Runtime version
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt
index c85d083e0b..aa8b0f6451 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:0.0.0-noble-chiseled-arm64v8
+FROM $REPO:0.0.0-resolute-chiseled-arm64v8
 
 ENV \
     # .NET Runtime version
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt
index 5c6a6848ce..de61ee07a5 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:0.0.0-noble-chiseled-extra-amd64
+FROM $REPO:0.0.0-resolute-chiseled-extra-amd64
 
 ENV \
     # .NET Runtime version
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
index 7b56626ddf..c8317c0b9e 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:0.0.0-noble-chiseled-extra-arm32v7
+FROM $REPO:0.0.0-resolute-chiseled-extra-arm32v7
 
 ENV \
     # .NET Runtime version
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
index 6cd0494495..ce5747a547 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:0.0.0-noble-chiseled-extra-arm64v8
+FROM $REPO:0.0.0-resolute-chiseled-extra-arm64v8
 
 ENV \
     # .NET Runtime version
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
index 53620c2b3f..ba7e942b75 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -20,7 +20,7 @@ RUN aspnetcore_version=0.0.0 \
 
 
 # ASP.NET Core image
-FROM $REPO:0.0.0-noble-chiseled-extra-amd64
+FROM $REPO:0.0.0-resolute-chiseled-extra-amd64
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
index 3e0b5f4fe8..5eaf0d16c1 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -20,7 +20,7 @@ RUN aspnetcore_version=0.0.0 \
 
 
 # ASP.NET Core image
-FROM $REPO:0.0.0-noble-chiseled-extra-arm32v7
+FROM $REPO:0.0.0-resolute-chiseled-extra-arm32v7
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
index aeba0be286..c35327c61a 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -20,7 +20,7 @@ RUN aspnetcore_version=0.0.0 \
 
 
 # ASP.NET Core image
-FROM $REPO:0.0.0-noble-chiseled-extra-arm64v8
+FROM $REPO:0.0.0-resolute-chiseled-extra-arm64v8
 
 # ASP.NET Core version
 ENV ASPNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
index e369a0ead2..30d4adbc58 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:0.0.0-noble-chiseled-amd64
+FROM $REPO:0.0.0-resolute-chiseled-amd64
 
 # .NET Runtime version
 ENV DOTNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
index c932546204..e542dbe0f0 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:0.0.0-noble-chiseled-arm32v7
+FROM $REPO:0.0.0-resolute-chiseled-arm32v7
 
 # .NET Runtime version
 ENV DOTNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
index d1b014623c..23dce9937c 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:0.0.0-noble-chiseled-arm64v8
+FROM $REPO:0.0.0-resolute-chiseled-arm64v8
 
 # .NET Runtime version
 ENV DOTNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
index 96c7f21e28..aa82eb4797 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM amd64/buildpack-deps:noble-curl AS installer
+FROM amd64/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:0.0.0-noble-chiseled-extra-amd64
+FROM $REPO:0.0.0-resolute-chiseled-extra-amd64
 
 # .NET Runtime version
 ENV DOTNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
index a2ea289ff6..e77b596ec3 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:jammy-curl AS installer
+FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:0.0.0-noble-chiseled-extra-arm32v7
+FROM $REPO:0.0.0-resolute-chiseled-extra-arm32v7
 
 # .NET Runtime version
 ENV DOTNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
index 0112418c3d..5e7fce5f49 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm64v8/buildpack-deps:noble-curl AS installer
+FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 ARG ACCESSTOKEN
 
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:0.0.0-noble-chiseled-extra-arm64v8
+FROM $REPO:0.0.0-resolute-chiseled-extra-arm64v8
 
 # .NET Runtime version
 ENV DOTNET_VERSION=0.0.0
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
index 0915fff97d..45d77dd799 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
@@ -1,4 +1,4 @@
-FROM amd64/buildpack-deps:noble-curl AS chisel
+FROM amd64/buildpack-deps:resolute-curl AS chisel
 
 RUN apt-get update && apt-get install -y file
 
@@ -26,14 +26,14 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-24.04 --root /rootfs \
+        --release ubuntu-26.04 --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libssl3t64_libs \
+            libssl3_libs \
             libstdc++6_libs
 
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
index b1a8f19a19..708672a70f 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
@@ -1,4 +1,4 @@
-FROM arm32v7/buildpack-deps:noble-curl AS chisel
+FROM arm32v7/buildpack-deps:resolute-curl AS chisel
 
 RUN apt-get update && apt-get install -y file
 
@@ -26,14 +26,14 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-24.04 --root /rootfs \
+        --release ubuntu-26.04 --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libssl3t64_libs \
+            libssl3_libs \
             libstdc++6_libs
 
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
index d950ea2209..f399eab9eb 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
@@ -1,4 +1,4 @@
-FROM arm64v8/buildpack-deps:noble-curl AS chisel
+FROM arm64v8/buildpack-deps:resolute-curl AS chisel
 
 RUN apt-get update && apt-get install -y file
 
@@ -26,14 +26,14 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-24.04 --root /rootfs \
+        --release ubuntu-26.04 --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libssl3t64_libs \
+            libssl3_libs \
             libstdc++6_libs
 
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
index 88505748e9..520d2e89c1 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
@@ -1,4 +1,4 @@
-FROM amd64/buildpack-deps:noble-curl AS chisel
+FROM amd64/buildpack-deps:resolute-curl AS chisel
 
 RUN apt-get update && apt-get install -y file
 
@@ -26,15 +26,15 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-24.04 --root /rootfs \
+        --release ubuntu-26.04 --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libicu74_libs \
-            libssl3t64_libs \
+            libicu76_libs \
+            libssl3_libs \
             libstdc++6_libs \
             tzdata-legacy_zoneinfo \
             tzdata_zoneinfo
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
index 690a88178a..1b8c544014 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -1,4 +1,4 @@
-FROM arm32v7/buildpack-deps:noble-curl AS chisel
+FROM arm32v7/buildpack-deps:resolute-curl AS chisel
 
 RUN apt-get update && apt-get install -y file
 
@@ -26,15 +26,15 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-24.04 --root /rootfs \
+        --release ubuntu-26.04 --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libicu74_libs \
-            libssl3t64_libs \
+            libicu76_libs \
+            libssl3_libs \
             libstdc++6_libs \
             tzdata-legacy_zoneinfo \
             tzdata_zoneinfo
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
index 3457cff01f..345e510c51 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
@@ -1,4 +1,4 @@
-FROM arm64v8/buildpack-deps:noble-curl AS chisel
+FROM arm64v8/buildpack-deps:resolute-curl AS chisel
 
 RUN apt-get update && apt-get install -y file
 
@@ -26,15 +26,15 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-24.04 --root /rootfs \
+        --release ubuntu-26.04 --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libicu74_libs \
-            libssl3t64_libs \
+            libicu76_libs \
+            libssl3_libs \
             libstdc++6_libs \
             tzdata-legacy_zoneinfo \
             tzdata_zoneinfo

From e8d11adc691497d6ba45722475abea8767a67d29 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Fri, 12 Dec 2025 09:25:02 -0800
Subject: [PATCH 08/23] Update readmes

---
 README.aspnet.md       | 24 ++++++++++++------------
 README.runtime-deps.md | 12 ++++++------
 README.runtime.md      | 12 ++++++------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/README.aspnet.md b/README.aspnet.md
index 07975254a2..01ed8c1ff4 100644
--- a/README.aspnet.md
+++ b/README.aspnet.md
@@ -144,10 +144,10 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04
-11.0.0-alpha.1-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-resolute-chiseled-composite-amd64, 11.0-preview-resolute-chiseled-composite-amd64, 11.0.0-alpha.1-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-resolute-chiseled-composite-extra-amd64, 11.0-preview-resolute-chiseled-composite-extra-amd64, 11.0.0-alpha.1-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-composite-amd64, 11.0-preview-resolute-chiseled-composite-amd64, 11.0.0-alpha.1-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-composite-extra-amd64, 11.0-preview-resolute-chiseled-composite-extra-amd64, 11.0.0-alpha.1-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-alpine3.23-composite-amd64, 11.0-preview-alpine3.23-composite-amd64, 11.0-preview-alpine-composite-amd64, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
@@ -215,10 +215,10 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04
-11.0.0-alpha.1-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-resolute-chiseled-composite-arm64v8, 11.0-preview-resolute-chiseled-composite-arm64v8, 11.0.0-alpha.1-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-resolute-chiseled-composite-extra-arm64v8, 11.0-preview-resolute-chiseled-composite-extra-arm64v8, 11.0.0-alpha.1-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-composite-arm64v8, 11.0-preview-resolute-chiseled-composite-arm64v8, 11.0.0-alpha.1-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-composite-extra-arm64v8, 11.0-preview-resolute-chiseled-composite-extra-arm64v8, 11.0.0-alpha.1-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-alpine3.23-composite-arm64v8, 11.0-preview-alpine3.23-composite-arm64v8, 11.0-preview-alpine-composite-arm64v8, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
@@ -266,10 +266,10 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/aspnet/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04
-11.0.0-alpha.1-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-resolute-chiseled-composite-arm32v7, 11.0-preview-resolute-chiseled-composite-arm32v7, 11.0.0-alpha.1-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-resolute-chiseled-composite-extra-arm32v7, 11.0-preview-resolute-chiseled-composite-extra-arm32v7, 11.0.0-alpha.1-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-composite-arm32v7, 11.0-preview-resolute-chiseled-composite-arm32v7, 11.0.0-alpha.1-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-composite-extra-arm32v7, 11.0-preview-resolute-chiseled-composite-extra-arm32v7, 11.0.0-alpha.1-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-alpine3.23-composite-arm32v7, 11.0-preview-alpine3.23-composite-arm32v7, 11.0-preview-alpine-composite-arm32v7, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
 
diff --git a/README.runtime-deps.md b/README.runtime-deps.md
index 472b65be1a..fe8838d398 100644
--- a/README.runtime-deps.md
+++ b/README.runtime-deps.md
@@ -112,8 +112,8 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04
-11.0.0-alpha.1-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
@@ -165,8 +165,8 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04
-11.0.0-alpha.1-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
@@ -206,8 +206,8 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04
-11.0.0-alpha.1-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
 <!--End of generated tags-->
diff --git a/README.runtime.md b/README.runtime.md
index 16eb145247..e599e0f13f 100644
--- a/README.runtime.md
+++ b/README.runtime.md
@@ -113,8 +113,8 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04
-11.0.0-alpha.1-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 11.0.0-alpha.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
@@ -159,8 +159,8 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04
-11.0.0-alpha.1-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
@@ -193,8 +193,8 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
 11.0.0-alpha.1-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.0-alpha.1-resolute, 11.0-preview-resolute, 11.0.0-alpha.1, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04
-11.0.0-alpha.1-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
-11.0.0-alpha.1-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+11.0.0-alpha.1-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04
+11.0.0-alpha.1-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
 
 ### Nano Server 2025 amd64 Tags

From 51bd6c1d8c7cfd96c0afc8ede606fc1816897dea Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Fri, 12 Dec 2025 09:53:16 -0800
Subject: [PATCH 09/23] Treat alpha versions as non-stable in templates

---
 eng/dockerfile-templates/Dockerfile.download-dotnet        | 2 +-
 src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile      | 7 +++----
 src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile    | 7 +++----
 src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile    | 7 +++----
 src/aspnet/11.0/alpine3.23/amd64/Dockerfile                | 7 +++----
 src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile              | 7 +++----
 src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile              | 7 +++----
 .../amd64/Dockerfile                                       | 7 +++----
 .../arm64v8/Dockerfile                                     | 7 +++----
 .../azurelinux3.0-distroless-composite/amd64/Dockerfile    | 7 +++----
 .../azurelinux3.0-distroless-composite/arm64v8/Dockerfile  | 7 +++----
 .../11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile   | 7 +++----
 .../11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile | 7 +++----
 src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile  | 7 +++----
 .../11.0/azurelinux3.0-distroless/arm64v8/Dockerfile       | 7 +++----
 src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile             | 7 +++----
 src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile           | 7 +++----
 src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile       | 7 +++----
 .../resolute-chiseled-composite-extra/amd64/Dockerfile     | 7 +++----
 .../resolute-chiseled-composite-extra/arm32v7/Dockerfile   | 7 +++----
 .../resolute-chiseled-composite-extra/arm64v8/Dockerfile   | 7 +++----
 .../11.0/resolute-chiseled-composite/amd64/Dockerfile      | 7 +++----
 .../11.0/resolute-chiseled-composite/arm32v7/Dockerfile    | 7 +++----
 .../11.0/resolute-chiseled-composite/arm64v8/Dockerfile    | 7 +++----
 src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile   | 7 +++----
 src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile | 7 +++----
 src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile | 7 +++----
 src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile         | 7 +++----
 src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile       | 7 +++----
 src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile       | 7 +++----
 src/aspnet/11.0/resolute/amd64/Dockerfile                  | 7 +++----
 src/aspnet/11.0/resolute/arm32v7/Dockerfile                | 7 +++----
 src/aspnet/11.0/resolute/arm64v8/Dockerfile                | 7 +++----
 .../11.0/windowsservercore-ltsc2025/amd64/Dockerfile       | 7 +++----
 src/runtime/11.0/alpine3.23/amd64/Dockerfile               | 7 +++----
 src/runtime/11.0/alpine3.23/arm32v7/Dockerfile             | 7 +++----
 src/runtime/11.0/alpine3.23/arm64v8/Dockerfile             | 7 +++----
 .../11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile   | 7 +++----
 .../11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile | 7 +++----
 src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile | 7 +++----
 .../11.0/azurelinux3.0-distroless/arm64v8/Dockerfile       | 7 +++----
 src/runtime/11.0/azurelinux3.0/amd64/Dockerfile            | 7 +++----
 src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile          | 7 +++----
 src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile      | 7 +++----
 src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile  | 7 +++----
 .../11.0/resolute-chiseled-extra/arm32v7/Dockerfile        | 7 +++----
 .../11.0/resolute-chiseled-extra/arm64v8/Dockerfile        | 7 +++----
 src/runtime/11.0/resolute-chiseled/amd64/Dockerfile        | 7 +++----
 src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile      | 7 +++----
 src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile      | 7 +++----
 src/runtime/11.0/resolute/amd64/Dockerfile                 | 7 +++----
 src/runtime/11.0/resolute/arm32v7/Dockerfile               | 7 +++----
 src/runtime/11.0/resolute/arm64v8/Dockerfile               | 7 +++----
 .../11.0/windowsservercore-ltsc2025/amd64/Dockerfile       | 7 +++----
 src/sdk/11.0/alpine3.23/amd64/Dockerfile                   | 7 +++----
 src/sdk/11.0/alpine3.23/arm32v7/Dockerfile                 | 7 +++----
 src/sdk/11.0/alpine3.23/arm64v8/Dockerfile                 | 7 +++----
 src/sdk/11.0/azurelinux3.0/amd64/Dockerfile                | 7 +++----
 src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile              | 7 +++----
 src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile          | 7 +++----
 src/sdk/11.0/resolute/amd64/Dockerfile                     | 7 +++----
 src/sdk/11.0/resolute/arm32v7/Dockerfile                   | 7 +++----
 src/sdk/11.0/resolute/arm64v8/Dockerfile                   | 7 +++----
 src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile   | 7 +++----
 .../aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt   | 5 ++---
 .../aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt | 5 ++---
 .../aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt | 5 ++---
 ....0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt | 5 ++---
 ....0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt | 5 ++---
 ...pnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt | 5 ++---
 ...zurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...x3.0-distroless-composite-amd64-Dockerfile.approved.txt | 5 ++---
 ....0-distroless-composite-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...istroless-composite-extra-amd64-Dockerfile.approved.txt | 5 ++---
 ...troless-composite-extra-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...linux3.0-distroless-extra-amd64-Dockerfile.approved.txt | 5 ++---
 ...nux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt | 5 ++---
 .../aspnet-11.0-resolute-amd64-Dockerfile.approved.txt     | 5 ++---
 .../aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt   | 5 ++---
 .../aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt   | 5 ++---
 ...et-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt | 5 ++---
 ...-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt | 5 ++---
 ...-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...solute-chiseled-composite-amd64-Dockerfile.approved.txt | 5 ++---
 ...lute-chiseled-composite-arm32v7-Dockerfile.approved.txt | 5 ++---
 ...lute-chiseled-composite-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...-chiseled-composite-extra-amd64-Dockerfile.approved.txt | 5 ++---
 ...hiseled-composite-extra-arm32v7-Dockerfile.approved.txt | 5 ++---
 ...hiseled-composite-extra-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt | 5 ++---
 ...resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt | 5 ++---
 ...resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...indowsservercore-ltsc2025-amd64-Dockerfile.approved.txt | 5 ++---
 .../runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt  | 5 ++---
 ...runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt | 5 ++---
 ...runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...untime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt | 5 ++---
 ...time-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt | 5 ++---
 ...zurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...linux3.0-distroless-extra-amd64-Dockerfile.approved.txt | 5 ++---
 ...nux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt | 5 ++---
 .../runtime-11.0-resolute-amd64-Dockerfile.approved.txt    | 5 ++---
 .../runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt  | 5 ++---
 .../runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt  | 5 ++---
 ...me-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt | 5 ++---
 ...-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt | 5 ++---
 ...-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt | 5 ++---
 ...resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt | 5 ++---
 ...resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...indowsservercore-ltsc2025-amd64-Dockerfile.approved.txt | 5 ++---
 .../sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt      | 5 ++---
 .../sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt    | 5 ++---
 .../sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt    | 5 ++---
 .../sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt   | 5 ++---
 .../sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt | 5 ++---
 ...-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt | 5 ++---
 .../sdk-11.0-resolute-amd64-Dockerfile.approved.txt        | 5 ++---
 .../sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt      | 5 ++---
 .../sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt      | 5 ++---
 ...indowsservercore-ltsc2025-amd64-Dockerfile.approved.txt | 5 ++---
 127 files changed, 316 insertions(+), 442 deletions(-)

diff --git a/eng/dockerfile-templates/Dockerfile.download-dotnet b/eng/dockerfile-templates/Dockerfile.download-dotnet
index 9cf99ff7d1..d745e77736 100644
--- a/eng/dockerfile-templates/Dockerfile.download-dotnet
+++ b/eng/dockerfile-templates/Dockerfile.download-dotnet
@@ -45,7 +45,7 @@
       Internal/release stable builds will use product versions for both paths and filenames.
       Public stable builds still use build versions for paths but stable versions for filenames.
       Public unstable builds use build versions for both paths and filenames. ^
-    set isStableVersion to find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^
+    set isStableVersion to find(buildVersion, "alpha") < 0 && find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^
     set fileVersion to when(isStableVersion, productVersion, buildVersion) ^
 
     set archiveExtension to when(isWindows, ".zip", ".tar.gz") ^
diff --git a/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile
index 79bca0192e..7553e576aa 100644
--- a/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \
diff --git a/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile
index 90b83fb9c4..200a3b0791 100644
--- a/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \
diff --git a/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile
index df7f8888d6..37f191b136 100644
--- a/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \
diff --git a/src/aspnet/11.0/alpine3.23/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23/amd64/Dockerfile
index 0d8cb57c1f..8987fc4464 100644
--- a/src/aspnet/11.0/alpine3.23/amd64/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23/amd64/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile
index 102f6f6c7a..c13f57ef22 100644
--- a/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile
index 1c00afe57b..89e5baf583 100644
--- a/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && wget \
-        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
index 5b6f277583..7f35894275 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
@@ -10,11 +10,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
index 17274cebc9..8b070890a8 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
@@ -10,11 +10,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
index 16a569ca86..464b73e205 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
@@ -10,11 +10,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
index 91acdf714d..78a67dea71 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
@@ -10,11 +10,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
index 47999829ad..a760947a70 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
@@ -10,11 +10,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
index 53ce9da5c8..6ba8e6eae3 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
@@ -10,11 +10,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile
index 2727ef2b30..3ab6b6a69c 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile
@@ -10,11 +10,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
index c16534ea7d..ebe43bb7bf 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
@@ -10,11 +10,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile
index 27dadb55ed..f1c0716717 100644
--- a/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile
@@ -8,11 +8,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile
index 6ceb49d5db..cfb0713f0a 100644
--- a/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile
@@ -8,11 +8,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile
index d28275910f..f9426f351d 100644
--- a/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -10,13 +10,12 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '11.0.0-alpha.1'; `
-        $aspnetcore_build_version = $aspnetcore_version + '.25609.108'; `
+        $aspnetcore_version = '11.0.0-alpha.1.25609.108'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile
index ea24c26860..33c37efe26 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
index bdec967614..3e5ac7058f 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile
index 32a26714d5..35e0d65e11 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile
index 15edcb111c..399665f9c4 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
index f576967af7..058cf37198 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
diff --git a/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile
index 869b4cd088..05d820ef74 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile
index 93cf3e3392..893589e3c8 100644
--- a/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
index aa79093c4f..c525b4cd2c 100644
--- a/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
index 533f55f51e..fff1514648 100644
--- a/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile
index f03f103fa8..f40f04d5b2 100644
--- a/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
index 42837a4fea..694e87180e 100644
--- a/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile
index c09597e0f5..36f81a6053 100644
--- a/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/resolute/amd64/Dockerfile b/src/aspnet/11.0/resolute/amd64/Dockerfile
index d29e3eedfe..89373f21bc 100644
--- a/src/aspnet/11.0/resolute/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute/amd64/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/resolute/arm32v7/Dockerfile b/src/aspnet/11.0/resolute/arm32v7/Dockerfile
index 4485f69479..965efeb569 100644
--- a/src/aspnet/11.0/resolute/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute/arm32v7/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/resolute/arm64v8/Dockerfile b/src/aspnet/11.0/resolute/arm64v8/Dockerfile
index 4a21a63403..9136a35e33 100644
--- a/src/aspnet/11.0/resolute/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute/arm64v8/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-alpha.1 \
-    && aspnetcore_build_version=$aspnetcore_version.25609.108 \
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
index f3e19ce76f..d02ffd3e98 100644
--- a/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -10,13 +10,12 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '11.0.0-alpha.1'; `
-        $aspnetcore_build_version = $aspnetcore_version + '.25609.108'; `
+        $aspnetcore_version = '11.0.0-alpha.1.25609.108'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/src/runtime/11.0/alpine3.23/amd64/Dockerfile b/src/runtime/11.0/alpine3.23/amd64/Dockerfile
index 4ea8332d28..f1ee5095ef 100644
--- a/src/runtime/11.0/alpine3.23/amd64/Dockerfile
+++ b/src/runtime/11.0/alpine3.23/amd64/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && wget \
-        https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
+        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \
diff --git a/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile b/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile
index 0790cd6a2b..c55938197d 100644
--- a/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && wget \
-        https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
+        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \
diff --git a/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile b/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile
index f675e44f26..b1b75f6151 100644
--- a/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && wget \
-        https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
+        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \
diff --git a/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
index eec7640da6..499d6cb231 100644
--- a/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
@@ -10,11 +10,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
index f8171b7809..1467bbb81f 100644
--- a/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
@@ -10,11 +10,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile
index b7b52bc363..b4095bf56b 100644
--- a/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile
@@ -10,11 +10,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
index f9977449eb..3dd98f2797 100644
--- a/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
@@ -10,11 +10,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile b/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile
index 0655c46cfb..b024183a19 100644
--- a/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile
@@ -8,11 +8,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \
diff --git a/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile
index 44a08cea32..eab33f3a4c 100644
--- a/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile
@@ -8,11 +8,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \
diff --git a/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile
index b8dd855486..b2efae8312 100644
--- a/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -8,13 +8,12 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '11.0.0-alpha.1'; `
-        $dotnet_build_version = $dotnet_version + '.25609.108'; `
+        $dotnet_version = '11.0.0-alpha.1.25609.108'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_build_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile
index 3c3d512e2b..b164393e9b 100644
--- a/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
index f3a614a27b..dfdcc65ba9 100644
--- a/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
diff --git a/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
index ab90d31dc3..4f9b1db27e 100644
--- a/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile b/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile
index 698d7acb0c..9f27a72c05 100644
--- a/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
index e7fbcc2ebb..7ba6f4a387 100644
--- a/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
diff --git a/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile
index 84b4a93132..2b073bcee1 100644
--- a/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/src/runtime/11.0/resolute/amd64/Dockerfile b/src/runtime/11.0/resolute/amd64/Dockerfile
index dd9c038ce1..188ccea9ff 100644
--- a/src/runtime/11.0/resolute/amd64/Dockerfile
+++ b/src/runtime/11.0/resolute/amd64/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \
diff --git a/src/runtime/11.0/resolute/arm32v7/Dockerfile b/src/runtime/11.0/resolute/arm32v7/Dockerfile
index f9a876db7c..74be43719b 100644
--- a/src/runtime/11.0/resolute/arm32v7/Dockerfile
+++ b/src/runtime/11.0/resolute/arm32v7/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /dotnet \
diff --git a/src/runtime/11.0/resolute/arm64v8/Dockerfile b/src/runtime/11.0/resolute/arm64v8/Dockerfile
index d063733ab3..10d0bd2414 100644
--- a/src/runtime/11.0/resolute/arm64v8/Dockerfile
+++ b/src/runtime/11.0/resolute/arm64v8/Dockerfile
@@ -4,11 +4,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-alpha.1 \
-    && dotnet_build_version=$dotnet_version.25609.108 \
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \
diff --git a/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
index 23be1ed9b9..1ab8557aa1 100644
--- a/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -8,13 +8,12 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '11.0.0-alpha.1'; `
-        $dotnet_build_version = $dotnet_version + '.25609.108'; `
+        $dotnet_version = '11.0.0-alpha.1.25609.108'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_build_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/src/sdk/11.0/alpine3.23/amd64/Dockerfile b/src/sdk/11.0/alpine3.23/amd64/Dockerfile
index c22daca9f4..7522b4305d 100644
--- a/src/sdk/11.0/alpine3.23/amd64/Dockerfile
+++ b/src/sdk/11.0/alpine3.23/amd64/Dockerfile
@@ -3,11 +3,10 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-alpha.1 \
-    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
+RUN dotnet_sdk_version=11.0.100-alpha.1.25609.108 \
     && wget \
-        https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
-        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
+        https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile b/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile
index 165d207497..9a6d50ba7b 100644
--- a/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile
@@ -3,11 +3,10 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-alpha.1 \
-    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
+RUN dotnet_sdk_version=11.0.100-alpha.1.25609.108 \
     && wget \
-        https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
-        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
+        https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile
index e6b44da8e8..00707645da 100644
--- a/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile
@@ -3,11 +3,10 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-alpha.1 \
-    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
+RUN dotnet_sdk_version=11.0.100-alpha.1.25609.108 \
     && wget \
-        https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
-        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
+        https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile b/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile
index 8ddafa8940..7c2f0bbf6c 100644
--- a/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile
@@ -7,11 +7,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-alpha.1 \
-    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
+RUN dotnet_sdk_version=11.0.100-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile
index 64a7a7eab4..cd7c6a29be 100644
--- a/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile
@@ -7,11 +7,10 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-alpha.1 \
-    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
+RUN dotnet_sdk_version=11.0.100-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile
index c425d053e3..18c9c7a3fe 100644
--- a/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -25,13 +25,12 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '11.0.100-alpha.1'; `
-        $dotnet_sdk_build_version = $dotnet_sdk_version + '.25609.108'; `
+        $dotnet_sdk_version = '11.0.100-alpha.1.25609.108'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/src/sdk/11.0/resolute/amd64/Dockerfile b/src/sdk/11.0/resolute/amd64/Dockerfile
index 56ae4912e8..c649b32287 100644
--- a/src/sdk/11.0/resolute/amd64/Dockerfile
+++ b/src/sdk/11.0/resolute/amd64/Dockerfile
@@ -3,11 +3,10 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM amd64/buildpack-deps:resolute-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-alpha.1 \
-    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
+RUN dotnet_sdk_version=11.0.100-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/src/sdk/11.0/resolute/arm32v7/Dockerfile b/src/sdk/11.0/resolute/arm32v7/Dockerfile
index 9adfc81ce4..4dc9a9ba23 100644
--- a/src/sdk/11.0/resolute/arm32v7/Dockerfile
+++ b/src/sdk/11.0/resolute/arm32v7/Dockerfile
@@ -3,11 +3,10 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM arm32v7/buildpack-deps:resolute-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-alpha.1 \
-    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
+RUN dotnet_sdk_version=11.0.100-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/src/sdk/11.0/resolute/arm64v8/Dockerfile b/src/sdk/11.0/resolute/arm64v8/Dockerfile
index 8c6c5e1a4a..e3df240e0c 100644
--- a/src/sdk/11.0/resolute/arm64v8/Dockerfile
+++ b/src/sdk/11.0/resolute/arm64v8/Dockerfile
@@ -3,11 +3,10 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM arm64v8/buildpack-deps:resolute-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-alpha.1 \
-    && dotnet_sdk_build_version=$dotnet_sdk_version.25609.108 \
+RUN dotnet_sdk_version=11.0.100-alpha.1.25609.108 \
     && curl --fail --show-error --location \
-        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
-        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
index 90773de419..60d128a118 100644
--- a/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -25,13 +25,12 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '11.0.100-alpha.1'; `
-        $dotnet_sdk_build_version = $dotnet_sdk_version + '.25609.108'; `
+        $dotnet_sdk_version = '11.0.100-alpha.1.25609.108'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
-        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/$dotnet_file; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file; `
+        Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_version/$dotnet_file; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt
index 9068f85424..57cc13e47c 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
index 65f34758e6..fecc264cad 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
index 86cadbe030..8b582b3053 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt
index 1b4ba481c4..934bed0d0b 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt
index 46a8ba7239..d4f7e29776 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt
index 1f4f83d7f5..971ff2df28 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
index c7b8830d9b..d5dfad3088 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
@@ -11,10 +11,9 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
index a4edd6d68b..c44ba14e88 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
@@ -11,10 +11,9 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
index dbb90ffad3..7903185595 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
@@ -13,10 +13,9 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
index a7a7858828..5bf3e8670b 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
@@ -13,10 +13,9 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt
index 77932f0870..a1242a0b86 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt
@@ -13,10 +13,9 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt
index f100092cd1..a2b9dca9fa 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt
@@ -13,10 +13,9 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt
index 90a60d84e1..8342b60432 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt
@@ -13,10 +13,9 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt
index 5754d8469b..c3128df0d3 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt
@@ -13,10 +13,9 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
index 1d4e0dbdfc..9e473c85ca 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
@@ -13,10 +13,9 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
index 0dd7271377..55647a6beb 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
@@ -13,10 +13,9 @@ RUN tdnf install -y \
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
index 6f28c73063..c2cb3ef7d3 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
@@ -13,7 +13,6 @@ RUN powershell -Command `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         $aspnetcore_version = '0.0.0'; `
-        $aspnetcore_build_version = $aspnetcore_version + '.25609.108'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
         `
@@ -21,8 +20,8 @@ RUN powershell -Command `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt
index 209b39ca31..e8cf8f077d 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt
index 674423bb81..3b4118b753 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt
index 86beb3266c..5381c21e98 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
index 509f501c82..9dbe390877 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
index b71dbfe3c6..abc6aa433b 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
index 3a676a08cf..e65f889e44 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt
index 7765890c31..2caa7fa260 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt
index 21ad55a82b..bae72716d1 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt
index aa8b0f6451..d283d45fb9 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt
index de61ee07a5..62f4aea2ea 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
index c8317c0b9e..ab7a8157b7 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
index ce5747a547..e5b3a244e1 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
index ba7e942b75..c6314b6491 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
index 5eaf0d16c1..b6591cacd0 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
index c35327c61a..5520492b76 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=0.0.0 \
-    && aspnetcore_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
index f69ca1c53f..0c0fc95cdf 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
@@ -13,7 +13,6 @@ RUN powershell -Command `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         $aspnetcore_version = '0.0.0'; `
-        $aspnetcore_build_version = $aspnetcore_version + '.25609.108'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512'; `
         `
@@ -21,8 +20,8 @@ RUN powershell -Command `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt
index 5de9d41bc9..32b28e65af 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
index 231c812ac3..531f790cac 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
index a5fcd904ae..3bb298e1ca 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
index 011eddd49e..1661f6e865 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
@@ -11,10 +11,9 @@ RUN tdnf install -y \
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
index 8f772fda4c..561daf3a1a 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
@@ -11,10 +11,9 @@ RUN tdnf install -y \
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
index de3f4ef01a..c0eb0dfd5b 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt
@@ -13,10 +13,9 @@ RUN tdnf install -y \
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
index 442fe49870..64f97a946d 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt
@@ -13,10 +13,9 @@ RUN tdnf install -y \
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
index 1bb59a810a..7b89b776aa 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt
@@ -13,10 +13,9 @@ RUN tdnf install -y \
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
index 33c606ceb2..660a144524 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt
@@ -13,10 +13,9 @@ RUN tdnf install -y \
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
index 869ff75710..d4f1527b5a 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
@@ -11,7 +11,6 @@ RUN powershell -Command `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         $dotnet_version = '0.0.0'; `
-        $dotnet_build_version = $dotnet_version + '.25609.108'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
@@ -19,8 +18,8 @@ RUN powershell -Command `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt
index 0a2551b782..777f0fb173 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt
index 414f350493..41fe5e8859 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt
index bf71e26102..a260a517c4 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
index 30d4adbc58..31c0cfa89c 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
index e542dbe0f0..77b47244e1 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
index 23dce9937c..6233585970 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
index aa82eb4797..419caeb65d 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
index e77b596ec3..98ed46a118 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
index 5e7fce5f49..93f9304a9c 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
@@ -7,10 +7,9 @@ ARG ACCESSTOKEN
 
 # Retrieve .NET Runtime
 RUN dotnet_version=0.0.0 \
-    && dotnet_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
index 4723617cdb..a161d997f0 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
@@ -11,7 +11,6 @@ RUN powershell -Command `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         $dotnet_version = '0.0.0'; `
-        $dotnet_build_version = $dotnet_version + '.25609.108'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
@@ -19,8 +18,8 @@ RUN powershell -Command `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt
index 850c64ca6b..e5cce2b97f 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt
@@ -6,10 +6,9 @@ ARG ACCESSTOKEN
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
-    && dotnet_sdk_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
index e65958efad..34dc206b0e 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
@@ -6,10 +6,9 @@ ARG ACCESSTOKEN
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
-    && dotnet_sdk_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
index 3087254b38..691687fa4a 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
@@ -6,10 +6,9 @@ ARG ACCESSTOKEN
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
-    && dotnet_sdk_build_version=0.0.0 \
     && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
-        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
index fc9d466378..0f6b1c0d8c 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt
@@ -10,10 +10,9 @@ RUN tdnf install -y \
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
-    && dotnet_sdk_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
index 5134936c1e..cba4d6df79 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt
@@ -10,10 +10,9 @@ RUN tdnf install -y \
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
-    && dotnet_sdk_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
index 0dbd8f62c4..126cf83a04 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt
@@ -29,7 +29,6 @@ RUN `
         `
         # Retrieve .NET SDK
         $dotnet_sdk_version = '0.0.0'; `
-        $dotnet_sdk_build_version = $dotnet_sdk_version + '.25609.108'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
@@ -37,8 +36,8 @@ RUN `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt
index 8e9bcced6e..9b0b519e2f 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt
@@ -6,10 +6,9 @@ ARG ACCESSTOKEN
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
-    && dotnet_sdk_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt
index 89b9ecf6fa..60dcf88122 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt
@@ -6,10 +6,9 @@ ARG ACCESSTOKEN
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
-    && dotnet_sdk_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt
index 00c1fc0e2d..092a93018f 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt
@@ -6,10 +6,9 @@ ARG ACCESSTOKEN
 
 # Install .NET SDK
 RUN dotnet_sdk_version=0.0.0 \
-    && dotnet_sdk_build_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
-        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
+        --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
     && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
index 2b9c409bb5..5aa5d6d377 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt
@@ -29,7 +29,6 @@ RUN `
         `
         # Retrieve .NET SDK
         $dotnet_sdk_version = '0.0.0'; `
-        $dotnet_sdk_build_version = $dotnet_sdk_version + '.25609.108'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512'; `
         `
@@ -37,8 +36,8 @@ RUN `
             Authorization = \"Bearer $env:ACCESSTOKEN\"; `
             'x-ms-version' = '2017-11-09'; `
         }; `
-        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_file -Headers $Headers; `
-        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_file -Headers $Headers; `
+        Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_sha512_file -Headers $Headers; `
         `
         if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { `
             Write-Host 'CHECKSUM VERIFICATION FAILED!'; `

From 40b3f24a93e0f5c2edf906260cab6920cc2d233e Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Mon, 15 Dec 2025 09:54:09 -0800
Subject: [PATCH 10/23] Disable project template tests for .NET 11

---
 .../TestScenarios/ProjectTemplateTestScenario.cs           | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ProjectTemplateTestScenario.cs b/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ProjectTemplateTestScenario.cs
index 217bf39bbe..a73b649a57 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ProjectTemplateTestScenario.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ProjectTemplateTestScenario.cs
@@ -117,6 +117,13 @@ protected string Build(string stageTarget, string[]? customBuildArgs)
 
     public async Task ExecuteAsync()
     {
+        if (ImageData.Version.Major == 11)
+        {
+            OutputHelper.WriteLine("Skipping project template test scenario for .NET 11 since project templates are"
+                + " not updated yet. Re-enable when https://github.com/dotnet/sdk/issues/50295 is resolved.");
+            return;
+        }
+
         List<string> tags = [];
 
         try

From 1db81f13277b0c9879517e5fcf8111b8e2cae051 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Mon, 15 Dec 2025 10:24:57 -0800
Subject: [PATCH 11/23] Use full build version in alpha environment variables

---
 eng/dockerfile-templates/aspnet/Dockerfile.envs          | 5 ++++-
 eng/dockerfile-templates/runtime/Dockerfile.envs         | 9 ++++++---
 eng/dockerfile-templates/sdk/Dockerfile.envs             | 5 ++++-
 src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile    | 4 ++--
 src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile  | 4 ++--
 src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile  | 4 ++--
 src/aspnet/11.0/alpine3.23/amd64/Dockerfile              | 2 +-
 src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile            | 2 +-
 src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile            | 2 +-
 .../amd64/Dockerfile                                     | 4 ++--
 .../arm64v8/Dockerfile                                   | 4 ++--
 .../azurelinux3.0-distroless-composite/amd64/Dockerfile  | 4 ++--
 .../arm64v8/Dockerfile                                   | 4 ++--
 .../11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile | 2 +-
 .../azurelinux3.0-distroless-extra/arm64v8/Dockerfile    | 2 +-
 .../11.0/azurelinux3.0-distroless/amd64/Dockerfile       | 2 +-
 .../11.0/azurelinux3.0-distroless/arm64v8/Dockerfile     | 2 +-
 src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile           | 2 +-
 src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile         | 2 +-
 src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile     | 2 +-
 .../resolute-chiseled-composite-extra/amd64/Dockerfile   | 4 ++--
 .../resolute-chiseled-composite-extra/arm32v7/Dockerfile | 4 ++--
 .../resolute-chiseled-composite-extra/arm64v8/Dockerfile | 4 ++--
 .../11.0/resolute-chiseled-composite/amd64/Dockerfile    | 4 ++--
 .../11.0/resolute-chiseled-composite/arm32v7/Dockerfile  | 4 ++--
 .../11.0/resolute-chiseled-composite/arm64v8/Dockerfile  | 4 ++--
 src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile | 2 +-
 .../11.0/resolute-chiseled-extra/arm32v7/Dockerfile      | 2 +-
 .../11.0/resolute-chiseled-extra/arm64v8/Dockerfile      | 2 +-
 src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile       | 2 +-
 src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile     | 2 +-
 src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile     | 2 +-
 src/aspnet/11.0/resolute/amd64/Dockerfile                | 2 +-
 src/aspnet/11.0/resolute/arm32v7/Dockerfile              | 2 +-
 src/aspnet/11.0/resolute/arm64v8/Dockerfile              | 2 +-
 .../11.0/windowsservercore-ltsc2025/amd64/Dockerfile     | 2 +-
 src/runtime/11.0/alpine3.23/amd64/Dockerfile             | 2 +-
 src/runtime/11.0/alpine3.23/arm32v7/Dockerfile           | 2 +-
 src/runtime/11.0/alpine3.23/arm64v8/Dockerfile           | 2 +-
 .../11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile | 2 +-
 .../azurelinux3.0-distroless-extra/arm64v8/Dockerfile    | 2 +-
 .../11.0/azurelinux3.0-distroless/amd64/Dockerfile       | 2 +-
 .../11.0/azurelinux3.0-distroless/arm64v8/Dockerfile     | 2 +-
 src/runtime/11.0/azurelinux3.0/amd64/Dockerfile          | 2 +-
 src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile        | 2 +-
 src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile    | 2 +-
 .../11.0/resolute-chiseled-extra/amd64/Dockerfile        | 2 +-
 .../11.0/resolute-chiseled-extra/arm32v7/Dockerfile      | 2 +-
 .../11.0/resolute-chiseled-extra/arm64v8/Dockerfile      | 2 +-
 src/runtime/11.0/resolute-chiseled/amd64/Dockerfile      | 2 +-
 src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile    | 2 +-
 src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile    | 2 +-
 src/runtime/11.0/resolute/amd64/Dockerfile               | 2 +-
 src/runtime/11.0/resolute/arm32v7/Dockerfile             | 2 +-
 src/runtime/11.0/resolute/arm64v8/Dockerfile             | 2 +-
 .../11.0/windowsservercore-ltsc2025/amd64/Dockerfile     | 2 +-
 src/sdk/11.0/alpine3.23/amd64/Dockerfile                 | 2 +-
 src/sdk/11.0/alpine3.23/arm32v7/Dockerfile               | 2 +-
 src/sdk/11.0/alpine3.23/arm64v8/Dockerfile               | 2 +-
 src/sdk/11.0/azurelinux3.0/amd64/Dockerfile              | 2 +-
 src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile            | 2 +-
 src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile        | 2 +-
 src/sdk/11.0/resolute/amd64/Dockerfile                   | 2 +-
 src/sdk/11.0/resolute/arm32v7/Dockerfile                 | 2 +-
 src/sdk/11.0/resolute/arm64v8/Dockerfile                 | 2 +-
 src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile | 2 +-
 66 files changed, 90 insertions(+), 81 deletions(-)

diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.envs b/eng/dockerfile-templates/aspnet/Dockerfile.envs
index f781a195c8..ebabad80de 100644
--- a/eng/dockerfile-templates/aspnet/Dockerfile.envs
+++ b/eng/dockerfile-templates/aspnet/Dockerfile.envs
@@ -4,7 +4,10 @@
 
     set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
     set buildVersion to VARIABLES[cat("aspnet|", dotnetVersion, "|build-version")] ^
-    set isStableBranding to find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^
+    set isStableBranding to
+        find(buildVersion, "alpha") < 0
+        && find(buildVersion, "preview") < 0
+        && find(buildVersion, "rc.") < 0 ^
 
     set runtimeVersion to when(isStableBranding,
         VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")],
diff --git a/eng/dockerfile-templates/runtime/Dockerfile.envs b/eng/dockerfile-templates/runtime/Dockerfile.envs
index c658e10133..8c4cee0ae2 100644
--- a/eng/dockerfile-templates/runtime/Dockerfile.envs
+++ b/eng/dockerfile-templates/runtime/Dockerfile.envs
@@ -3,11 +3,14 @@
         is-standalone (optional): Whether the ENV instruction should be included ^
 
     set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
-    set runtimeVersion to VARIABLES[cat("runtime|", dotnetVersion, "|build-version")] ^
-    set isStableBranding to find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^
+    set buildVersion to VARIABLES[cat("runtime|", dotnetVersion, "|build-version")] ^
+    set isStableBranding to
+        find(buildVersion, "alpha") < 0
+        && find(buildVersion, "preview") < 0
+        && find(buildVersion, "rc.") < 0 ^
     set runtimeVersion to when(isStableBranding,
         VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")],
-        VARIABLES[cat("runtime|", dotnetVersion, "|build-version")])
+        buildVersion)
 
 }}# .NET Runtime version
 {{if ARGS["is-standalone"]:ENV }}DOTNET_VERSION={{runtimeVersion}}
diff --git a/eng/dockerfile-templates/sdk/Dockerfile.envs b/eng/dockerfile-templates/sdk/Dockerfile.envs
index d730fe0e31..d57580f859 100644
--- a/eng/dockerfile-templates/sdk/Dockerfile.envs
+++ b/eng/dockerfile-templates/sdk/Dockerfile.envs
@@ -4,7 +4,10 @@
 
     set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
     set buildVersion to VARIABLES[cat("sdk|", dotnetVersion, "|build-version")] ^
-    set isStableBranding to find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^
+    set isStableBranding to
+        find(buildVersion, "alpha") < 0
+        && find(buildVersion, "preview") < 0
+        && find(buildVersion, "rc.") < 0 ^
 
     set sdkVersion to when(isStableBranding,
         VARIABLES[cat("sdk|", dotnetVersion, "|product-version")],
diff --git a/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile
index 7553e576aa..d594eb6b7c 100644
--- a/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile
@@ -21,9 +21,9 @@ FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile
index 200a3b0791..e7c06b320d 100644
--- a/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile
@@ -21,9 +21,9 @@ FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile
index 37f191b136..70bb394a5f 100644
--- a/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile
@@ -21,9 +21,9 @@ FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.23/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23/amd64/Dockerfile
index 8987fc4464..175ca68e64 100644
--- a/src/aspnet/11.0/alpine3.23/amd64/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23/amd64/Dockerfile
@@ -20,6 +20,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile
index c13f57ef22..32c2c9514c 100644
--- a/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile
@@ -20,6 +20,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile
index 89e5baf583..520b4c0907 100644
--- a/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile
@@ -20,6 +20,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
index 7f35894275..26bd72b34a 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
@@ -30,9 +30,9 @@ FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
index 8b070890a8..168eb066b5 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
@@ -30,9 +30,9 @@ FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
index 464b73e205..0fd1707af7 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
@@ -30,9 +30,9 @@ FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
index 78a67dea71..23b5bbc185 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
@@ -30,9 +30,9 @@ FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
index a760947a70..cab53f47fa 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
@@ -26,6 +26,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
index 6ba8e6eae3..366a0a812f 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
@@ -26,6 +26,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile
index 3ab6b6a69c..0070639a13 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile
@@ -26,6 +26,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
index ebe43bb7bf..e82efe439c 100644
--- a/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
@@ -26,6 +26,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile
index f1c0716717..f9efb0e01e 100644
--- a/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile
@@ -24,6 +24,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-azurelinux3.0-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile
index cfb0713f0a..df9195c602 100644
--- a/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile
@@ -24,6 +24,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-azurelinux3.0-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile
index f9426f351d..72b20cd34f 100644
--- a/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -33,6 +33,6 @@ RUN powershell -Command `
 FROM $REPO:11.0.0-alpha.1-nanoserver-ltsc2025
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile
index 33c37efe26..58483d2081 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile
@@ -24,9 +24,9 @@ FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
index 3e5ac7058f..54d24fde65 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
@@ -24,9 +24,9 @@ FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile
index 35e0d65e11..ef7ab10f67 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile
@@ -24,9 +24,9 @@ FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile
index 399665f9c4..2556d6fbea 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile
@@ -24,9 +24,9 @@ FROM $REPO:11.0.0-alpha.1-resolute-chiseled-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
index 058cf37198..13f225d832 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
@@ -24,9 +24,9 @@ FROM $REPO:11.0.0-alpha.1-resolute-chiseled-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile
index 05d820ef74..8400c4b345 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile
@@ -24,9 +24,9 @@ FROM $REPO:11.0.0-alpha.1-resolute-chiseled-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1 \
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
     # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-alpha.1
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile
index 893589e3c8..7c0e12d0be 100644
--- a/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile
@@ -20,6 +20,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
index c525b4cd2c..f98635a9ca 100644
--- a/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
@@ -20,6 +20,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
index fff1514648..c6159e451e 100644
--- a/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
@@ -20,6 +20,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile
index f40f04d5b2..d7383cbd2a 100644
--- a/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile
@@ -20,6 +20,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-resolute-chiseled-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
index 694e87180e..c8255bd3b9 100644
--- a/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
@@ -20,6 +20,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-resolute-chiseled-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile
index 36f81a6053..3fd8537ff3 100644
--- a/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile
@@ -20,6 +20,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-resolute-chiseled-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/resolute/amd64/Dockerfile b/src/aspnet/11.0/resolute/amd64/Dockerfile
index 89373f21bc..8c0cbb9fff 100644
--- a/src/aspnet/11.0/resolute/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute/amd64/Dockerfile
@@ -20,6 +20,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-resolute-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/resolute/arm32v7/Dockerfile b/src/aspnet/11.0/resolute/arm32v7/Dockerfile
index 965efeb569..3cf3636cdf 100644
--- a/src/aspnet/11.0/resolute/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute/arm32v7/Dockerfile
@@ -20,6 +20,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-resolute-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/resolute/arm64v8/Dockerfile b/src/aspnet/11.0/resolute/arm64v8/Dockerfile
index 9136a35e33..b3fec00d49 100644
--- a/src/aspnet/11.0/resolute/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute/arm64v8/Dockerfile
@@ -20,6 +20,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-resolute-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
index d02ffd3e98..e3214d9f9b 100644
--- a/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -33,6 +33,6 @@ RUN powershell -Command `
 FROM $REPO:11.0.0-alpha.1-windowsservercore-ltsc2025
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-alpha.1
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/runtime/11.0/alpine3.23/amd64/Dockerfile b/src/runtime/11.0/alpine3.23/amd64/Dockerfile
index f1ee5095ef..12d51fb155 100644
--- a/src/runtime/11.0/alpine3.23/amd64/Dockerfile
+++ b/src/runtime/11.0/alpine3.23/amd64/Dockerfile
@@ -20,7 +20,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile b/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile
index c55938197d..63021e1d59 100644
--- a/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile
@@ -20,7 +20,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile b/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile
index b1b75f6151..9e670d3690 100644
--- a/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile
@@ -20,7 +20,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
index 499d6cb231..a5d9b5785e 100644
--- a/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
@@ -29,7 +29,7 @@ RUN mkdir /dotnet-symlink \
 FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
index 1467bbb81f..f93a4c0736 100644
--- a/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
@@ -29,7 +29,7 @@ RUN mkdir /dotnet-symlink \
 FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile
index b4095bf56b..f362be4659 100644
--- a/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile
@@ -29,7 +29,7 @@ RUN mkdir /dotnet-symlink \
 FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
index 3dd98f2797..a84d724778 100644
--- a/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile
@@ -29,7 +29,7 @@ RUN mkdir /dotnet-symlink \
 FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile b/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile
index b024183a19..0b49635e71 100644
--- a/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile
@@ -24,7 +24,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-azurelinux3.0-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile
index eab33f3a4c..c1ac38986e 100644
--- a/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile
@@ -24,7 +24,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-azurelinux3.0-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile
index b2efae8312..646f89d8be 100644
--- a/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -36,7 +36,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 # In order to set system PATH, ContainerAdministrator must be used
 USER ContainerAdministrator
diff --git a/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile
index b164393e9b..b2514638f6 100644
--- a/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
index dfdcc65ba9..adc77e91e4 100644
--- a/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
index 4f9b1db27e..75d907e1b9 100644
--- a/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 FROM $REPO:11.0.0-alpha.1-resolute-chiseled-extra-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile b/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile
index 9f27a72c05..5fa3fe8b80 100644
--- a/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 FROM $REPO:11.0.0-alpha.1-resolute-chiseled-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
index 7ba6f4a387..a714a143ae 100644
--- a/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 FROM $REPO:11.0.0-alpha.1-resolute-chiseled-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile
index 2b073bcee1..c8b0587106 100644
--- a/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile
@@ -23,7 +23,7 @@ RUN mkdir /dotnet-symlink \
 FROM $REPO:11.0.0-alpha.1-resolute-chiseled-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/11.0/resolute/amd64/Dockerfile b/src/runtime/11.0/resolute/amd64/Dockerfile
index 188ccea9ff..07b4d70cb4 100644
--- a/src/runtime/11.0/resolute/amd64/Dockerfile
+++ b/src/runtime/11.0/resolute/amd64/Dockerfile
@@ -20,7 +20,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-resolute-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/resolute/arm32v7/Dockerfile b/src/runtime/11.0/resolute/arm32v7/Dockerfile
index 74be43719b..65c15e9f55 100644
--- a/src/runtime/11.0/resolute/arm32v7/Dockerfile
+++ b/src/runtime/11.0/resolute/arm32v7/Dockerfile
@@ -20,7 +20,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-resolute-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/resolute/arm64v8/Dockerfile b/src/runtime/11.0/resolute/arm64v8/Dockerfile
index 10d0bd2414..cdd2ec5d48 100644
--- a/src/runtime/11.0/resolute/arm64v8/Dockerfile
+++ b/src/runtime/11.0/resolute/arm64v8/Dockerfile
@@ -20,7 +20,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
 FROM $REPO:11.0.0-alpha.1-resolute-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-alpha.1
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
index 1ab8557aa1..ff84502f78 100644
--- a/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -36,7 +36,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=11.0.0-alpha.1
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108
 
 RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
 
diff --git a/src/sdk/11.0/alpine3.23/amd64/Dockerfile b/src/sdk/11.0/alpine3.23/amd64/Dockerfile
index 7522b4305d..879446740d 100644
--- a/src/sdk/11.0/alpine3.23/amd64/Dockerfile
+++ b/src/sdk/11.0/alpine3.23/amd64/Dockerfile
@@ -24,7 +24,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1.25609.108 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile b/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile
index 9a6d50ba7b..f94a0aa64c 100644
--- a/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile
@@ -24,7 +24,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1.25609.108 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile
index 00707645da..9969eb6032 100644
--- a/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile
@@ -24,7 +24,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1.25609.108 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile b/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile
index 7c2f0bbf6c..2ed11dc51e 100644
--- a/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile
@@ -28,7 +28,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1.25609.108 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile
index cd7c6a29be..1b51bee99d 100644
--- a/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile
@@ -28,7 +28,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1.25609.108 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile
index 18c9c7a3fe..edf235f505 100644
--- a/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -72,7 +72,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-alpha.1 `
+    DOTNET_SDK_VERSION=11.0.100-alpha.1.25609.108 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/11.0/resolute/amd64/Dockerfile b/src/sdk/11.0/resolute/amd64/Dockerfile
index c649b32287..da145fcd44 100644
--- a/src/sdk/11.0/resolute/amd64/Dockerfile
+++ b/src/sdk/11.0/resolute/amd64/Dockerfile
@@ -24,7 +24,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1.25609.108 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/11.0/resolute/arm32v7/Dockerfile b/src/sdk/11.0/resolute/arm32v7/Dockerfile
index 4dc9a9ba23..6172ef2d39 100644
--- a/src/sdk/11.0/resolute/arm32v7/Dockerfile
+++ b/src/sdk/11.0/resolute/arm32v7/Dockerfile
@@ -24,7 +24,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1.25609.108 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/11.0/resolute/arm64v8/Dockerfile b/src/sdk/11.0/resolute/arm64v8/Dockerfile
index e3df240e0c..79ab5e9735 100644
--- a/src/sdk/11.0/resolute/arm64v8/Dockerfile
+++ b/src/sdk/11.0/resolute/arm64v8/Dockerfile
@@ -24,7 +24,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-alpha.1 \
+    DOTNET_SDK_VERSION=11.0.100-alpha.1.25609.108 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
index 60d128a118..8ab9f0c4d2 100644
--- a/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -72,7 +72,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=11.0.100-alpha.1 `
+    DOTNET_SDK_VERSION=11.0.100-alpha.1.25609.108 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance

From 440af4a483c66ac8877b2e0ebb6c32b9bfa0a6a2 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Mon, 15 Dec 2025 10:28:54 -0800
Subject: [PATCH 12/23] Disable test solution creation for .NET 11

---
 tests/Microsoft.DotNet.Docker.Tests/TestSolution.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestSolution.cs b/tests/Microsoft.DotNet.Docker.Tests/TestSolution.cs
index 0125aa300a..3610772889 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/TestSolution.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/TestSolution.cs
@@ -45,6 +45,13 @@ public TestSolution(ProductImageData imageData, string sampleName, DockerHelper
 
     private string CreateTestSolutionWithSdkImage(string solutionDir, string appType)
     {
+        if (_imageData.Version.Major == 11)
+        {
+            // Project templates are not yet updated for .NET 11.
+            // Re-enable when https://github.com/dotnet/sdk/issues/50295 is resolved.
+            return "";
+        }
+
         Directory.CreateDirectory(solutionDir);
         string appProjectContainerName = _imageData.GetIdentifier($"create-{appType}");
         string testProjectContainerName = _imageData.GetIdentifier("create-test");

From a47eb6883602e2852425b7045bf37e11a99596b3 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Mon, 15 Dec 2025 10:56:39 -0800
Subject: [PATCH 13/23] Make testSolution a local variable, and build it during
 Execute

---
 .../AspnetImageTests.cs                       |  2 +-
 .../RuntimeDepsImageTests.cs                  |  7 ++--
 .../RuntimeImageTests.cs                      |  6 +--
 .../SdkImageTests.cs                          |  2 +-
 .../ProjectTemplateTestScenario.cs            | 38 +++++--------------
 .../TestSolution.cs                           |  7 ----
 6 files changed, 16 insertions(+), 46 deletions(-)

diff --git a/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs
index 48e6a0e147..2db43d9996 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs
@@ -32,7 +32,7 @@ public async Task VerifyFxDependentAppScenario(ProductImageData imageData)
                 return;
             }
 
-            using WebScenario scenario = new WebScenario.FxDependent(imageData, DockerHelper, OutputHelper);
+            WebScenario scenario = new WebScenario.FxDependent(imageData, DockerHelper, OutputHelper);
             await scenario.ExecuteAsync();
         }
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/RuntimeDepsImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/RuntimeDepsImageTests.cs
index 7d38f05bdb..280e33f6a2 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/RuntimeDepsImageTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/RuntimeDepsImageTests.cs
@@ -38,7 +38,7 @@ public async Task VerifySelfContainedConsoleScenario(ProductImageData imageData)
                 return;
             }
 
-            using ConsoleAppScenario testScenario =
+            ConsoleAppScenario testScenario =
                 new ConsoleAppScenario.SelfContained(imageData, DockerHelper, OutputHelper);
             await testScenario.ExecuteAsync();
         }
@@ -54,8 +54,7 @@ public async Task VerifySelfContainedWebScenario(ProductImageData imageData)
                 return;
             }
 
-            using WebScenario testScenario =
-                new WebScenario.SelfContained(imageData, DockerHelper, OutputHelper);
+            WebScenario testScenario = new WebScenario.SelfContained(imageData, DockerHelper, OutputHelper);
             await testScenario.ExecuteAsync();
         }
 
@@ -71,7 +70,7 @@ public async Task VerifyAotWebScenario(ProductImageData imageData)
                 return;
             }
 
-            using WebScenario scenario = new WebScenario.Aot(imageData, DockerHelper, OutputHelper);
+            WebScenario scenario = new WebScenario.Aot(imageData, DockerHelper, OutputHelper);
             await scenario.ExecuteAsync();
         }
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs
index db792e75de..d370b96dd9 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs
@@ -28,8 +28,7 @@ public RuntimeImageTests(ITestOutputHelper outputHelper)
         [MemberData(nameof(GetImageData))]
         public async Task VerifyFxDependentAppScenario(ProductImageData imageData)
         {
-            using ConsoleAppScenario testScenario =
-                new ConsoleAppScenario.FxDependent(imageData, DockerHelper, OutputHelper);
+            ConsoleAppScenario testScenario = new ConsoleAppScenario.FxDependent(imageData, DockerHelper, OutputHelper);
             await testScenario.ExecuteAsync();
         }
 
@@ -37,8 +36,7 @@ public async Task VerifyFxDependentAppScenario(ProductImageData imageData)
         [MemberData(nameof(GetImageData))]
         public async Task VerifyTestProjectScenario(ProductImageData imageData)
         {
-            using ConsoleAppScenario testScenario =
-                new ConsoleAppScenario.TestProject(imageData, DockerHelper, OutputHelper);
+            ConsoleAppScenario testScenario = new ConsoleAppScenario.TestProject(imageData, DockerHelper, OutputHelper);
             await testScenario.ExecuteAsync();
         }
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs
index da515ca2d5..4e5ac5222e 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs
@@ -82,7 +82,7 @@ public async void VerifyBlazorWasmScenario(ProductImageData imageData)
                 useWasmTools = false;
             }
 
-            using BlazorWasmScenario testScenario = new(imageData, DockerHelper, OutputHelper, useWasmTools);
+            BlazorWasmScenario testScenario = new(imageData, DockerHelper, OutputHelper, useWasmTools);
             await testScenario.ExecuteAsync();
         }
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ProjectTemplateTestScenario.cs b/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ProjectTemplateTestScenario.cs
index a73b649a57..cc271f9e71 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ProjectTemplateTestScenario.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ProjectTemplateTestScenario.cs
@@ -12,10 +12,8 @@
 
 namespace Microsoft.DotNet.Docker.Tests;
 
-public abstract class ProjectTemplateTestScenario : ITestScenario, IDisposable
+public abstract class ProjectTemplateTestScenario : ITestScenario
 {
-    private bool _disposed;
-
     protected static string OSDockerfileSuffix { get; } = DockerHelper.IsLinuxContainerModeEnabled ? "linux" : "windows";
     protected static string? AdminUser { get; } = DockerHelper.IsLinuxContainerModeEnabled ? "root" : null;
     protected static string? NonRootUser { get; } = DockerHelper.IsLinuxContainerModeEnabled ? "app" : "ContainerUser";
@@ -23,7 +21,6 @@ public abstract class ProjectTemplateTestScenario : ITestScenario, IDisposable
     protected DockerHelper DockerHelper { get; }
     protected ProductImageData ImageData { get; }
     protected ITestOutputHelper OutputHelper { get; }
-    protected TestSolution TestSolution { get; }
 
     protected virtual bool NonRootUserSupported => DockerHelper.IsLinuxContainerModeEnabled;
 
@@ -44,11 +41,9 @@ public ProjectTemplateTestScenario(
         DockerHelper = dockerHelper;
         ImageData = imageData;
         OutputHelper = outputHelper;
-
-        TestSolution = new(imageData, SampleName, dockerHelper, injectCustomTestCode: InjectCustomTestCode);
     }
 
-    protected string Build(string stageTarget, string[]? customBuildArgs)
+    private string Build(TestSolution testSolution, string stageTarget, string[]? customBuildArgs)
     {
         const string DockerfileName = "Dockerfile";
         string dockerfilePath = Path.Combine(DockerHelper.TestArtifactsDir, DockerfileName);
@@ -100,7 +95,7 @@ protected string Build(string stageTarget, string[]? customBuildArgs)
                 tag: tag,
                 dockerfile: dockerfilePath,
                 target: stageTarget,
-                contextDir: TestSolution.SolutionDir,
+                contextDir: testSolution.SolutionDir,
                 platform: ImageData.Platform,
                 buildArgs: buildArgs.ToArray());
         }
@@ -125,9 +120,12 @@ public async Task ExecuteAsync()
         }
 
         List<string> tags = [];
+        TestSolution? testSolution = null;
 
         try
         {
+            testSolution = new TestSolution(ImageData, SampleName, DockerHelper, InjectCustomTestCode);
+
             OutputHelper.WriteLine(
                 $"""
 
@@ -144,12 +142,12 @@ public async Task ExecuteAsync()
             string[] customBuildArgs = [ ..CustomDockerBuildArgs, $"rid={ImageData.Rid}" ];
 
             // Build and run app on SDK image
-            string buildTag = Build(TestDockerfile.BuildStageName, customBuildArgs);
+            string buildTag = Build(testSolution, TestDockerfile.BuildStageName, customBuildArgs);
             tags.Add(buildTag);
             await RunAsync(buildTag, command: "dotnet run --no-restore");
 
             // Build and run app stage
-            string tag = Build(TestDockerfile.AppStageName, customBuildArgs);
+            string tag = Build(testSolution, TestDockerfile.AppStageName, customBuildArgs);
             tags.Add(tag);
 
             // Don't run the app if the build output is not executable
@@ -165,27 +163,9 @@ public async Task ExecuteAsync()
         finally
         {
             tags.ForEach(DockerHelper.DeleteImage);
+            testSolution?.Dispose();
         }
     }
 
     protected abstract Task RunAsync(string image, string? user = null, string? command = null);
-
-    protected virtual void Dispose(bool disposing)
-    {
-        if (!_disposed)
-        {
-            if (disposing)
-            {
-                TestSolution.Dispose();
-            }
-
-            _disposed = true;
-        }
-    }
-
-    public void Dispose()
-    {
-        Dispose(disposing: true);
-        GC.SuppressFinalize(this);
-    }
 }
diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestSolution.cs b/tests/Microsoft.DotNet.Docker.Tests/TestSolution.cs
index 3610772889..0125aa300a 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/TestSolution.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/TestSolution.cs
@@ -45,13 +45,6 @@ public TestSolution(ProductImageData imageData, string sampleName, DockerHelper
 
     private string CreateTestSolutionWithSdkImage(string solutionDir, string appType)
     {
-        if (_imageData.Version.Major == 11)
-        {
-            // Project templates are not yet updated for .NET 11.
-            // Re-enable when https://github.com/dotnet/sdk/issues/50295 is resolved.
-            return "";
-        }
-
         Directory.CreateDirectory(solutionDir);
         string appProjectContainerName = _imageData.GetIdentifier($"create-{appType}");
         string testProjectContainerName = _imageData.GetIdentifier("create-test");

From f03dc5738a24ac785e462c06d14db6d6f0e0fdcd Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Tue, 16 Dec 2025 09:05:40 -0800
Subject: [PATCH 14/23] Ignore unstable release in resolute chisel images

---
 .../runtime-deps/Dockerfile.chiseled-ubuntu                     | 2 +-
 src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile  | 2 +-
 .../11.0/resolute-chiseled-extra/arm32v7/Dockerfile             | 2 +-
 .../11.0/resolute-chiseled-extra/arm64v8/Dockerfile             | 2 +-
 src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile        | 2 +-
 src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile      | 2 +-
 src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile      | 2 +-
 ...me-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt | 2 +-
 ...-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt | 2 +-
 ...-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt | 2 +-
 ...s-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt | 2 +-
 ...11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt | 2 +-
 ...11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu b/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu
index 115a629015..3bd7c89baa 100644
--- a/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu
+++ b/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu
@@ -97,7 +97,7 @@ RUN {{InsertTemplate("Dockerfile.linux.non-root-user-staged", [
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-{{osVersionNumber}} --root /rootfs \{{for index, pkg in pkgs:
+        --release ubuntu-{{osVersionNumber}}{{if match(osVersionBase, "resolute"): --ignore=unstable}} --root /rootfs \{{for index, pkg in pkgs:
             {{pkg}}{{if index < len(pkgs) - 1: \}}}}
 
 
diff --git a/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile
index 6102acaa0f..b78970e874 100644
--- a/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile
@@ -26,7 +26,7 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-26.04 --root /rootfs \
+        --release ubuntu-26.04 --ignore=unstable --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
diff --git a/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
index b9f47d25df..081f5f8b7b 100644
--- a/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
@@ -26,7 +26,7 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-26.04 --root /rootfs \
+        --release ubuntu-26.04 --ignore=unstable --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
diff --git a/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
index 9dd7f705e6..5db239cd91 100644
--- a/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
@@ -26,7 +26,7 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-26.04 --root /rootfs \
+        --release ubuntu-26.04 --ignore=unstable --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
diff --git a/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile
index dd159f3fd9..60936cdfed 100644
--- a/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile
@@ -26,7 +26,7 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-26.04 --root /rootfs \
+        --release ubuntu-26.04 --ignore=unstable --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
diff --git a/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile
index 4cf8c8635f..1a0c95e206 100644
--- a/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile
@@ -26,7 +26,7 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-26.04 --root /rootfs \
+        --release ubuntu-26.04 --ignore=unstable --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
diff --git a/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile
index 81baacc546..d34cab1723 100644
--- a/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile
@@ -26,7 +26,7 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-26.04 --root /rootfs \
+        --release ubuntu-26.04 --ignore=unstable --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
index 45d77dd799..6695bc3854 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
@@ -26,7 +26,7 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-26.04 --root /rootfs \
+        --release ubuntu-26.04 --ignore=unstable --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
index 708672a70f..3baeb46043 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
@@ -26,7 +26,7 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-26.04 --root /rootfs \
+        --release ubuntu-26.04 --ignore=unstable --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
index f399eab9eb..d1365c28ca 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
@@ -26,7 +26,7 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-26.04 --root /rootfs \
+        --release ubuntu-26.04 --ignore=unstable --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
index 520d2e89c1..b2027819f1 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
@@ -26,7 +26,7 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-26.04 --root /rootfs \
+        --release ubuntu-26.04 --ignore=unstable --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
index 1b8c544014..82cfed6639 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -26,7 +26,7 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-26.04 --root /rootfs \
+        --release ubuntu-26.04 --ignore=unstable --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
index 345e510c51..aa0a076610 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
@@ -26,7 +26,7 @@ RUN groupadd \
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-26.04 --root /rootfs \
+        --release ubuntu-26.04 --ignore=unstable --root /rootfs \
             base-files_base \
             base-files_chisel \
             base-files_release-info \

From 02e3e73ca0cde3bb3ca257a195d3a0e12550b625 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Tue, 16 Dec 2025 11:20:29 -0800
Subject: [PATCH 15/23] Invert libssl3t64 package condition for chiseled

---
 .../runtime-deps/Dockerfile.chiseled-ubuntu                     | 2 +-
 src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile  | 2 +-
 .../11.0/resolute-chiseled-extra/arm32v7/Dockerfile             | 2 +-
 .../11.0/resolute-chiseled-extra/arm64v8/Dockerfile             | 2 +-
 src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile        | 2 +-
 src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile      | 2 +-
 src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile      | 2 +-
 ...me-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt | 2 +-
 ...-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt | 2 +-
 ...-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt | 2 +-
 ...s-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt | 2 +-
 ...11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt | 2 +-
 ...11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu b/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu
index 3bd7c89baa..f3dc045f11 100644
--- a/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu
+++ b/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu
@@ -17,7 +17,7 @@
 
     set installerImageTag to cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl") ^
 
-    set opensslPkg to when(match(osVersionBase, "noble"), "libssl3t64", "libssl3") ^
+    set opensslPkg to when(match(osVersionBase, "jammy"), "libssl3", "libssl3t64") ^
 
     set basePkgs to [
             "base-files_base",
diff --git a/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile
index b78970e874..b17a1d4d25 100644
--- a/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile
@@ -34,7 +34,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \
             libc6_libs \
             libgcc-s1_libs \
             libicu76_libs \
-            libssl3_libs \
+            libssl3t64_libs \
             libstdc++6_libs \
             tzdata-legacy_zoneinfo \
             tzdata_zoneinfo
diff --git a/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
index 081f5f8b7b..0feaa21282 100644
--- a/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
@@ -34,7 +34,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \
             libc6_libs \
             libgcc-s1_libs \
             libicu76_libs \
-            libssl3_libs \
+            libssl3t64_libs \
             libstdc++6_libs \
             tzdata-legacy_zoneinfo \
             tzdata_zoneinfo
diff --git a/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
index 5db239cd91..8ee322b566 100644
--- a/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
@@ -34,7 +34,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \
             libc6_libs \
             libgcc-s1_libs \
             libicu76_libs \
-            libssl3_libs \
+            libssl3t64_libs \
             libstdc++6_libs \
             tzdata-legacy_zoneinfo \
             tzdata_zoneinfo
diff --git a/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile
index 60936cdfed..7a8ed94923 100644
--- a/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile
@@ -33,7 +33,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libssl3_libs \
+            libssl3t64_libs \
             libstdc++6_libs
 
 
diff --git a/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile
index 1a0c95e206..fe1a5034ad 100644
--- a/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile
@@ -33,7 +33,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libssl3_libs \
+            libssl3t64_libs \
             libstdc++6_libs
 
 
diff --git a/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile
index d34cab1723..dc37fc9eda 100644
--- a/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile
+++ b/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile
@@ -33,7 +33,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libssl3_libs \
+            libssl3t64_libs \
             libstdc++6_libs
 
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
index 6695bc3854..0bbb0335c9 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
@@ -33,7 +33,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libssl3_libs \
+            libssl3t64_libs \
             libstdc++6_libs
 
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
index 3baeb46043..e7c0c971b0 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
@@ -33,7 +33,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libssl3_libs \
+            libssl3t64_libs \
             libstdc++6_libs
 
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
index d1365c28ca..a2de6a0781 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
@@ -33,7 +33,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \
             ca-certificates_data \
             libc6_libs \
             libgcc-s1_libs \
-            libssl3_libs \
+            libssl3t64_libs \
             libstdc++6_libs
 
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
index b2027819f1..1d2ea4bfea 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
@@ -34,7 +34,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \
             libc6_libs \
             libgcc-s1_libs \
             libicu76_libs \
-            libssl3_libs \
+            libssl3t64_libs \
             libstdc++6_libs \
             tzdata-legacy_zoneinfo \
             tzdata_zoneinfo
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
index 82cfed6639..59ffe12e21 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -34,7 +34,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \
             libc6_libs \
             libgcc-s1_libs \
             libicu76_libs \
-            libssl3_libs \
+            libssl3t64_libs \
             libstdc++6_libs \
             tzdata-legacy_zoneinfo \
             tzdata_zoneinfo
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
index aa0a076610..91e2dabd67 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
@@ -34,7 +34,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \
             libc6_libs \
             libgcc-s1_libs \
             libicu76_libs \
-            libssl3_libs \
+            libssl3t64_libs \
             libstdc++6_libs \
             tzdata-legacy_zoneinfo \
             tzdata_zoneinfo

From d1b546efad15202f9ce154e2e0899fcbab818072 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Tue, 16 Dec 2025 13:08:14 -0800
Subject: [PATCH 16/23] Accommodate for case-sensitive uutils hashsum functions
 in resolute

---
 eng/dockerfile-templates/Dockerfile.linux.validate-checksum | 6 +++++-
 .../11.0/resolute-chiseled-composite-extra/amd64/Dockerfile | 2 +-
 .../resolute-chiseled-composite-extra/arm32v7/Dockerfile    | 2 +-
 .../resolute-chiseled-composite-extra/arm64v8/Dockerfile    | 2 +-
 .../11.0/resolute-chiseled-composite/amd64/Dockerfile       | 2 +-
 .../11.0/resolute-chiseled-composite/arm32v7/Dockerfile     | 2 +-
 .../11.0/resolute-chiseled-composite/arm64v8/Dockerfile     | 2 +-
 src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile    | 2 +-
 src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile  | 2 +-
 src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile  | 2 +-
 src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile          | 2 +-
 src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile        | 2 +-
 src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile        | 2 +-
 src/aspnet/11.0/resolute/amd64/Dockerfile                   | 2 +-
 src/aspnet/11.0/resolute/arm32v7/Dockerfile                 | 2 +-
 src/aspnet/11.0/resolute/arm64v8/Dockerfile                 | 2 +-
 src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile   | 2 +-
 src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile | 2 +-
 src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile | 2 +-
 src/runtime/11.0/resolute-chiseled/amd64/Dockerfile         | 2 +-
 src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile       | 2 +-
 src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile       | 2 +-
 src/runtime/11.0/resolute/amd64/Dockerfile                  | 2 +-
 src/runtime/11.0/resolute/arm32v7/Dockerfile                | 2 +-
 src/runtime/11.0/resolute/arm64v8/Dockerfile                | 2 +-
 src/sdk/11.0/resolute/amd64/Dockerfile                      | 2 +-
 src/sdk/11.0/resolute/arm32v7/Dockerfile                    | 2 +-
 src/sdk/11.0/resolute/arm64v8/Dockerfile                    | 2 +-
 .../aspnet-11.0-resolute-amd64-Dockerfile.approved.txt      | 2 +-
 .../aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt    | 2 +-
 .../aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt    | 2 +-
 ...net-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt | 2 +-
 ...t-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt | 2 +-
 ...t-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt | 2 +-
 ...esolute-chiseled-composite-amd64-Dockerfile.approved.txt | 2 +-
 ...olute-chiseled-composite-arm32v7-Dockerfile.approved.txt | 2 +-
 ...olute-chiseled-composite-arm64v8-Dockerfile.approved.txt | 2 +-
 ...e-chiseled-composite-extra-amd64-Dockerfile.approved.txt | 2 +-
 ...chiseled-composite-extra-arm32v7-Dockerfile.approved.txt | 2 +-
 ...chiseled-composite-extra-arm64v8-Dockerfile.approved.txt | 2 +-
 ....0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt | 2 +-
 ...-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt | 2 +-
 ...-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt | 2 +-
 .../runtime-11.0-resolute-amd64-Dockerfile.approved.txt     | 2 +-
 .../runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt   | 2 +-
 .../runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt   | 2 +-
 ...ime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt | 2 +-
 ...e-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt | 2 +-
 ...e-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt | 2 +-
 ....0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt | 2 +-
 ...-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt | 2 +-
 ...-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt | 2 +-
 .../sdk-11.0-resolute-amd64-Dockerfile.approved.txt         | 2 +-
 .../sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt       | 2 +-
 .../sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt       | 2 +-
 55 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/eng/dockerfile-templates/Dockerfile.linux.validate-checksum b/eng/dockerfile-templates/Dockerfile.linux.validate-checksum
index e001932dea..219f27fd01 100644
--- a/eng/dockerfile-templates/Dockerfile.linux.validate-checksum
+++ b/eng/dockerfile-templates/Dockerfile.linux.validate-checksum
@@ -27,9 +27,13 @@
 
     set isAlpine to find(OS_VERSION, "alpine") >= 0 ^
 
+    _ Ubuntu 26.04 (resolute) uses rust-based coreutils (uutils) which has case-sensitive hashsum functions ^
+    set isUUtils to find(OS_VERSION_BASE, "resolute") >= 0 ^
+    set normalizeCaseFn to when(isUUtils, "| tr 'A-F' 'a-f'", "") ^
+
     set shaValue to
         when(ARGS["sha-file"] && ARGS["sha-file-is-bare"],
-            cat("$(cat ", ARGS["sha-file"],")"),
+            cat("$(cat ", ARGS["sha-file"], normalizeCaseFn, ")"),
         when(ARGS["sha-var-name"],
             cat("$", ARGS["sha-var-name"]),
             ARGS["sha"]))
diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile
index 58483d2081..952b98b704 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
index 54d24fde65..b05f3dea18 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
@@ -8,7 +8,7 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile
index ef7ab10f67..73b33a0a17 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile
@@ -8,7 +8,7 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile
index 2556d6fbea..59f7608c9c 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
index 13f225d832..dea4ff37d8 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
@@ -8,7 +8,7 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile
index 8400c4b345..ff7703d444 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile
@@ -8,7 +8,7 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile
index 7c0e12d0be..80ac28833f 100644
--- a/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
index f98635a9ca..a71108af21 100644
--- a/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
@@ -8,7 +8,7 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
index c6159e451e..fbc7480c32 100644
--- a/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
@@ -8,7 +8,7 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile
index d7383cbd2a..34ea70f02d 100644
--- a/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
index c8255bd3b9..16d4edc7c8 100644
--- a/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
@@ -8,7 +8,7 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile
index 3fd8537ff3..c43ea7c1ab 100644
--- a/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile
@@ -8,7 +8,7 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/src/aspnet/11.0/resolute/amd64/Dockerfile b/src/aspnet/11.0/resolute/amd64/Dockerfile
index 8c0cbb9fff..2535689e63 100644
--- a/src/aspnet/11.0/resolute/amd64/Dockerfile
+++ b/src/aspnet/11.0/resolute/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/src/aspnet/11.0/resolute/arm32v7/Dockerfile b/src/aspnet/11.0/resolute/arm32v7/Dockerfile
index 3cf3636cdf..f1539a3bd2 100644
--- a/src/aspnet/11.0/resolute/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute/arm32v7/Dockerfile
@@ -8,7 +8,7 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/src/aspnet/11.0/resolute/arm64v8/Dockerfile b/src/aspnet/11.0/resolute/arm64v8/Dockerfile
index b3fec00d49..19bc2f694d 100644
--- a/src/aspnet/11.0/resolute/arm64v8/Dockerfile
+++ b/src/aspnet/11.0/resolute/arm64v8/Dockerfile
@@ -8,7 +8,7 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile
index b2514638f6..5104e89c24 100644
--- a/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
index adc77e91e4..0cec2657d8 100644
--- a/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
@@ -8,7 +8,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
index 75d907e1b9..9f482ad2b0 100644
--- a/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile
@@ -8,7 +8,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile b/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile
index 5fa3fe8b80..f765e06ac8 100644
--- a/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
index a714a143ae..4928c66e90 100644
--- a/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
@@ -8,7 +8,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile
index c8b0587106..3c3a0fd176 100644
--- a/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile
@@ -8,7 +8,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/src/runtime/11.0/resolute/amd64/Dockerfile b/src/runtime/11.0/resolute/amd64/Dockerfile
index 07b4d70cb4..61c0810152 100644
--- a/src/runtime/11.0/resolute/amd64/Dockerfile
+++ b/src/runtime/11.0/resolute/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \
     && rm \
diff --git a/src/runtime/11.0/resolute/arm32v7/Dockerfile b/src/runtime/11.0/resolute/arm32v7/Dockerfile
index 65c15e9f55..f242be19bd 100644
--- a/src/runtime/11.0/resolute/arm32v7/Dockerfile
+++ b/src/runtime/11.0/resolute/arm32v7/Dockerfile
@@ -8,7 +8,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /dotnet \
     && rm \
diff --git a/src/runtime/11.0/resolute/arm64v8/Dockerfile b/src/runtime/11.0/resolute/arm64v8/Dockerfile
index cdd2ec5d48..854b38b0bd 100644
--- a/src/runtime/11.0/resolute/arm64v8/Dockerfile
+++ b/src/runtime/11.0/resolute/arm64v8/Dockerfile
@@ -8,7 +8,7 @@ RUN dotnet_version=11.0.0-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \
     && rm \
diff --git a/src/sdk/11.0/resolute/amd64/Dockerfile b/src/sdk/11.0/resolute/amd64/Dockerfile
index da145fcd44..53a7a02c40 100644
--- a/src/sdk/11.0/resolute/amd64/Dockerfile
+++ b/src/sdk/11.0/resolute/amd64/Dockerfile
@@ -7,7 +7,7 @@ RUN dotnet_sdk_version=11.0.100-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
     && rm \
diff --git a/src/sdk/11.0/resolute/arm32v7/Dockerfile b/src/sdk/11.0/resolute/arm32v7/Dockerfile
index 6172ef2d39..7c0ce89006 100644
--- a/src/sdk/11.0/resolute/arm32v7/Dockerfile
+++ b/src/sdk/11.0/resolute/arm32v7/Dockerfile
@@ -7,7 +7,7 @@ RUN dotnet_sdk_version=11.0.100-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
     && rm \
diff --git a/src/sdk/11.0/resolute/arm64v8/Dockerfile b/src/sdk/11.0/resolute/arm64v8/Dockerfile
index 79ab5e9735..fab704088a 100644
--- a/src/sdk/11.0/resolute/arm64v8/Dockerfile
+++ b/src/sdk/11.0/resolute/arm64v8/Dockerfile
@@ -7,7 +7,7 @@ RUN dotnet_sdk_version=11.0.100-alpha.1.25609.108 \
     && curl --fail --show-error --location \
         --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
         --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt
index e8cf8f077d..95e1542ef7 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN aspnetcore_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt
index 3b4118b753..a75379b439 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN aspnetcore_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt
index 5381c21e98..db97c2c6a5 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN aspnetcore_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
index 9dbe390877..0bc5f6e7c7 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN aspnetcore_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
index abc6aa433b..86e1657c7d 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN aspnetcore_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
index e65f889e44..11258b5de3 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN aspnetcore_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt
index 2caa7fa260..5b87c84de1 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN aspnetcore_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt
index bae72716d1..1a55510718 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN aspnetcore_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt
index d283d45fb9..6175f132a6 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN aspnetcore_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt
index 62f4aea2ea..e9caafdf3d 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN aspnetcore_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
index ab7a8157b7..676ef3279d 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN aspnetcore_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
index e5b3a244e1..be8f037fff 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN aspnetcore_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
index c6314b6491..f83ae763fc 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN aspnetcore_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
index b6591cacd0..8d1eaf3861 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN aspnetcore_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
index 5520492b76..b5807fce68 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN aspnetcore_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt
index 777f0fb173..ef487ff40e 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN dotnet_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt
index 41fe5e8859..e834df5540 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN dotnet_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /dotnet \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt
index a260a517c4..a769da48c4 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN dotnet_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
index 31c0cfa89c..e6c59471ec 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN dotnet_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
index 77b47244e1..73d0677320 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN dotnet_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
index 6233585970..dedb36674c 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN dotnet_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
index 419caeb65d..0e3f915e43 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN dotnet_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
index 98ed46a118..6e3dd9adad 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN dotnet_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
index 93f9304a9c..d9775a00e2 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt
@@ -10,7 +10,7 @@ RUN dotnet_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /usr/share/dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt
index 9b0b519e2f..e4c89146c0 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt
@@ -9,7 +9,7 @@ RUN dotnet_sdk_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
-    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt
index 60dcf88122..ee47dc3e1c 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt
@@ -9,7 +9,7 @@ RUN dotnet_sdk_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \
-    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
     && rm \
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt
index 092a93018f..e78f70f64f 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt
@@ -9,7 +9,7 @@ RUN dotnet_sdk_version=0.0.0 \
     && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \
         --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
         --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
-    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f')  dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
     && rm \

From e5485928d186a332838492ef9346b7d36139ed6a Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Tue, 16 Dec 2025 13:46:57 -0800
Subject: [PATCH 17/23] Make NotSupportedExceptions clearer in tests

---
 tests/Microsoft.DotNet.Docker.Tests/ImageData.cs         | 2 +-
 tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Microsoft.DotNet.Docker.Tests/ImageData.cs b/tests/Microsoft.DotNet.Docker.Tests/ImageData.cs
index 856bd27a20..8bc193ef8f 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/ImageData.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/ImageData.cs
@@ -162,7 +162,7 @@ protected string GetArchLabel() =>
                 Arch.Amd64 => "amd64",
                 Arch.Arm => "arm32v7",
                 Arch.Arm64 => "arm64v8",
-                _ => throw new NotSupportedException()
+                _ => throw new NotSupportedException($"Unsupported architecture '{Arch}'")
             };
 
         private static string GetRegistryName(string repo, string tag)
diff --git a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
index 616f765062..53af34e787 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
@@ -278,7 +278,7 @@ internal static IEnumerable<string> GetExpectedPackages(ProductImageData imageDa
                     {
                         "base-files"
                     },
-                _ => throw new NotSupportedException()
+                _ => throw new NotSupportedException($"Unsupported distroless OS '{imageData.OS}'")
             };
 
         private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData imageData) {
@@ -340,7 +340,7 @@ private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData image
                         "tzdata",
                         "libstdc++6"
                     ],
-                _ => throw new NotSupportedException()
+                _ => throw new NotSupportedException($"Unknown runtime-deps packages for OS '{imageData.OS}'")
             };
 
             // zlib is not required for .NET 9+

From 1e533895ef9a69276e27519e222f1830c897de76 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Tue, 16 Dec 2025 13:48:31 -0800
Subject: [PATCH 18/23] Add resolute packages

---
 .../ProductImageTests.cs                      | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
index 53af34e787..f8526a9f56 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
@@ -313,6 +313,17 @@ private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData image
                         "openssl",
                         "libstdc++6"
                     ],
+                { OS: OS.ResoluteChiseled } =>
+                    [
+                        "ca-certificates",
+                        "gcc-14-base",
+                        "gcc-14",
+                        "libc6",
+                        "libgcc-s1",
+                        "libssl3t64",
+                        "openssl",
+                        "libstdc++6"
+                    ],
                 { OS: string os } when os.Contains(OS.Noble) =>
                     [
                         "ca-certificates",
@@ -323,6 +334,16 @@ private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData image
                         "openssl",
                         "libstdc++6"
                     ],
+                { OS: string os } when os.Contains(OS.Resolute) =>
+                    [
+                        "ca-certificates",
+                        "gcc-14-base",
+                        "libc6",
+                        "libgcc-s1",
+                        "libssl3t64",
+                        "openssl",
+                        "libstdc++6"
+                    ],
                 { OS: string os } when os.Contains(OS.Alpine) =>
                     [
                         "ca-certificates-bundle",
@@ -372,6 +393,12 @@ private static string GetZLibPackage(string os)
                         "tzdata-legacy",
                         "tzdata"
                     },
+                { OS: OS.ResoluteChiseled } => new[]
+                    {
+                        "libicu76",
+                        "tzdata-legacy",
+                        "tzdata"
+                    },
                 { OS: OS.JammyChiseled } => new[]
                     {
                         "libicu70",

From 1448024430242c04489ca3a88f53c60dfc49d607 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Wed, 17 Dec 2025 10:08:23 -0800
Subject: [PATCH 19/23] Allow zlib in resolute image tests

---
 tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
index f8526a9f56..073c1ca5f3 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
@@ -365,8 +365,12 @@ private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData image
             };
 
             // zlib is not required for .NET 9+
-            // https://github.com/dotnet/dotnet-docker/issues/5687
-            if (imageData.Version.Major == 8)
+            // - https://github.com/dotnet/dotnet-docker/issues/5687
+            // Starting with Ubuntu 25.04 (Plucky), zlib is a dependency of libssl3t64
+            // - https://packages.ubuntu.com/plucky/amd64/libssl3t64
+            // - https://packages.ubuntu.com/resolute/amd64/libssl3t64
+            // - https://github.com/canonical/chisel-releases/blob/ubuntu-26.04/slices/libssl3t64.yaml
+            if (imageData.Version.Major == 8 || imageData.OS.Contains(OS.Resolute))
             {
                 packages = [..packages, GetZLibPackage(imageData.OS)];
             }

From 286941971c9a7d43fc5c8d88028469ac404d379a Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Wed, 17 Dec 2025 10:41:18 -0800
Subject: [PATCH 20/23] Update more package definitions

---
 tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
index 073c1ca5f3..488c29cc50 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
@@ -317,12 +317,13 @@ private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData image
                     [
                         "ca-certificates",
                         "gcc-14-base",
-                        "gcc-14",
                         "libc6",
                         "libgcc-s1",
                         "libssl3t64",
+                        "libstdc++6",
+                        "libzstd1",
                         "openssl",
-                        "libstdc++6"
+                        "zlib"
                     ],
                 { OS: string os } when os.Contains(OS.Noble) =>
                     [
@@ -337,7 +338,7 @@ private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData image
                 { OS: string os } when os.Contains(OS.Resolute) =>
                     [
                         "ca-certificates",
-                        "gcc-14-base",
+                        "gcc-15-base",
                         "libc6",
                         "libgcc-s1",
                         "libssl3t64",
@@ -399,8 +400,8 @@ private static string GetZLibPackage(string os)
                     },
                 { OS: OS.ResoluteChiseled } => new[]
                     {
+                        "icu",
                         "libicu76",
-                        "tzdata-legacy",
                         "tzdata"
                     },
                 { OS: OS.JammyChiseled } => new[]

From c144d2e70e6b669c2240ffcb74bc4ea577cbbe3c Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Wed, 17 Dec 2025 12:03:32 -0800
Subject: [PATCH 21/23] Fix arch-specific package differences

---
 .../ProductImageTests.cs                          | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
index 488c29cc50..79c670a02e 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
@@ -313,6 +313,21 @@ private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData image
                         "openssl",
                         "libstdc++6"
                     ],
+                { OS: OS.ResoluteChiseled, Arch: Arch.Amd64 } =>
+                    [
+                        "ca-certificates",
+                        "gcc-14-base",
+                        "gcc-15",
+                        "libc6",
+                        "libgcc-s1",
+                        "libssl3t64",
+                        "libstdc++6",
+                        "libzstd",
+                        "libzstd1",
+                        "openssl",
+                        "openssl-provider-legacy",
+                        "zlib"
+                    ],
                 { OS: OS.ResoluteChiseled } =>
                     [
                         "ca-certificates",

From 034756a19f0cd1c57accab3990a7584e2024e873 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Wed, 17 Dec 2025 13:17:52 -0800
Subject: [PATCH 22/23] Use jammy installer image for resolute arm32

---
 eng/dockerfile-templates/aspnet/Dockerfile.linux               | 3 ++-
 eng/dockerfile-templates/aspnet/Dockerfile.linux-composite     | 3 ++-
 eng/dockerfile-templates/runtime/Dockerfile.linux              | 3 ++-
 eng/dockerfile-templates/sdk/Dockerfile.linux                  | 3 ++-
 .../11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile  | 2 +-
 src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile | 2 +-
 src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile     | 2 +-
 src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile           | 2 +-
 src/aspnet/11.0/resolute/arm32v7/Dockerfile                    | 2 +-
 src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile    | 2 +-
 src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile          | 2 +-
 src/runtime/11.0/resolute/arm32v7/Dockerfile                   | 2 +-
 src/sdk/11.0/resolute/arm32v7/Dockerfile                       | 2 +-
 13 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.linux b/eng/dockerfile-templates/aspnet/Dockerfile.linux
index ba1d261eaa..a84b5db2e3 100644
--- a/eng/dockerfile-templates/aspnet/Dockerfile.linux
+++ b/eng/dockerfile-templates/aspnet/Dockerfile.linux
@@ -20,7 +20,8 @@
     set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^
 
     _ Workaround for https://bugs.launchpad.net/ubuntu/+source/tar/+bug/2059734. Remove when fixed. ^
-    set osVersionBase to when(ARCH_VERSIONED = "arm32v7" && osVersionBase = "noble", "jammy", osVersionBase) ^
+    set isUbuntu to find(OS_ARCH_HYPHENATED, "Ubuntu") >= 0 ^
+    set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^
 
     set installerImageTag to when(isDistrolessAzureLinux,
         cat("mcr.microsoft.com/"
diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite b/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite
index 03ac2c23e5..1e1b550808 100644
--- a/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite
+++ b/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite
@@ -17,7 +17,8 @@
     set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^
 
     _ Workaround for https://bugs.launchpad.net/ubuntu/+source/tar/+bug/2059734. Remove when fixed. ^
-    set osVersionBase to when(osVersionBase = "noble" && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^
+    set isUbuntu to find(OS_ARCH_HYPHENATED, "Ubuntu") >= 0 ^
+    set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^
 
     set installerImageTag to when(isDistrolessAzureLinux,
         cat("mcr.microsoft.com/",
diff --git a/eng/dockerfile-templates/runtime/Dockerfile.linux b/eng/dockerfile-templates/runtime/Dockerfile.linux
index 319dc58175..5ea2e8a526 100644
--- a/eng/dockerfile-templates/runtime/Dockerfile.linux
+++ b/eng/dockerfile-templates/runtime/Dockerfile.linux
@@ -21,7 +21,8 @@
     set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^
 
     _ Workaround for https://bugs.launchpad.net/ubuntu/+source/tar/+bug/2059734. Remove when fixed. ^
-    set osVersionBase to when(ARCH_VERSIONED = "arm32v7" && osVersionBase = "noble", "jammy", osVersionBase) ^
+    set isUbuntu to find(OS_ARCH_HYPHENATED, "Ubuntu") >= 0 ^
+    set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^
 
     set installerImageTag to when(isDistrolessAzureLinux,
         cat("mcr.microsoft.com/"
diff --git a/eng/dockerfile-templates/sdk/Dockerfile.linux b/eng/dockerfile-templates/sdk/Dockerfile.linux
index f3f338cc84..55c3475bc0 100644
--- a/eng/dockerfile-templates/sdk/Dockerfile.linux
+++ b/eng/dockerfile-templates/sdk/Dockerfile.linux
@@ -9,7 +9,8 @@
     set baseImageTag to cat("$REPO:", tagVersion, "-", OS_VERSION, ARCH_TAG_SUFFIX) ^
 
     _ Workaround for https://bugs.launchpad.net/ubuntu/+source/tar/+bug/2059734. Remove when fixed. ^
-    set osVersionBase to when(ARCH_VERSIONED = "arm32v7" && OS_VERSION_BASE = "noble", "jammy", OS_VERSION_BASE) ^
+    set isUbuntu to find(OS_ARCH_HYPHENATED, "Ubuntu") >= 0 ^
+    set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", OS_VERSION_BASE) ^
 
     set internalInstallerBase to when(isAlpine || isAzureLinux,
         baseImageTag,
diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
index b05f3dea18..c37d6ff116 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
diff --git a/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
index dea4ff37d8..8bc2322f00 100644
--- a/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
 RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
diff --git a/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
index a71108af21..5bacbdc355 100644
--- a/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
diff --git a/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
index 16d4edc7c8..bdcd02a5d1 100644
--- a/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
diff --git a/src/aspnet/11.0/resolute/arm32v7/Dockerfile b/src/aspnet/11.0/resolute/arm32v7/Dockerfile
index f1539a3bd2..3615aab164 100644
--- a/src/aspnet/11.0/resolute/arm32v7/Dockerfile
+++ b/src/aspnet/11.0/resolute/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
 RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
diff --git a/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
index 0cec2657d8..d1e0f865a7 100644
--- a/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
 RUN dotnet_version=11.0.0-alpha.1.25609.108 \
diff --git a/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
index 4928c66e90..86c94ace95 100644
--- a/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
+++ b/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
 RUN dotnet_version=11.0.0-alpha.1.25609.108 \
diff --git a/src/runtime/11.0/resolute/arm32v7/Dockerfile b/src/runtime/11.0/resolute/arm32v7/Dockerfile
index f242be19bd..cdc596ed9d 100644
--- a/src/runtime/11.0/resolute/arm32v7/Dockerfile
+++ b/src/runtime/11.0/resolute/arm32v7/Dockerfile
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
 RUN dotnet_version=11.0.0-alpha.1.25609.108 \
diff --git a/src/sdk/11.0/resolute/arm32v7/Dockerfile b/src/sdk/11.0/resolute/arm32v7/Dockerfile
index 7c0ce89006..6c51a8b902 100644
--- a/src/sdk/11.0/resolute/arm32v7/Dockerfile
+++ b/src/sdk/11.0/resolute/arm32v7/Dockerfile
@@ -1,6 +1,6 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Install .NET SDK
 RUN dotnet_sdk_version=11.0.100-alpha.1.25609.108 \

From 626734cb5e46164cf6ab27ede67db206f8776915 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Thu, 18 Dec 2025 11:39:09 -0800
Subject: [PATCH 23/23] Update baselines

---
 .../aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt        | 2 +-
 ...spnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt | 2 +-
 ...-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt | 2 +-
 ...ute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt | 2 +-
 ...11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt | 2 +-
 .../runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt       | 2 +-
 ...ntime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt | 2 +-
 ...11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt | 2 +-
 .../sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt           | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt
index a75379b439..0905fc0457 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 ARG ACCESSTOKEN
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
index 86e1657c7d..a37f64045f 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 ARG ACCESSTOKEN
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt
index 1a55510718..157701fdfa 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 ARG ACCESSTOKEN
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
index 676ef3279d..28ebae5394 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 ARG ACCESSTOKEN
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
index 8d1eaf3861..1a14adc929 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 ARG ACCESSTOKEN
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt
index e834df5540..18bae7933b 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 ARG ACCESSTOKEN
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
index 73d0677320..555e4d1f18 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 ARG ACCESSTOKEN
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
index 6e3dd9adad..b12db930e7 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt
@@ -1,7 +1,7 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 ARG ACCESSTOKEN
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt
index ee47dc3e1c..ed9910aabf 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt
@@ -1,6 +1,6 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM arm32v7/buildpack-deps:resolute-curl AS installer
+FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 ARG ACCESSTOKEN