From 0afcff50be1fad0eb2e552502118cac6de476512 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Tue, 9 Jun 2026 15:32:05 -0700
Subject: [PATCH 1/2] Add Alpine 3.24 images

Add Alpine 3.24 container images for .NET 8.0, 9.0, 10.0, and 11.0,
mirroring the existing Alpine 3.23 images. Following the precedent set
when Alpine 3.23 was added, the floating `-alpine` tags remain on
Alpine 3.23 for now.

Also apply the .NET 11 AOT SDK package optimization from
dotnet/dotnet-docker#7231, which replaces the heavyweight
build-base/build-essential + clang/llvm toolchain with a minimal
gcc-based toolchain. This is gated to .NET 11 only.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 README.aspnet.md                              |   48 +
 README.runtime-deps.md                        |   24 +
 README.runtime.md                             |   24 +
 README.sdk.md                                 |   16 +
 .../sdk/Dockerfile.linux.aot                  |   94 +-
 .../aspnet-tags.yml                           |   16 +
 .../runtime-deps-tags.yml                     |    8 +
 .../runtime-tags.yml                          |    8 +
 eng/mcr-tags-metadata-templates/sdk-tags.yml  |    6 +
 manifest.json                                 | 2592 ++++++++++++++++-
 manifest.versions.json                        |    1 +
 .../amd64/Dockerfile                          |   29 +
 .../arm32v7/Dockerfile                        |   29 +
 .../arm64v8/Dockerfile                        |   29 +
 .../alpine3.24-composite/amd64/Dockerfile     |   29 +
 .../alpine3.24-composite/arm32v7/Dockerfile   |   29 +
 .../alpine3.24-composite/arm64v8/Dockerfile   |   29 +
 .../10.0/alpine3.24-extra/amd64/Dockerfile    |   25 +
 .../10.0/alpine3.24-extra/arm32v7/Dockerfile  |   25 +
 .../10.0/alpine3.24-extra/arm64v8/Dockerfile  |   25 +
 src/aspnet/10.0/alpine3.24/amd64/Dockerfile   |   25 +
 src/aspnet/10.0/alpine3.24/arm32v7/Dockerfile |   25 +
 src/aspnet/10.0/alpine3.24/arm64v8/Dockerfile |   25 +
 .../amd64/Dockerfile                          |   29 +
 .../arm32v7/Dockerfile                        |   29 +
 .../arm64v8/Dockerfile                        |   29 +
 .../alpine3.24-composite/amd64/Dockerfile     |   29 +
 .../alpine3.24-composite/arm32v7/Dockerfile   |   29 +
 .../alpine3.24-composite/arm64v8/Dockerfile   |   29 +
 .../11.0/alpine3.24-extra/amd64/Dockerfile    |   25 +
 .../11.0/alpine3.24-extra/arm32v7/Dockerfile  |   25 +
 .../11.0/alpine3.24-extra/arm64v8/Dockerfile  |   25 +
 src/aspnet/11.0/alpine3.24/amd64/Dockerfile   |   25 +
 src/aspnet/11.0/alpine3.24/arm32v7/Dockerfile |   25 +
 src/aspnet/11.0/alpine3.24/arm64v8/Dockerfile |   25 +
 .../amd64/Dockerfile                          |   29 +
 .../arm32v7/Dockerfile                        |   29 +
 .../arm64v8/Dockerfile                        |   29 +
 .../8.0/alpine3.24-composite/amd64/Dockerfile |   29 +
 .../alpine3.24-composite/arm32v7/Dockerfile   |   29 +
 .../alpine3.24-composite/arm64v8/Dockerfile   |   29 +
 .../8.0/alpine3.24-extra/amd64/Dockerfile     |   25 +
 .../8.0/alpine3.24-extra/arm32v7/Dockerfile   |   25 +
 .../8.0/alpine3.24-extra/arm64v8/Dockerfile   |   25 +
 src/aspnet/8.0/alpine3.24/amd64/Dockerfile    |   25 +
 src/aspnet/8.0/alpine3.24/arm32v7/Dockerfile  |   25 +
 src/aspnet/8.0/alpine3.24/arm64v8/Dockerfile  |   25 +
 .../amd64/Dockerfile                          |   29 +
 .../arm32v7/Dockerfile                        |   29 +
 .../arm64v8/Dockerfile                        |   29 +
 .../9.0/alpine3.24-composite/amd64/Dockerfile |   29 +
 .../alpine3.24-composite/arm32v7/Dockerfile   |   29 +
 .../alpine3.24-composite/arm64v8/Dockerfile   |   29 +
 .../9.0/alpine3.24-extra/amd64/Dockerfile     |   25 +
 .../9.0/alpine3.24-extra/arm32v7/Dockerfile   |   25 +
 .../9.0/alpine3.24-extra/arm64v8/Dockerfile   |   25 +
 src/aspnet/9.0/alpine3.24/amd64/Dockerfile    |   25 +
 src/aspnet/9.0/alpine3.24/arm32v7/Dockerfile  |   25 +
 src/aspnet/9.0/alpine3.24/arm64v8/Dockerfile  |   25 +
 .../10.0/alpine3.24-extra/amd64/Dockerfile    |   33 +
 .../10.0/alpine3.24-extra/arm32v7/Dockerfile  |   33 +
 .../10.0/alpine3.24-extra/arm64v8/Dockerfile  |   33 +
 .../10.0/alpine3.24/amd64/Dockerfile          |   32 +
 .../10.0/alpine3.24/arm32v7/Dockerfile        |   32 +
 .../10.0/alpine3.24/arm64v8/Dockerfile        |   32 +
 .../11.0/alpine3.24-extra/amd64/Dockerfile    |   33 +
 .../11.0/alpine3.24-extra/arm32v7/Dockerfile  |   33 +
 .../11.0/alpine3.24-extra/arm64v8/Dockerfile  |   33 +
 .../11.0/alpine3.24/amd64/Dockerfile          |   32 +
 .../11.0/alpine3.24/arm32v7/Dockerfile        |   32 +
 .../11.0/alpine3.24/arm64v8/Dockerfile        |   32 +
 .../8.0/alpine3.24-extra/amd64/Dockerfile     |   31 +
 .../8.0/alpine3.24-extra/arm32v7/Dockerfile   |   31 +
 .../8.0/alpine3.24-extra/arm64v8/Dockerfile   |   31 +
 .../8.0/alpine3.24/amd64/Dockerfile           |   30 +
 .../8.0/alpine3.24/arm32v7/Dockerfile         |   30 +
 .../8.0/alpine3.24/arm64v8/Dockerfile         |   30 +
 .../9.0/alpine3.24-extra/amd64/Dockerfile     |   33 +
 .../9.0/alpine3.24-extra/arm32v7/Dockerfile   |   33 +
 .../9.0/alpine3.24-extra/arm64v8/Dockerfile   |   33 +
 .../9.0/alpine3.24/amd64/Dockerfile           |   32 +
 .../9.0/alpine3.24/arm32v7/Dockerfile         |   32 +
 .../9.0/alpine3.24/arm64v8/Dockerfile         |   32 +
 .../10.0/alpine3.24-extra/amd64/Dockerfile    |   27 +
 .../10.0/alpine3.24-extra/arm32v7/Dockerfile  |   27 +
 .../10.0/alpine3.24-extra/arm64v8/Dockerfile  |   27 +
 src/runtime/10.0/alpine3.24/amd64/Dockerfile  |   27 +
 .../10.0/alpine3.24/arm32v7/Dockerfile        |   27 +
 .../10.0/alpine3.24/arm64v8/Dockerfile        |   27 +
 .../11.0/alpine3.24-extra/amd64/Dockerfile    |   27 +
 .../11.0/alpine3.24-extra/arm32v7/Dockerfile  |   27 +
 .../11.0/alpine3.24-extra/arm64v8/Dockerfile  |   27 +
 src/runtime/11.0/alpine3.24/amd64/Dockerfile  |   27 +
 .../11.0/alpine3.24/arm32v7/Dockerfile        |   27 +
 .../11.0/alpine3.24/arm64v8/Dockerfile        |   27 +
 .../8.0/alpine3.24-extra/amd64/Dockerfile     |   27 +
 .../8.0/alpine3.24-extra/arm32v7/Dockerfile   |   27 +
 .../8.0/alpine3.24-extra/arm64v8/Dockerfile   |   27 +
 src/runtime/8.0/alpine3.24/amd64/Dockerfile   |   27 +
 src/runtime/8.0/alpine3.24/arm32v7/Dockerfile |   27 +
 src/runtime/8.0/alpine3.24/arm64v8/Dockerfile |   27 +
 .../9.0/alpine3.24-extra/amd64/Dockerfile     |   27 +
 .../9.0/alpine3.24-extra/arm32v7/Dockerfile   |   27 +
 .../9.0/alpine3.24-extra/arm64v8/Dockerfile   |   27 +
 src/runtime/9.0/alpine3.24/amd64/Dockerfile   |   27 +
 src/runtime/9.0/alpine3.24/arm32v7/Dockerfile |   27 +
 src/runtime/9.0/alpine3.24/arm64v8/Dockerfile |   27 +
 src/sdk/10.0/alpine3.24-aot/amd64/Dockerfile  |    7 +
 .../10.0/alpine3.24-aot/arm64v8/Dockerfile    |    7 +
 src/sdk/10.0/alpine3.24/amd64/Dockerfile      |   68 +
 src/sdk/10.0/alpine3.24/arm32v7/Dockerfile    |   47 +
 src/sdk/10.0/alpine3.24/arm64v8/Dockerfile    |   47 +
 src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile  |    4 +-
 .../11.0/alpine3.23-aot/arm64v8/Dockerfile    |    4 +-
 src/sdk/11.0/alpine3.24-aot/amd64/Dockerfile  |    7 +
 .../11.0/alpine3.24-aot/arm64v8/Dockerfile    |    7 +
 src/sdk/11.0/alpine3.24/amd64/Dockerfile      |   68 +
 src/sdk/11.0/alpine3.24/arm32v7/Dockerfile    |   47 +
 src/sdk/11.0/alpine3.24/arm64v8/Dockerfile    |   47 +
 .../11.0/azurelinux3.0-aot/amd64/Dockerfile   |    5 +-
 .../11.0/azurelinux3.0-aot/arm64v8/Dockerfile |    5 +-
 src/sdk/11.0/resolute-aot/amd64/Dockerfile    |    3 +-
 src/sdk/11.0/resolute-aot/arm64v8/Dockerfile  |    3 +-
 src/sdk/8.0/alpine3.24/amd64/Dockerfile       |   65 +
 src/sdk/8.0/alpine3.24/arm32v7/Dockerfile     |   48 +
 src/sdk/8.0/alpine3.24/arm64v8/Dockerfile     |   48 +
 src/sdk/9.0/alpine3.24/amd64/Dockerfile       |   66 +
 src/sdk/9.0/alpine3.24/arm32v7/Dockerfile     |   49 +
 src/sdk/9.0/alpine3.24/arm64v8/Dockerfile     |   49 +
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   28 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   28 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   28 +
 ...24-composite-amd64-Dockerfile.approved.txt |   32 +
 ...-composite-arm32v7-Dockerfile.approved.txt |   32 +
 ...-composite-arm64v8-Dockerfile.approved.txt |   32 +
 ...posite-extra-amd64-Dockerfile.approved.txt |   32 +
 ...site-extra-arm32v7-Dockerfile.approved.txt |   32 +
 ...site-extra-arm64v8-Dockerfile.approved.txt |   32 +
 ...ne3.24-extra-amd64-Dockerfile.approved.txt |   28 +
 ...3.24-extra-arm32v7-Dockerfile.approved.txt |   28 +
 ...3.24-extra-arm64v8-Dockerfile.approved.txt |   28 +
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   27 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   27 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   27 +
 ...24-composite-amd64-Dockerfile.approved.txt |   31 +
 ...-composite-arm32v7-Dockerfile.approved.txt |   31 +
 ...-composite-arm64v8-Dockerfile.approved.txt |   31 +
 ...posite-extra-amd64-Dockerfile.approved.txt |   31 +
 ...site-extra-arm32v7-Dockerfile.approved.txt |   31 +
 ...site-extra-arm64v8-Dockerfile.approved.txt |   31 +
 ...ne3.24-extra-amd64-Dockerfile.approved.txt |   27 +
 ...3.24-extra-arm32v7-Dockerfile.approved.txt |   27 +
 ...3.24-extra-arm64v8-Dockerfile.approved.txt |   27 +
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   28 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   28 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   28 +
 ...24-composite-amd64-Dockerfile.approved.txt |   32 +
 ...-composite-arm32v7-Dockerfile.approved.txt |   32 +
 ...-composite-arm64v8-Dockerfile.approved.txt |   32 +
 ...posite-extra-amd64-Dockerfile.approved.txt |   32 +
 ...site-extra-arm32v7-Dockerfile.approved.txt |   32 +
 ...site-extra-arm64v8-Dockerfile.approved.txt |   32 +
 ...ne3.24-extra-amd64-Dockerfile.approved.txt |   28 +
 ...3.24-extra-arm32v7-Dockerfile.approved.txt |   28 +
 ...3.24-extra-arm64v8-Dockerfile.approved.txt |   28 +
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   28 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   28 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   28 +
 ...24-composite-amd64-Dockerfile.approved.txt |   32 +
 ...-composite-arm32v7-Dockerfile.approved.txt |   32 +
 ...-composite-arm64v8-Dockerfile.approved.txt |   32 +
 ...posite-extra-amd64-Dockerfile.approved.txt |   32 +
 ...site-extra-arm32v7-Dockerfile.approved.txt |   32 +
 ...site-extra-arm64v8-Dockerfile.approved.txt |   32 +
 ...ne3.24-extra-amd64-Dockerfile.approved.txt |   28 +
 ...3.24-extra-arm32v7-Dockerfile.approved.txt |   28 +
 ...3.24-extra-arm64v8-Dockerfile.approved.txt |   28 +
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   30 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   30 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   30 +
 ...ne3.24-extra-amd64-Dockerfile.approved.txt |   30 +
 ...3.24-extra-arm32v7-Dockerfile.approved.txt |   30 +
 ...3.24-extra-arm64v8-Dockerfile.approved.txt |   30 +
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   29 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   29 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   29 +
 ...ne3.24-extra-amd64-Dockerfile.approved.txt |   29 +
 ...3.24-extra-arm32v7-Dockerfile.approved.txt |   29 +
 ...3.24-extra-arm64v8-Dockerfile.approved.txt |   29 +
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   30 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   30 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   30 +
 ...ne3.24-extra-amd64-Dockerfile.approved.txt |   30 +
 ...3.24-extra-arm32v7-Dockerfile.approved.txt |   30 +
 ...3.24-extra-arm64v8-Dockerfile.approved.txt |   30 +
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   30 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   30 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   30 +
 ...ne3.24-extra-amd64-Dockerfile.approved.txt |   30 +
 ...3.24-extra-arm32v7-Dockerfile.approved.txt |   30 +
 ...3.24-extra-arm64v8-Dockerfile.approved.txt |   30 +
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   32 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   32 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   32 +
 ...ne3.24-extra-amd64-Dockerfile.approved.txt |   33 +
 ...3.24-extra-arm32v7-Dockerfile.approved.txt |   33 +
 ...3.24-extra-arm64v8-Dockerfile.approved.txt |   33 +
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   32 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   32 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   32 +
 ...ne3.24-extra-amd64-Dockerfile.approved.txt |   33 +
 ...3.24-extra-arm32v7-Dockerfile.approved.txt |   33 +
 ...3.24-extra-arm64v8-Dockerfile.approved.txt |   33 +
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   30 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   30 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   30 +
 ...ne3.24-extra-amd64-Dockerfile.approved.txt |   31 +
 ...3.24-extra-arm32v7-Dockerfile.approved.txt |   31 +
 ...3.24-extra-arm64v8-Dockerfile.approved.txt |   31 +
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   32 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   32 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   32 +
 ...ne3.24-extra-amd64-Dockerfile.approved.txt |   33 +
 ...3.24-extra-arm32v7-Dockerfile.approved.txt |   33 +
 ...3.24-extra-arm64v8-Dockerfile.approved.txt |   33 +
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   71 +
 ...pine3.24-aot-amd64-Dockerfile.approved.txt |    7 +
 ...ne3.24-aot-arm64v8-Dockerfile.approved.txt |    7 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   50 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   50 +
 ...pine3.23-aot-amd64-Dockerfile.approved.txt |    4 +-
 ...ne3.23-aot-arm64v8-Dockerfile.approved.txt |    4 +-
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   70 +
 ...pine3.24-aot-amd64-Dockerfile.approved.txt |    7 +
 ...ne3.24-aot-arm64v8-Dockerfile.approved.txt |    7 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   49 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   49 +
 ...linux3.0-aot-amd64-Dockerfile.approved.txt |    5 +-
 ...nux3.0-aot-arm64v8-Dockerfile.approved.txt |    5 +-
 ...resolute-aot-amd64-Dockerfile.approved.txt |    3 +-
 ...solute-aot-arm64v8-Dockerfile.approved.txt |    3 +-
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   67 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   50 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   50 +
 ...0-alpine3.24-amd64-Dockerfile.approved.txt |   68 +
 ...alpine3.24-arm32v7-Dockerfile.approved.txt |   51 +
 ...alpine3.24-arm64v8-Dockerfile.approved.txt |   51 +
 tests/Microsoft.DotNet.Docker.Tests/OS.cs     |    1 +
 .../Microsoft.DotNet.Docker.Tests/TestData.cs |   88 +
 249 files changed, 9831 insertions(+), 146 deletions(-)
 create mode 100644 src/aspnet/10.0/alpine3.24-composite-extra/amd64/Dockerfile
 create mode 100644 src/aspnet/10.0/alpine3.24-composite-extra/arm32v7/Dockerfile
 create mode 100644 src/aspnet/10.0/alpine3.24-composite-extra/arm64v8/Dockerfile
 create mode 100644 src/aspnet/10.0/alpine3.24-composite/amd64/Dockerfile
 create mode 100644 src/aspnet/10.0/alpine3.24-composite/arm32v7/Dockerfile
 create mode 100644 src/aspnet/10.0/alpine3.24-composite/arm64v8/Dockerfile
 create mode 100644 src/aspnet/10.0/alpine3.24-extra/amd64/Dockerfile
 create mode 100644 src/aspnet/10.0/alpine3.24-extra/arm32v7/Dockerfile
 create mode 100644 src/aspnet/10.0/alpine3.24-extra/arm64v8/Dockerfile
 create mode 100644 src/aspnet/10.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/aspnet/10.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/aspnet/10.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.24-composite-extra/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.24-composite-extra/arm32v7/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.24-composite-extra/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.24-composite/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.24-composite/arm32v7/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.24-composite/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.24-extra/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.24-extra/arm32v7/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.24-extra/arm64v8/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/aspnet/11.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 src/aspnet/8.0/alpine3.24-composite-extra/amd64/Dockerfile
 create mode 100644 src/aspnet/8.0/alpine3.24-composite-extra/arm32v7/Dockerfile
 create mode 100644 src/aspnet/8.0/alpine3.24-composite-extra/arm64v8/Dockerfile
 create mode 100644 src/aspnet/8.0/alpine3.24-composite/amd64/Dockerfile
 create mode 100644 src/aspnet/8.0/alpine3.24-composite/arm32v7/Dockerfile
 create mode 100644 src/aspnet/8.0/alpine3.24-composite/arm64v8/Dockerfile
 create mode 100644 src/aspnet/8.0/alpine3.24-extra/amd64/Dockerfile
 create mode 100644 src/aspnet/8.0/alpine3.24-extra/arm32v7/Dockerfile
 create mode 100644 src/aspnet/8.0/alpine3.24-extra/arm64v8/Dockerfile
 create mode 100644 src/aspnet/8.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/aspnet/8.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/aspnet/8.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 src/aspnet/9.0/alpine3.24-composite-extra/amd64/Dockerfile
 create mode 100644 src/aspnet/9.0/alpine3.24-composite-extra/arm32v7/Dockerfile
 create mode 100644 src/aspnet/9.0/alpine3.24-composite-extra/arm64v8/Dockerfile
 create mode 100644 src/aspnet/9.0/alpine3.24-composite/amd64/Dockerfile
 create mode 100644 src/aspnet/9.0/alpine3.24-composite/arm32v7/Dockerfile
 create mode 100644 src/aspnet/9.0/alpine3.24-composite/arm64v8/Dockerfile
 create mode 100644 src/aspnet/9.0/alpine3.24-extra/amd64/Dockerfile
 create mode 100644 src/aspnet/9.0/alpine3.24-extra/arm32v7/Dockerfile
 create mode 100644 src/aspnet/9.0/alpine3.24-extra/arm64v8/Dockerfile
 create mode 100644 src/aspnet/9.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/aspnet/9.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/aspnet/9.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/10.0/alpine3.24-extra/amd64/Dockerfile
 create mode 100644 src/runtime-deps/10.0/alpine3.24-extra/arm32v7/Dockerfile
 create mode 100644 src/runtime-deps/10.0/alpine3.24-extra/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/10.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/runtime-deps/10.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/runtime-deps/10.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.24-extra/amd64/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.24-extra/arm32v7/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.24-extra/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/runtime-deps/11.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/8.0/alpine3.24-extra/amd64/Dockerfile
 create mode 100644 src/runtime-deps/8.0/alpine3.24-extra/arm32v7/Dockerfile
 create mode 100644 src/runtime-deps/8.0/alpine3.24-extra/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/8.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/runtime-deps/8.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/runtime-deps/8.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/9.0/alpine3.24-extra/amd64/Dockerfile
 create mode 100644 src/runtime-deps/9.0/alpine3.24-extra/arm32v7/Dockerfile
 create mode 100644 src/runtime-deps/9.0/alpine3.24-extra/arm64v8/Dockerfile
 create mode 100644 src/runtime-deps/9.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/runtime-deps/9.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/runtime-deps/9.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 src/runtime/10.0/alpine3.24-extra/amd64/Dockerfile
 create mode 100644 src/runtime/10.0/alpine3.24-extra/arm32v7/Dockerfile
 create mode 100644 src/runtime/10.0/alpine3.24-extra/arm64v8/Dockerfile
 create mode 100644 src/runtime/10.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/runtime/10.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/runtime/10.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 src/runtime/11.0/alpine3.24-extra/amd64/Dockerfile
 create mode 100644 src/runtime/11.0/alpine3.24-extra/arm32v7/Dockerfile
 create mode 100644 src/runtime/11.0/alpine3.24-extra/arm64v8/Dockerfile
 create mode 100644 src/runtime/11.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/runtime/11.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/runtime/11.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 src/runtime/8.0/alpine3.24-extra/amd64/Dockerfile
 create mode 100644 src/runtime/8.0/alpine3.24-extra/arm32v7/Dockerfile
 create mode 100644 src/runtime/8.0/alpine3.24-extra/arm64v8/Dockerfile
 create mode 100644 src/runtime/8.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/runtime/8.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/runtime/8.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 src/runtime/9.0/alpine3.24-extra/amd64/Dockerfile
 create mode 100644 src/runtime/9.0/alpine3.24-extra/arm32v7/Dockerfile
 create mode 100644 src/runtime/9.0/alpine3.24-extra/arm64v8/Dockerfile
 create mode 100644 src/runtime/9.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/runtime/9.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/runtime/9.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 src/sdk/10.0/alpine3.24-aot/amd64/Dockerfile
 create mode 100644 src/sdk/10.0/alpine3.24-aot/arm64v8/Dockerfile
 create mode 100644 src/sdk/10.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/sdk/10.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/sdk/10.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 src/sdk/11.0/alpine3.24-aot/amd64/Dockerfile
 create mode 100644 src/sdk/11.0/alpine3.24-aot/arm64v8/Dockerfile
 create mode 100644 src/sdk/11.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/sdk/11.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/sdk/11.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 src/sdk/8.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/sdk/8.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/sdk/8.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 src/sdk/9.0/alpine3.24/amd64/Dockerfile
 create mode 100644 src/sdk/9.0/alpine3.24/arm32v7/Dockerfile
 create mode 100644 src/sdk/9.0/alpine3.24/arm64v8/Dockerfile
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-composite-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-composite-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-composite-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-composite-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-composite-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-composite-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.24-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-aot-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-aot-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-aot-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-aot-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-alpine3.24-amd64-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt
 create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt

diff --git a/README.aspnet.md b/README.aspnet.md
index c0fd09ed57..8c92967bcc 100644
--- a/README.aspnet.md
+++ b/README.aspnet.md
@@ -100,9 +100,13 @@ Tags | Dockerfile | OS Version
 10.0.8-resolute-chiseled-composite-amd64, 10.0-resolute-chiseled-composite-amd64, 10.0.8-resolute-chiseled-composite, 10.0-resolute-chiseled-composite | [Dockerfile](src/aspnet/10.0/resolute-chiseled-composite/amd64/Dockerfile) | Ubuntu 26.04
 10.0.8-resolute-chiseled-composite-extra-amd64, 10.0-resolute-chiseled-composite-extra-amd64, 10.0.8-resolute-chiseled-composite-extra, 10.0-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/10.0/resolute-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 26.04
 10.0.8-alpine3.23-amd64, 10.0-alpine3.23-amd64, 10.0-alpine-amd64, 10.0.8-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/aspnet/10.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-amd64, 10.0-alpine3.24-amd64, 10.0.8-alpine3.24, 10.0-alpine3.24 | [Dockerfile](src/aspnet/10.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 10.0.8-alpine3.23-extra-amd64, 10.0-alpine3.23-extra-amd64, 10.0-alpine-extra-amd64, 10.0.8-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/aspnet/10.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-extra-amd64, 10.0-alpine3.24-extra-amd64, 10.0.8-alpine3.24-extra, 10.0-alpine3.24-extra | [Dockerfile](src/aspnet/10.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
 10.0.8-alpine3.23-composite-amd64, 10.0-alpine3.23-composite-amd64, 10.0.8-alpine3.23-composite, 10.0-alpine3.23-composite | [Dockerfile](src/aspnet/10.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-composite-amd64, 10.0-alpine3.24-composite-amd64, 10.0.8-alpine3.24-composite, 10.0-alpine3.24-composite | [Dockerfile](src/aspnet/10.0/alpine3.24-composite/amd64/Dockerfile) | Alpine 3.24
 10.0.8-alpine3.23-composite-extra-amd64, 10.0-alpine3.23-composite-extra-amd64, 10.0.8-alpine3.23-composite-extra, 10.0-alpine3.23-composite-extra | [Dockerfile](src/aspnet/10.0/alpine3.23-composite-extra/amd64/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-composite-extra-amd64, 10.0-alpine3.24-composite-extra-amd64, 10.0.8-alpine3.24-composite-extra, 10.0-alpine3.24-composite-extra | [Dockerfile](src/aspnet/10.0/alpine3.24-composite-extra/amd64/Dockerfile) | Alpine 3.24
 10.0.8-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.8-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/aspnet/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 10.0.8-azurelinux3.0-distroless-amd64, 10.0-azurelinux3.0-distroless-amd64, 10.0.8-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
 10.0.8-azurelinux3.0-distroless-extra-amd64, 10.0-azurelinux3.0-distroless-extra-amd64, 10.0.8-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
@@ -115,9 +119,13 @@ Tags | Dockerfile | OS Version
 10.0.8-azurelinux4.0-distroless-composite-extra-amd64, 10.0-azurelinux4.0-distroless-composite-extra-amd64, 10.0.8-azurelinux4.0-distroless-composite-extra, 10.0-azurelinux4.0-distroless-composite-extra | [Dockerfile](src/aspnet/10.0/azurelinux4.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 4.0
 9.0.16-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.16-bookworm-slim, 9.0-bookworm-slim, 9.0.16, 9.0 | [Dockerfile](src/aspnet/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12
 9.0.16-alpine3.23-amd64, 9.0-alpine3.23-amd64, 9.0-alpine-amd64, 9.0.16-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/aspnet/9.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-amd64, 9.0-alpine3.24-amd64, 9.0.16-alpine3.24, 9.0-alpine3.24 | [Dockerfile](src/aspnet/9.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 9.0.16-alpine3.23-extra-amd64, 9.0-alpine3.23-extra-amd64, 9.0-alpine-extra-amd64, 9.0.16-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/aspnet/9.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-extra-amd64, 9.0-alpine3.24-extra-amd64, 9.0.16-alpine3.24-extra, 9.0-alpine3.24-extra | [Dockerfile](src/aspnet/9.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
 9.0.16-alpine3.23-composite-amd64, 9.0-alpine3.23-composite-amd64, 9.0.16-alpine3.23-composite, 9.0-alpine3.23-composite | [Dockerfile](src/aspnet/9.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-composite-amd64, 9.0-alpine3.24-composite-amd64, 9.0.16-alpine3.24-composite, 9.0-alpine3.24-composite | [Dockerfile](src/aspnet/9.0/alpine3.24-composite/amd64/Dockerfile) | Alpine 3.24
 9.0.16-alpine3.23-composite-extra-amd64, 9.0-alpine3.23-composite-extra-amd64, 9.0.16-alpine3.23-composite-extra, 9.0-alpine3.23-composite-extra | [Dockerfile](src/aspnet/9.0/alpine3.23-composite-extra/amd64/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-composite-extra-amd64, 9.0-alpine3.24-composite-extra-amd64, 9.0.16-alpine3.24-composite-extra, 9.0-alpine3.24-composite-extra | [Dockerfile](src/aspnet/9.0/alpine3.24-composite-extra/amd64/Dockerfile) | Alpine 3.24
 9.0.16-noble-amd64, 9.0-noble-amd64, 9.0.16-noble, 9.0-noble | [Dockerfile](src/aspnet/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-amd64, 9.0-noble-chiseled-amd64, 9.0.16-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/aspnet/9.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-extra-amd64, 9.0-noble-chiseled-extra-amd64, 9.0.16-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -130,9 +138,13 @@ Tags | Dockerfile | OS Version
 9.0.16-azurelinux3.0-distroless-composite-extra-amd64, 9.0-azurelinux3.0-distroless-composite-extra-amd64, 9.0.16-azurelinux3.0-distroless-composite-extra, 9.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0
 8.0.27-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.27-bookworm-slim, 8.0-bookworm-slim, 8.0.27, 8.0 | [Dockerfile](src/aspnet/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12
 8.0.27-alpine3.23-amd64, 8.0-alpine3.23-amd64, 8.0-alpine-amd64, 8.0.27-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/aspnet/8.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-amd64, 8.0-alpine3.24-amd64, 8.0.27-alpine3.24, 8.0-alpine3.24 | [Dockerfile](src/aspnet/8.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 8.0.27-alpine3.23-extra-amd64, 8.0-alpine3.23-extra-amd64, 8.0-alpine-extra-amd64, 8.0.27-alpine3.23-extra, 8.0-alpine3.23-extra, 8.0-alpine-extra | [Dockerfile](src/aspnet/8.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-extra-amd64, 8.0-alpine3.24-extra-amd64, 8.0.27-alpine3.24-extra, 8.0-alpine3.24-extra | [Dockerfile](src/aspnet/8.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
 8.0.27-alpine3.23-composite-amd64, 8.0-alpine3.23-composite-amd64, 8.0.27-alpine3.23-composite, 8.0-alpine3.23-composite | [Dockerfile](src/aspnet/8.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-composite-amd64, 8.0-alpine3.24-composite-amd64, 8.0.27-alpine3.24-composite, 8.0-alpine3.24-composite | [Dockerfile](src/aspnet/8.0/alpine3.24-composite/amd64/Dockerfile) | Alpine 3.24
 8.0.27-alpine3.23-composite-extra-amd64, 8.0-alpine3.23-composite-extra-amd64, 8.0.27-alpine3.23-composite-extra, 8.0-alpine3.23-composite-extra | [Dockerfile](src/aspnet/8.0/alpine3.23-composite-extra/amd64/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-composite-extra-amd64, 8.0-alpine3.24-composite-extra-amd64, 8.0.27-alpine3.24-composite-extra, 8.0-alpine3.24-composite-extra | [Dockerfile](src/aspnet/8.0/alpine3.24-composite-extra/amd64/Dockerfile) | Alpine 3.24
 8.0.27-noble-amd64, 8.0-noble-amd64, 8.0.27-noble, 8.0-noble | [Dockerfile](src/aspnet/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 8.0.27-noble-chiseled-amd64, 8.0-noble-chiseled-amd64, 8.0.27-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/aspnet/8.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 8.0.27-noble-chiseled-extra-amd64, 8.0-noble-chiseled-extra-amd64, 8.0.27-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/aspnet/8.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -159,9 +171,13 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-chiseled-composite-amd64, 11.0-preview-resolute-chiseled-composite-amd64, 11.0.0-preview.5-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-preview.5-resolute-chiseled-composite-extra-amd64, 11.0-preview-resolute-chiseled-composite-extra-amd64, 11.0.0-preview.5-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-preview.5-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.5-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-preview.5-alpine3.24-amd64, 11.0-preview-alpine3.24-amd64, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/aspnet/11.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.5-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+11.0.0-preview.5-alpine3.24-extra-amd64, 11.0-preview-alpine3.24-extra-amd64, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-alpine3.23-composite-amd64, 11.0-preview-alpine3.23-composite-amd64, 11.0-preview-alpine-composite-amd64, 11.0.0-preview.5-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-preview.5-alpine3.24-composite-amd64, 11.0-preview-alpine3.24-composite-amd64, 11.0.0-preview.5-alpine3.24-composite, 11.0-preview-alpine3.24-composite | [Dockerfile](src/aspnet/11.0/alpine3.24-composite/amd64/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-alpine3.23-composite-extra-amd64, 11.0-preview-alpine3.23-composite-extra-amd64, 11.0-preview-alpine-composite-extra-amd64, 11.0.0-preview.5-alpine3.23-composite-extra, 11.0-preview-alpine3.23-composite-extra, 11.0-preview-alpine-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-composite-extra/amd64/Dockerfile) | Alpine 3.23
+11.0.0-preview.5-alpine3.24-composite-extra-amd64, 11.0-preview-alpine3.24-composite-extra-amd64, 11.0.0-preview.5-alpine3.24-composite-extra, 11.0-preview-alpine3.24-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-composite-extra/amd64/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.5-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 11.0.0-preview.5-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.5-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
@@ -188,9 +204,13 @@ Tags | Dockerfile | OS Version
 10.0.8-resolute-chiseled-composite-arm64v8, 10.0-resolute-chiseled-composite-arm64v8, 10.0.8-resolute-chiseled-composite, 10.0-resolute-chiseled-composite | [Dockerfile](src/aspnet/10.0/resolute-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 26.04
 10.0.8-resolute-chiseled-composite-extra-arm64v8, 10.0-resolute-chiseled-composite-extra-arm64v8, 10.0.8-resolute-chiseled-composite-extra, 10.0-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/10.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 26.04
 10.0.8-alpine3.23-arm64v8, 10.0-alpine3.23-arm64v8, 10.0-alpine-arm64v8, 10.0.8-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/aspnet/10.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-arm64v8, 10.0-alpine3.24-arm64v8, 10.0.8-alpine3.24, 10.0-alpine3.24 | [Dockerfile](src/aspnet/10.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 10.0.8-alpine3.23-extra-arm64v8, 10.0-alpine3.23-extra-arm64v8, 10.0-alpine-extra-arm64v8, 10.0.8-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/aspnet/10.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-extra-arm64v8, 10.0-alpine3.24-extra-arm64v8, 10.0.8-alpine3.24-extra, 10.0-alpine3.24-extra | [Dockerfile](src/aspnet/10.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
 10.0.8-alpine3.23-composite-arm64v8, 10.0-alpine3.23-composite-arm64v8, 10.0.8-alpine3.23-composite, 10.0-alpine3.23-composite | [Dockerfile](src/aspnet/10.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-composite-arm64v8, 10.0-alpine3.24-composite-arm64v8, 10.0.8-alpine3.24-composite, 10.0-alpine3.24-composite | [Dockerfile](src/aspnet/10.0/alpine3.24-composite/arm64v8/Dockerfile) | Alpine 3.24
 10.0.8-alpine3.23-composite-extra-arm64v8, 10.0-alpine3.23-composite-extra-arm64v8, 10.0.8-alpine3.23-composite-extra, 10.0-alpine3.23-composite-extra | [Dockerfile](src/aspnet/10.0/alpine3.23-composite-extra/arm64v8/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-composite-extra-arm64v8, 10.0-alpine3.24-composite-extra-arm64v8, 10.0.8-alpine3.24-composite-extra, 10.0-alpine3.24-composite-extra | [Dockerfile](src/aspnet/10.0/alpine3.24-composite-extra/arm64v8/Dockerfile) | Alpine 3.24
 10.0.8-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.8-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/aspnet/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.8-azurelinux3.0-distroless-arm64v8, 10.0-azurelinux3.0-distroless-arm64v8, 10.0.8-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.8-azurelinux3.0-distroless-extra-arm64v8, 10.0-azurelinux3.0-distroless-extra-arm64v8, 10.0.8-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
@@ -203,9 +223,13 @@ Tags | Dockerfile | OS Version
 10.0.8-azurelinux4.0-distroless-composite-extra-arm64v8, 10.0-azurelinux4.0-distroless-composite-extra-arm64v8, 10.0.8-azurelinux4.0-distroless-composite-extra, 10.0-azurelinux4.0-distroless-composite-extra | [Dockerfile](src/aspnet/10.0/azurelinux4.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 4.0
 9.0.16-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.16-bookworm-slim, 9.0-bookworm-slim, 9.0.16, 9.0 | [Dockerfile](src/aspnet/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
 9.0.16-alpine3.23-arm64v8, 9.0-alpine3.23-arm64v8, 9.0-alpine-arm64v8, 9.0.16-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/aspnet/9.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-arm64v8, 9.0-alpine3.24-arm64v8, 9.0.16-alpine3.24, 9.0-alpine3.24 | [Dockerfile](src/aspnet/9.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 9.0.16-alpine3.23-extra-arm64v8, 9.0-alpine3.23-extra-arm64v8, 9.0-alpine-extra-arm64v8, 9.0.16-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/aspnet/9.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-extra-arm64v8, 9.0-alpine3.24-extra-arm64v8, 9.0.16-alpine3.24-extra, 9.0-alpine3.24-extra | [Dockerfile](src/aspnet/9.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
 9.0.16-alpine3.23-composite-arm64v8, 9.0-alpine3.23-composite-arm64v8, 9.0.16-alpine3.23-composite, 9.0-alpine3.23-composite | [Dockerfile](src/aspnet/9.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-composite-arm64v8, 9.0-alpine3.24-composite-arm64v8, 9.0.16-alpine3.24-composite, 9.0-alpine3.24-composite | [Dockerfile](src/aspnet/9.0/alpine3.24-composite/arm64v8/Dockerfile) | Alpine 3.24
 9.0.16-alpine3.23-composite-extra-arm64v8, 9.0-alpine3.23-composite-extra-arm64v8, 9.0.16-alpine3.23-composite-extra, 9.0-alpine3.23-composite-extra | [Dockerfile](src/aspnet/9.0/alpine3.23-composite-extra/arm64v8/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-composite-extra-arm64v8, 9.0-alpine3.24-composite-extra-arm64v8, 9.0.16-alpine3.24-composite-extra, 9.0-alpine3.24-composite-extra | [Dockerfile](src/aspnet/9.0/alpine3.24-composite-extra/arm64v8/Dockerfile) | Alpine 3.24
 9.0.16-noble-arm64v8, 9.0-noble-arm64v8, 9.0.16-noble, 9.0-noble | [Dockerfile](src/aspnet/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-arm64v8, 9.0-noble-chiseled-arm64v8, 9.0.16-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/aspnet/9.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-extra-arm64v8, 9.0-noble-chiseled-extra-arm64v8, 9.0.16-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -218,9 +242,13 @@ Tags | Dockerfile | OS Version
 9.0.16-azurelinux3.0-distroless-composite-extra-arm64v8, 9.0-azurelinux3.0-distroless-composite-extra-arm64v8, 9.0.16-azurelinux3.0-distroless-composite-extra, 9.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 8.0.27-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.27-bookworm-slim, 8.0-bookworm-slim, 8.0.27, 8.0 | [Dockerfile](src/aspnet/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
 8.0.27-alpine3.23-arm64v8, 8.0-alpine3.23-arm64v8, 8.0-alpine-arm64v8, 8.0.27-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/aspnet/8.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-arm64v8, 8.0-alpine3.24-arm64v8, 8.0.27-alpine3.24, 8.0-alpine3.24 | [Dockerfile](src/aspnet/8.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 8.0.27-alpine3.23-extra-arm64v8, 8.0-alpine3.23-extra-arm64v8, 8.0-alpine-extra-arm64v8, 8.0.27-alpine3.23-extra, 8.0-alpine3.23-extra, 8.0-alpine-extra | [Dockerfile](src/aspnet/8.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-extra-arm64v8, 8.0-alpine3.24-extra-arm64v8, 8.0.27-alpine3.24-extra, 8.0-alpine3.24-extra | [Dockerfile](src/aspnet/8.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
 8.0.27-alpine3.23-composite-arm64v8, 8.0-alpine3.23-composite-arm64v8, 8.0.27-alpine3.23-composite, 8.0-alpine3.23-composite | [Dockerfile](src/aspnet/8.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-composite-arm64v8, 8.0-alpine3.24-composite-arm64v8, 8.0.27-alpine3.24-composite, 8.0-alpine3.24-composite | [Dockerfile](src/aspnet/8.0/alpine3.24-composite/arm64v8/Dockerfile) | Alpine 3.24
 8.0.27-alpine3.23-composite-extra-arm64v8, 8.0-alpine3.23-composite-extra-arm64v8, 8.0.27-alpine3.23-composite-extra, 8.0-alpine3.23-composite-extra | [Dockerfile](src/aspnet/8.0/alpine3.23-composite-extra/arm64v8/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-composite-extra-arm64v8, 8.0-alpine3.24-composite-extra-arm64v8, 8.0.27-alpine3.24-composite-extra, 8.0-alpine3.24-composite-extra | [Dockerfile](src/aspnet/8.0/alpine3.24-composite-extra/arm64v8/Dockerfile) | Alpine 3.24
 8.0.27-noble-arm64v8, 8.0-noble-arm64v8, 8.0.27-noble, 8.0-noble | [Dockerfile](src/aspnet/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 8.0.27-noble-chiseled-arm64v8, 8.0-noble-chiseled-arm64v8, 8.0.27-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/aspnet/8.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 8.0.27-noble-chiseled-extra-arm64v8, 8.0-noble-chiseled-extra-arm64v8, 8.0.27-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/aspnet/8.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -247,9 +275,13 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-chiseled-composite-arm64v8, 11.0-preview-resolute-chiseled-composite-arm64v8, 11.0.0-preview.5-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-preview.5-resolute-chiseled-composite-extra-arm64v8, 11.0-preview-resolute-chiseled-composite-extra-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.24-arm64v8, 11.0-preview-alpine3.24-arm64v8, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/aspnet/11.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.5-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-preview.5-alpine3.24-extra-arm64v8, 11.0-preview-alpine3.24-extra-arm64v8, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-alpine3.23-composite-arm64v8, 11.0-preview-alpine3.23-composite-arm64v8, 11.0-preview-alpine-composite-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.24-composite-arm64v8, 11.0-preview-alpine3.24-composite-arm64v8, 11.0.0-preview.5-alpine3.24-composite, 11.0-preview-alpine3.24-composite | [Dockerfile](src/aspnet/11.0/alpine3.24-composite/arm64v8/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-alpine3.23-composite-extra-arm64v8, 11.0-preview-alpine3.23-composite-extra-arm64v8, 11.0-preview-alpine-composite-extra-arm64v8, 11.0.0-preview.5-alpine3.23-composite-extra, 11.0-preview-alpine3.23-composite-extra, 11.0-preview-alpine-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-composite-extra/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-preview.5-alpine3.24-composite-extra-arm64v8, 11.0-preview-alpine3.24-composite-extra-arm64v8, 11.0.0-preview.5-alpine3.24-composite-extra, 11.0-preview-alpine3.24-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-composite-extra/arm64v8/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.5-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 11.0.0-preview.5-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.5-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
@@ -276,14 +308,22 @@ Tags | Dockerfile | OS Version
 10.0.8-resolute-chiseled-composite-arm32v7, 10.0-resolute-chiseled-composite-arm32v7, 10.0.8-resolute-chiseled-composite, 10.0-resolute-chiseled-composite | [Dockerfile](src/aspnet/10.0/resolute-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 26.04
 10.0.8-resolute-chiseled-composite-extra-arm32v7, 10.0-resolute-chiseled-composite-extra-arm32v7, 10.0.8-resolute-chiseled-composite-extra, 10.0-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/10.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 26.04
 10.0.8-alpine3.23-arm32v7, 10.0-alpine3.23-arm32v7, 10.0-alpine-arm32v7, 10.0.8-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/aspnet/10.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-arm32v7, 10.0-alpine3.24-arm32v7, 10.0.8-alpine3.24, 10.0-alpine3.24 | [Dockerfile](src/aspnet/10.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 10.0.8-alpine3.23-extra-arm32v7, 10.0-alpine3.23-extra-arm32v7, 10.0-alpine-extra-arm32v7, 10.0.8-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/aspnet/10.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-extra-arm32v7, 10.0-alpine3.24-extra-arm32v7, 10.0.8-alpine3.24-extra, 10.0-alpine3.24-extra | [Dockerfile](src/aspnet/10.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
 10.0.8-alpine3.23-composite-arm32v7, 10.0-alpine3.23-composite-arm32v7, 10.0.8-alpine3.23-composite, 10.0-alpine3.23-composite | [Dockerfile](src/aspnet/10.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-composite-arm32v7, 10.0-alpine3.24-composite-arm32v7, 10.0.8-alpine3.24-composite, 10.0-alpine3.24-composite | [Dockerfile](src/aspnet/10.0/alpine3.24-composite/arm32v7/Dockerfile) | Alpine 3.24
 10.0.8-alpine3.23-composite-extra-arm32v7, 10.0-alpine3.23-composite-extra-arm32v7, 10.0.8-alpine3.23-composite-extra, 10.0-alpine3.23-composite-extra | [Dockerfile](src/aspnet/10.0/alpine3.23-composite-extra/arm32v7/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-composite-extra-arm32v7, 10.0-alpine3.24-composite-extra-arm32v7, 10.0.8-alpine3.24-composite-extra, 10.0-alpine3.24-composite-extra | [Dockerfile](src/aspnet/10.0/alpine3.24-composite-extra/arm32v7/Dockerfile) | Alpine 3.24
 9.0.16-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.16-bookworm-slim, 9.0-bookworm-slim, 9.0.16, 9.0 | [Dockerfile](src/aspnet/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
 9.0.16-alpine3.23-arm32v7, 9.0-alpine3.23-arm32v7, 9.0-alpine-arm32v7, 9.0.16-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/aspnet/9.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-arm32v7, 9.0-alpine3.24-arm32v7, 9.0.16-alpine3.24, 9.0-alpine3.24 | [Dockerfile](src/aspnet/9.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 9.0.16-alpine3.23-extra-arm32v7, 9.0-alpine3.23-extra-arm32v7, 9.0-alpine-extra-arm32v7, 9.0.16-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/aspnet/9.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-extra-arm32v7, 9.0-alpine3.24-extra-arm32v7, 9.0.16-alpine3.24-extra, 9.0-alpine3.24-extra | [Dockerfile](src/aspnet/9.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
 9.0.16-alpine3.23-composite-arm32v7, 9.0-alpine3.23-composite-arm32v7, 9.0.16-alpine3.23-composite, 9.0-alpine3.23-composite | [Dockerfile](src/aspnet/9.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-composite-arm32v7, 9.0-alpine3.24-composite-arm32v7, 9.0.16-alpine3.24-composite, 9.0-alpine3.24-composite | [Dockerfile](src/aspnet/9.0/alpine3.24-composite/arm32v7/Dockerfile) | Alpine 3.24
 9.0.16-alpine3.23-composite-extra-arm32v7, 9.0-alpine3.23-composite-extra-arm32v7, 9.0.16-alpine3.23-composite-extra, 9.0-alpine3.23-composite-extra | [Dockerfile](src/aspnet/9.0/alpine3.23-composite-extra/arm32v7/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-composite-extra-arm32v7, 9.0-alpine3.24-composite-extra-arm32v7, 9.0.16-alpine3.24-composite-extra, 9.0-alpine3.24-composite-extra | [Dockerfile](src/aspnet/9.0/alpine3.24-composite-extra/arm32v7/Dockerfile) | Alpine 3.24
 9.0.16-noble-arm32v7, 9.0-noble-arm32v7, 9.0.16-noble, 9.0-noble | [Dockerfile](src/aspnet/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-arm32v7, 9.0-noble-chiseled-arm32v7, 9.0.16-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/aspnet/9.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-extra-arm32v7, 9.0-noble-chiseled-extra-arm32v7, 9.0.16-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
@@ -291,9 +331,13 @@ Tags | Dockerfile | OS Version
 9.0.16-noble-chiseled-composite-extra-arm32v7, 9.0-noble-chiseled-composite-extra-arm32v7, 9.0.16-noble-chiseled-composite-extra, 9.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 24.04
 8.0.27-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.27-bookworm-slim, 8.0-bookworm-slim, 8.0.27, 8.0 | [Dockerfile](src/aspnet/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
 8.0.27-alpine3.23-arm32v7, 8.0-alpine3.23-arm32v7, 8.0-alpine-arm32v7, 8.0.27-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/aspnet/8.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-arm32v7, 8.0-alpine3.24-arm32v7, 8.0.27-alpine3.24, 8.0-alpine3.24 | [Dockerfile](src/aspnet/8.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 8.0.27-alpine3.23-extra-arm32v7, 8.0-alpine3.23-extra-arm32v7, 8.0-alpine-extra-arm32v7, 8.0.27-alpine3.23-extra, 8.0-alpine3.23-extra, 8.0-alpine-extra | [Dockerfile](src/aspnet/8.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-extra-arm32v7, 8.0-alpine3.24-extra-arm32v7, 8.0.27-alpine3.24-extra, 8.0-alpine3.24-extra | [Dockerfile](src/aspnet/8.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
 8.0.27-alpine3.23-composite-arm32v7, 8.0-alpine3.23-composite-arm32v7, 8.0.27-alpine3.23-composite, 8.0-alpine3.23-composite | [Dockerfile](src/aspnet/8.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-composite-arm32v7, 8.0-alpine3.24-composite-arm32v7, 8.0.27-alpine3.24-composite, 8.0-alpine3.24-composite | [Dockerfile](src/aspnet/8.0/alpine3.24-composite/arm32v7/Dockerfile) | Alpine 3.24
 8.0.27-alpine3.23-composite-extra-arm32v7, 8.0-alpine3.23-composite-extra-arm32v7, 8.0.27-alpine3.23-composite-extra, 8.0-alpine3.23-composite-extra | [Dockerfile](src/aspnet/8.0/alpine3.23-composite-extra/arm32v7/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-composite-extra-arm32v7, 8.0-alpine3.24-composite-extra-arm32v7, 8.0.27-alpine3.24-composite-extra, 8.0-alpine3.24-composite-extra | [Dockerfile](src/aspnet/8.0/alpine3.24-composite-extra/arm32v7/Dockerfile) | Alpine 3.24
 8.0.27-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.27-jammy, 8.0-jammy | [Dockerfile](src/aspnet/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
 8.0.27-jammy-chiseled-arm32v7, 8.0-jammy-chiseled-arm32v7, 8.0.27-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/aspnet/8.0/jammy-chiseled/arm32v7/Dockerfile) | Ubuntu 22.04
 8.0.27-jammy-chiseled-extra-arm32v7, 8.0-jammy-chiseled-extra-arm32v7, 8.0.27-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/aspnet/8.0/jammy-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 22.04
@@ -310,9 +354,13 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-chiseled-composite-arm32v7, 11.0-preview-resolute-chiseled-composite-arm32v7, 11.0.0-preview.5-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-preview.5-resolute-chiseled-composite-extra-arm32v7, 11.0-preview-resolute-chiseled-composite-extra-arm32v7, 11.0.0-preview.5-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-preview.5-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.5-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-preview.5-alpine3.24-arm32v7, 11.0-preview-alpine3.24-arm32v7, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/aspnet/11.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.5-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-preview.5-alpine3.24-extra-arm32v7, 11.0-preview-alpine3.24-extra-arm32v7, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-alpine3.23-composite-arm32v7, 11.0-preview-alpine3.23-composite-arm32v7, 11.0-preview-alpine-composite-arm32v7, 11.0.0-preview.5-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
+11.0.0-preview.5-alpine3.24-composite-arm32v7, 11.0-preview-alpine3.24-composite-arm32v7, 11.0.0-preview.5-alpine3.24-composite, 11.0-preview-alpine3.24-composite | [Dockerfile](src/aspnet/11.0/alpine3.24-composite/arm32v7/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-alpine3.23-composite-extra-arm32v7, 11.0-preview-alpine3.23-composite-extra-arm32v7, 11.0-preview-alpine-composite-extra-arm32v7, 11.0.0-preview.5-alpine3.23-composite-extra, 11.0-preview-alpine3.23-composite-extra, 11.0-preview-alpine-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-composite-extra/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-preview.5-alpine3.24-composite-extra-arm32v7, 11.0-preview-alpine3.24-composite-extra-arm32v7, 11.0.0-preview.5-alpine3.24-composite-extra, 11.0-preview-alpine3.24-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-composite-extra/arm32v7/Dockerfile) | Alpine 3.24
 
 ### Windows amd64 Tags
 
diff --git a/README.runtime-deps.md b/README.runtime-deps.md
index d92af69421..f029ca08c7 100644
--- a/README.runtime-deps.md
+++ b/README.runtime-deps.md
@@ -78,7 +78,9 @@ Tags | Dockerfile | OS Version
 10.0.8-resolute-chiseled-amd64, 10.0-resolute-chiseled-amd64, 10.0.8-resolute-chiseled, 10.0-resolute-chiseled | [Dockerfile](src/runtime-deps/10.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04
 10.0.8-resolute-chiseled-extra-amd64, 10.0-resolute-chiseled-extra-amd64, 10.0.8-resolute-chiseled-extra, 10.0-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 26.04
 10.0.8-alpine3.23-amd64, 10.0-alpine3.23-amd64, 10.0-alpine-amd64, 10.0.8-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-amd64, 10.0-alpine3.24-amd64, 10.0.8-alpine3.24, 10.0-alpine3.24 | [Dockerfile](src/runtime-deps/10.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 10.0.8-alpine3.23-extra-amd64, 10.0-alpine3.23-extra-amd64, 10.0-alpine-extra-amd64, 10.0.8-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-extra-amd64, 10.0-alpine3.24-extra-amd64, 10.0.8-alpine3.24-extra, 10.0-alpine3.24-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
 10.0.8-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.8-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 10.0.8-azurelinux3.0-distroless-amd64, 10.0-azurelinux3.0-distroless-amd64, 10.0.8-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
 10.0.8-azurelinux3.0-distroless-extra-amd64, 10.0-azurelinux3.0-distroless-extra-amd64, 10.0.8-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
@@ -87,7 +89,9 @@ Tags | Dockerfile | OS Version
 10.0.8-azurelinux4.0-distroless-extra-amd64, 10.0-azurelinux4.0-distroless-extra-amd64, 10.0.8-azurelinux4.0-distroless-extra, 10.0-azurelinux4.0-distroless-extra | [Dockerfile](src/runtime-deps/10.0/azurelinux4.0-distroless-extra/amd64/Dockerfile) | Azure Linux 4.0
 9.0.16-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.16-bookworm-slim, 9.0-bookworm-slim, 9.0.16, 9.0 | [Dockerfile](src/runtime-deps/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12
 9.0.16-alpine3.23-amd64, 9.0-alpine3.23-amd64, 9.0-alpine-amd64, 9.0.16-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/runtime-deps/9.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-amd64, 9.0-alpine3.24-amd64, 9.0.16-alpine3.24, 9.0-alpine3.24 | [Dockerfile](src/runtime-deps/9.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 9.0.16-alpine3.23-extra-amd64, 9.0-alpine3.23-extra-amd64, 9.0-alpine-extra-amd64, 9.0.16-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-extra-amd64, 9.0-alpine3.24-extra-amd64, 9.0.16-alpine3.24-extra, 9.0-alpine3.24-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
 9.0.16-noble-amd64, 9.0-noble-amd64, 9.0.16-noble, 9.0-noble | [Dockerfile](src/runtime-deps/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-amd64, 9.0-noble-chiseled-amd64, 9.0.16-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime-deps/9.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-extra-amd64, 9.0-noble-chiseled-extra-amd64, 9.0.16-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -96,7 +100,9 @@ Tags | Dockerfile | OS Version
 9.0.16-azurelinux3.0-distroless-extra-amd64, 9.0-azurelinux3.0-distroless-extra-amd64, 9.0.16-azurelinux3.0-distroless-extra, 9.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
 8.0.27-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.27-bookworm-slim, 8.0-bookworm-slim, 8.0.27, 8.0 | [Dockerfile](src/runtime-deps/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12
 8.0.27-alpine3.23-amd64, 8.0-alpine3.23-amd64, 8.0-alpine-amd64, 8.0.27-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/runtime-deps/8.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-amd64, 8.0-alpine3.24-amd64, 8.0.27-alpine3.24, 8.0-alpine3.24 | [Dockerfile](src/runtime-deps/8.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 8.0.27-alpine3.23-extra-amd64, 8.0-alpine3.23-extra-amd64, 8.0-alpine-extra-amd64, 8.0.27-alpine3.23-extra, 8.0-alpine3.23-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-extra-amd64, 8.0-alpine3.24-extra-amd64, 8.0.27-alpine3.24-extra, 8.0-alpine3.24-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
 8.0.27-noble-amd64, 8.0-noble-amd64, 8.0.27-noble, 8.0-noble | [Dockerfile](src/runtime-deps/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 8.0.27-noble-chiseled-amd64, 8.0-noble-chiseled-amd64, 8.0.27-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/runtime-deps/8.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 8.0.27-noble-chiseled-extra-amd64, 8.0-noble-chiseled-extra-amd64, 8.0.27-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -115,7 +121,9 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-preview.5-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-preview.5-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-preview.5-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.5-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-preview.5-alpine3.24-amd64, 11.0-preview-alpine3.24-amd64, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/runtime-deps/11.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.5-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-preview.5-alpine3.24-extra-amd64, 11.0-preview-alpine3.24-extra-amd64, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.5-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
@@ -134,7 +142,9 @@ Tags | Dockerfile | OS Version
 10.0.8-resolute-chiseled-arm64v8, 10.0-resolute-chiseled-arm64v8, 10.0.8-resolute-chiseled, 10.0-resolute-chiseled | [Dockerfile](src/runtime-deps/10.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04
 10.0.8-resolute-chiseled-extra-arm64v8, 10.0-resolute-chiseled-extra-arm64v8, 10.0.8-resolute-chiseled-extra, 10.0-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 26.04
 10.0.8-alpine3.23-arm64v8, 10.0-alpine3.23-arm64v8, 10.0-alpine-arm64v8, 10.0.8-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-arm64v8, 10.0-alpine3.24-arm64v8, 10.0.8-alpine3.24, 10.0-alpine3.24 | [Dockerfile](src/runtime-deps/10.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 10.0.8-alpine3.23-extra-arm64v8, 10.0-alpine3.23-extra-arm64v8, 10.0-alpine-extra-arm64v8, 10.0.8-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-extra-arm64v8, 10.0-alpine3.24-extra-arm64v8, 10.0.8-alpine3.24-extra, 10.0-alpine3.24-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
 10.0.8-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.8-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.8-azurelinux3.0-distroless-arm64v8, 10.0-azurelinux3.0-distroless-arm64v8, 10.0.8-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.8-azurelinux3.0-distroless-extra-arm64v8, 10.0-azurelinux3.0-distroless-extra-arm64v8, 10.0.8-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
@@ -143,7 +153,9 @@ Tags | Dockerfile | OS Version
 10.0.8-azurelinux4.0-distroless-extra-arm64v8, 10.0-azurelinux4.0-distroless-extra-arm64v8, 10.0.8-azurelinux4.0-distroless-extra, 10.0-azurelinux4.0-distroless-extra | [Dockerfile](src/runtime-deps/10.0/azurelinux4.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 4.0
 9.0.16-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.16-bookworm-slim, 9.0-bookworm-slim, 9.0.16, 9.0 | [Dockerfile](src/runtime-deps/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
 9.0.16-alpine3.23-arm64v8, 9.0-alpine3.23-arm64v8, 9.0-alpine-arm64v8, 9.0.16-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/runtime-deps/9.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-arm64v8, 9.0-alpine3.24-arm64v8, 9.0.16-alpine3.24, 9.0-alpine3.24 | [Dockerfile](src/runtime-deps/9.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 9.0.16-alpine3.23-extra-arm64v8, 9.0-alpine3.23-extra-arm64v8, 9.0-alpine-extra-arm64v8, 9.0.16-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-extra-arm64v8, 9.0-alpine3.24-extra-arm64v8, 9.0.16-alpine3.24-extra, 9.0-alpine3.24-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
 9.0.16-noble-arm64v8, 9.0-noble-arm64v8, 9.0.16-noble, 9.0-noble | [Dockerfile](src/runtime-deps/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-arm64v8, 9.0-noble-chiseled-arm64v8, 9.0.16-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime-deps/9.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-extra-arm64v8, 9.0-noble-chiseled-extra-arm64v8, 9.0.16-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -152,7 +164,9 @@ Tags | Dockerfile | OS Version
 9.0.16-azurelinux3.0-distroless-extra-arm64v8, 9.0-azurelinux3.0-distroless-extra-arm64v8, 9.0.16-azurelinux3.0-distroless-extra, 9.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 8.0.27-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.27-bookworm-slim, 8.0-bookworm-slim, 8.0.27, 8.0 | [Dockerfile](src/runtime-deps/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
 8.0.27-alpine3.23-arm64v8, 8.0-alpine3.23-arm64v8, 8.0-alpine-arm64v8, 8.0.27-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/runtime-deps/8.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-arm64v8, 8.0-alpine3.24-arm64v8, 8.0.27-alpine3.24, 8.0-alpine3.24 | [Dockerfile](src/runtime-deps/8.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 8.0.27-alpine3.23-extra-arm64v8, 8.0-alpine3.23-extra-arm64v8, 8.0-alpine-extra-arm64v8, 8.0.27-alpine3.23-extra, 8.0-alpine3.23-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-extra-arm64v8, 8.0-alpine3.24-extra-arm64v8, 8.0.27-alpine3.24-extra, 8.0-alpine3.24-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
 8.0.27-noble-arm64v8, 8.0-noble-arm64v8, 8.0.27-noble, 8.0-noble | [Dockerfile](src/runtime-deps/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 8.0.27-noble-chiseled-arm64v8, 8.0-noble-chiseled-arm64v8, 8.0.27-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/runtime-deps/8.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 8.0.27-noble-chiseled-extra-arm64v8, 8.0-noble-chiseled-extra-arm64v8, 8.0.27-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -171,7 +185,9 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-preview.5-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.24-arm64v8, 11.0-preview-alpine3.24-arm64v8, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/runtime-deps/11.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.24-extra-arm64v8, 11.0-preview-alpine3.24-extra-arm64v8, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.5-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
@@ -190,16 +206,22 @@ Tags | Dockerfile | OS Version
 10.0.8-resolute-chiseled-arm32v7, 10.0-resolute-chiseled-arm32v7, 10.0.8-resolute-chiseled, 10.0-resolute-chiseled | [Dockerfile](src/runtime-deps/10.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04
 10.0.8-resolute-chiseled-extra-arm32v7, 10.0-resolute-chiseled-extra-arm32v7, 10.0.8-resolute-chiseled-extra, 10.0-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 26.04
 10.0.8-alpine3.23-arm32v7, 10.0-alpine3.23-arm32v7, 10.0-alpine-arm32v7, 10.0.8-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-arm32v7, 10.0-alpine3.24-arm32v7, 10.0.8-alpine3.24, 10.0-alpine3.24 | [Dockerfile](src/runtime-deps/10.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 10.0.8-alpine3.23-extra-arm32v7, 10.0-alpine3.23-extra-arm32v7, 10.0-alpine-extra-arm32v7, 10.0.8-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-extra-arm32v7, 10.0-alpine3.24-extra-arm32v7, 10.0.8-alpine3.24-extra, 10.0-alpine3.24-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
 9.0.16-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.16-bookworm-slim, 9.0-bookworm-slim, 9.0.16, 9.0 | [Dockerfile](src/runtime-deps/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
 9.0.16-alpine3.23-arm32v7, 9.0-alpine3.23-arm32v7, 9.0-alpine-arm32v7, 9.0.16-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/runtime-deps/9.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-arm32v7, 9.0-alpine3.24-arm32v7, 9.0.16-alpine3.24, 9.0-alpine3.24 | [Dockerfile](src/runtime-deps/9.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 9.0.16-alpine3.23-extra-arm32v7, 9.0-alpine3.23-extra-arm32v7, 9.0-alpine-extra-arm32v7, 9.0.16-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-extra-arm32v7, 9.0-alpine3.24-extra-arm32v7, 9.0.16-alpine3.24-extra, 9.0-alpine3.24-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
 9.0.16-noble-arm32v7, 9.0-noble-arm32v7, 9.0.16-noble, 9.0-noble | [Dockerfile](src/runtime-deps/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-arm32v7, 9.0-noble-chiseled-arm32v7, 9.0.16-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-extra-arm32v7, 9.0-noble-chiseled-extra-arm32v7, 9.0.16-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
 8.0.27-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.27-bookworm-slim, 8.0-bookworm-slim, 8.0.27, 8.0 | [Dockerfile](src/runtime-deps/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
 8.0.27-alpine3.23-arm32v7, 8.0-alpine3.23-arm32v7, 8.0-alpine-arm32v7, 8.0.27-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/runtime-deps/8.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-arm32v7, 8.0-alpine3.24-arm32v7, 8.0.27-alpine3.24, 8.0-alpine3.24 | [Dockerfile](src/runtime-deps/8.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 8.0.27-alpine3.23-extra-arm32v7, 8.0-alpine3.23-extra-arm32v7, 8.0-alpine-extra-arm32v7, 8.0.27-alpine3.23-extra, 8.0-alpine3.23-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-extra-arm32v7, 8.0-alpine3.24-extra-arm32v7, 8.0.27-alpine3.24-extra, 8.0-alpine3.24-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
 8.0.27-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.27-jammy, 8.0-jammy | [Dockerfile](src/runtime-deps/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
 8.0.27-jammy-chiseled-arm32v7, 8.0-jammy-chiseled-arm32v7, 8.0.27-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile) | Ubuntu 22.04
 8.0.27-jammy-chiseled-extra-arm32v7, 8.0-jammy-chiseled-extra-arm32v7, 8.0.27-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 22.04
@@ -212,7 +234,9 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-preview.5-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-preview.5-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-preview.5-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.5-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-preview.5-alpine3.24-arm32v7, 11.0-preview-alpine3.24-arm32v7, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/runtime-deps/11.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.5-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
+11.0.0-preview.5-alpine3.24-extra-arm32v7, 11.0-preview-alpine3.24-extra-arm32v7, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
 
 <!--End of generated tags-->
 
diff --git a/README.runtime.md b/README.runtime.md
index 65d06d8c93..28d8a1cd71 100644
--- a/README.runtime.md
+++ b/README.runtime.md
@@ -85,7 +85,9 @@ Tags | Dockerfile | OS Version
 10.0.8-resolute-chiseled-amd64, 10.0-resolute-chiseled-amd64, 10.0.8-resolute-chiseled, 10.0-resolute-chiseled | [Dockerfile](src/runtime/10.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04
 10.0.8-resolute-chiseled-extra-amd64, 10.0-resolute-chiseled-extra-amd64, 10.0.8-resolute-chiseled-extra, 10.0-resolute-chiseled-extra | [Dockerfile](src/runtime/10.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 26.04
 10.0.8-alpine3.23-amd64, 10.0-alpine3.23-amd64, 10.0-alpine-amd64, 10.0.8-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-amd64, 10.0-alpine3.24-amd64, 10.0.8-alpine3.24, 10.0-alpine3.24 | [Dockerfile](src/runtime/10.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 10.0.8-alpine3.23-extra-amd64, 10.0-alpine3.23-extra-amd64, 10.0-alpine-extra-amd64, 10.0.8-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/runtime/10.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-extra-amd64, 10.0-alpine3.24-extra-amd64, 10.0.8-alpine3.24-extra, 10.0-alpine3.24-extra | [Dockerfile](src/runtime/10.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
 10.0.8-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.8-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 10.0.8-azurelinux3.0-distroless-amd64, 10.0-azurelinux3.0-distroless-amd64, 10.0.8-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
 10.0.8-azurelinux3.0-distroless-extra-amd64, 10.0-azurelinux3.0-distroless-extra-amd64, 10.0.8-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
@@ -94,7 +96,9 @@ Tags | Dockerfile | OS Version
 10.0.8-azurelinux4.0-distroless-extra-amd64, 10.0-azurelinux4.0-distroless-extra-amd64, 10.0.8-azurelinux4.0-distroless-extra, 10.0-azurelinux4.0-distroless-extra | [Dockerfile](src/runtime/10.0/azurelinux4.0-distroless-extra/amd64/Dockerfile) | Azure Linux 4.0
 9.0.16-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.16-bookworm-slim, 9.0-bookworm-slim, 9.0.16, 9.0 | [Dockerfile](src/runtime/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12
 9.0.16-alpine3.23-amd64, 9.0-alpine3.23-amd64, 9.0-alpine-amd64, 9.0.16-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/runtime/9.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-amd64, 9.0-alpine3.24-amd64, 9.0.16-alpine3.24, 9.0-alpine3.24 | [Dockerfile](src/runtime/9.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 9.0.16-alpine3.23-extra-amd64, 9.0-alpine3.23-extra-amd64, 9.0-alpine-extra-amd64, 9.0.16-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/runtime/9.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-extra-amd64, 9.0-alpine3.24-extra-amd64, 9.0.16-alpine3.24-extra, 9.0-alpine3.24-extra | [Dockerfile](src/runtime/9.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
 9.0.16-noble-amd64, 9.0-noble-amd64, 9.0.16-noble, 9.0-noble | [Dockerfile](src/runtime/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-amd64, 9.0-noble-chiseled-amd64, 9.0.16-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime/9.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-extra-amd64, 9.0-noble-chiseled-extra-amd64, 9.0.16-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime/9.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -103,7 +107,9 @@ Tags | Dockerfile | OS Version
 9.0.16-azurelinux3.0-distroless-extra-amd64, 9.0-azurelinux3.0-distroless-extra-amd64, 9.0.16-azurelinux3.0-distroless-extra, 9.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
 8.0.27-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.27-bookworm-slim, 8.0-bookworm-slim, 8.0.27, 8.0 | [Dockerfile](src/runtime/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12
 8.0.27-alpine3.23-amd64, 8.0-alpine3.23-amd64, 8.0-alpine-amd64, 8.0.27-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/runtime/8.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-amd64, 8.0-alpine3.24-amd64, 8.0.27-alpine3.24, 8.0-alpine3.24 | [Dockerfile](src/runtime/8.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 8.0.27-alpine3.23-extra-amd64, 8.0-alpine3.23-extra-amd64, 8.0-alpine-extra-amd64, 8.0.27-alpine3.23-extra, 8.0-alpine3.23-extra, 8.0-alpine-extra | [Dockerfile](src/runtime/8.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-extra-amd64, 8.0-alpine3.24-extra-amd64, 8.0.27-alpine3.24-extra, 8.0-alpine3.24-extra | [Dockerfile](src/runtime/8.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
 8.0.27-noble-amd64, 8.0-noble-amd64, 8.0.27-noble, 8.0-noble | [Dockerfile](src/runtime/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 8.0.27-noble-chiseled-amd64, 8.0-noble-chiseled-amd64, 8.0.27-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/runtime/8.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 8.0.27-noble-chiseled-extra-amd64, 8.0-noble-chiseled-extra-amd64, 8.0.27-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/runtime/8.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -122,7 +128,9 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-preview.5-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-preview.5-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-preview.5-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.5-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-preview.5-alpine3.24-amd64, 11.0-preview-alpine3.24-amd64, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/runtime/11.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.5-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+11.0.0-preview.5-alpine3.24-extra-amd64, 11.0-preview-alpine3.24-extra-amd64, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/runtime/11.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.5-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 11.0.0-preview.5-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.5-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
@@ -141,7 +149,9 @@ Tags | Dockerfile | OS Version
 10.0.8-resolute-chiseled-arm64v8, 10.0-resolute-chiseled-arm64v8, 10.0.8-resolute-chiseled, 10.0-resolute-chiseled | [Dockerfile](src/runtime/10.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04
 10.0.8-resolute-chiseled-extra-arm64v8, 10.0-resolute-chiseled-extra-arm64v8, 10.0.8-resolute-chiseled-extra, 10.0-resolute-chiseled-extra | [Dockerfile](src/runtime/10.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 26.04
 10.0.8-alpine3.23-arm64v8, 10.0-alpine3.23-arm64v8, 10.0-alpine-arm64v8, 10.0.8-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-arm64v8, 10.0-alpine3.24-arm64v8, 10.0.8-alpine3.24, 10.0-alpine3.24 | [Dockerfile](src/runtime/10.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 10.0.8-alpine3.23-extra-arm64v8, 10.0-alpine3.23-extra-arm64v8, 10.0-alpine-extra-arm64v8, 10.0.8-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/runtime/10.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-extra-arm64v8, 10.0-alpine3.24-extra-arm64v8, 10.0.8-alpine3.24-extra, 10.0-alpine3.24-extra | [Dockerfile](src/runtime/10.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
 10.0.8-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.8-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.8-azurelinux3.0-distroless-arm64v8, 10.0-azurelinux3.0-distroless-arm64v8, 10.0.8-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.8-azurelinux3.0-distroless-extra-arm64v8, 10.0-azurelinux3.0-distroless-extra-arm64v8, 10.0.8-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
@@ -150,7 +160,9 @@ Tags | Dockerfile | OS Version
 10.0.8-azurelinux4.0-distroless-extra-arm64v8, 10.0-azurelinux4.0-distroless-extra-arm64v8, 10.0.8-azurelinux4.0-distroless-extra, 10.0-azurelinux4.0-distroless-extra | [Dockerfile](src/runtime/10.0/azurelinux4.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 4.0
 9.0.16-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.16-bookworm-slim, 9.0-bookworm-slim, 9.0.16, 9.0 | [Dockerfile](src/runtime/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
 9.0.16-alpine3.23-arm64v8, 9.0-alpine3.23-arm64v8, 9.0-alpine-arm64v8, 9.0.16-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/runtime/9.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-arm64v8, 9.0-alpine3.24-arm64v8, 9.0.16-alpine3.24, 9.0-alpine3.24 | [Dockerfile](src/runtime/9.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 9.0.16-alpine3.23-extra-arm64v8, 9.0-alpine3.23-extra-arm64v8, 9.0-alpine-extra-arm64v8, 9.0.16-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/runtime/9.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-extra-arm64v8, 9.0-alpine3.24-extra-arm64v8, 9.0.16-alpine3.24-extra, 9.0-alpine3.24-extra | [Dockerfile](src/runtime/9.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
 9.0.16-noble-arm64v8, 9.0-noble-arm64v8, 9.0.16-noble, 9.0-noble | [Dockerfile](src/runtime/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-arm64v8, 9.0-noble-chiseled-arm64v8, 9.0.16-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime/9.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-extra-arm64v8, 9.0-noble-chiseled-extra-arm64v8, 9.0.16-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime/9.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -159,7 +171,9 @@ Tags | Dockerfile | OS Version
 9.0.16-azurelinux3.0-distroless-extra-arm64v8, 9.0-azurelinux3.0-distroless-extra-arm64v8, 9.0.16-azurelinux3.0-distroless-extra, 9.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 8.0.27-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.27-bookworm-slim, 8.0-bookworm-slim, 8.0.27, 8.0 | [Dockerfile](src/runtime/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
 8.0.27-alpine3.23-arm64v8, 8.0-alpine3.23-arm64v8, 8.0-alpine-arm64v8, 8.0.27-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/runtime/8.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-arm64v8, 8.0-alpine3.24-arm64v8, 8.0.27-alpine3.24, 8.0-alpine3.24 | [Dockerfile](src/runtime/8.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 8.0.27-alpine3.23-extra-arm64v8, 8.0-alpine3.23-extra-arm64v8, 8.0-alpine-extra-arm64v8, 8.0.27-alpine3.23-extra, 8.0-alpine3.23-extra, 8.0-alpine-extra | [Dockerfile](src/runtime/8.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-extra-arm64v8, 8.0-alpine3.24-extra-arm64v8, 8.0.27-alpine3.24-extra, 8.0-alpine3.24-extra | [Dockerfile](src/runtime/8.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
 8.0.27-noble-arm64v8, 8.0-noble-arm64v8, 8.0.27-noble, 8.0-noble | [Dockerfile](src/runtime/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 8.0.27-noble-chiseled-arm64v8, 8.0-noble-chiseled-arm64v8, 8.0.27-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/runtime/8.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 8.0.27-noble-chiseled-extra-arm64v8, 8.0-noble-chiseled-extra-arm64v8, 8.0.27-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/runtime/8.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -178,7 +192,9 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-preview.5-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.24-arm64v8, 11.0-preview-alpine3.24-arm64v8, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/runtime/11.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.5-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-preview.5-alpine3.24-extra-arm64v8, 11.0-preview-alpine3.24-extra-arm64v8, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/runtime/11.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.5-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 11.0.0-preview.5-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.5-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
@@ -197,16 +213,22 @@ Tags | Dockerfile | OS Version
 10.0.8-resolute-chiseled-arm32v7, 10.0-resolute-chiseled-arm32v7, 10.0.8-resolute-chiseled, 10.0-resolute-chiseled | [Dockerfile](src/runtime/10.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04
 10.0.8-resolute-chiseled-extra-arm32v7, 10.0-resolute-chiseled-extra-arm32v7, 10.0.8-resolute-chiseled-extra, 10.0-resolute-chiseled-extra | [Dockerfile](src/runtime/10.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 26.04
 10.0.8-alpine3.23-arm32v7, 10.0-alpine3.23-arm32v7, 10.0-alpine-arm32v7, 10.0.8-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-arm32v7, 10.0-alpine3.24-arm32v7, 10.0.8-alpine3.24, 10.0-alpine3.24 | [Dockerfile](src/runtime/10.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 10.0.8-alpine3.23-extra-arm32v7, 10.0-alpine3.23-extra-arm32v7, 10.0-alpine-extra-arm32v7, 10.0.8-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/runtime/10.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+10.0.8-alpine3.24-extra-arm32v7, 10.0-alpine3.24-extra-arm32v7, 10.0.8-alpine3.24-extra, 10.0-alpine3.24-extra | [Dockerfile](src/runtime/10.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
 9.0.16-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.16-bookworm-slim, 9.0-bookworm-slim, 9.0.16, 9.0 | [Dockerfile](src/runtime/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
 9.0.16-alpine3.23-arm32v7, 9.0-alpine3.23-arm32v7, 9.0-alpine-arm32v7, 9.0.16-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/runtime/9.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-arm32v7, 9.0-alpine3.24-arm32v7, 9.0.16-alpine3.24, 9.0-alpine3.24 | [Dockerfile](src/runtime/9.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 9.0.16-alpine3.23-extra-arm32v7, 9.0-alpine3.23-extra-arm32v7, 9.0-alpine-extra-arm32v7, 9.0.16-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/runtime/9.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+9.0.16-alpine3.24-extra-arm32v7, 9.0-alpine3.24-extra-arm32v7, 9.0.16-alpine3.24-extra, 9.0-alpine3.24-extra | [Dockerfile](src/runtime/9.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
 9.0.16-noble-arm32v7, 9.0-noble-arm32v7, 9.0.16-noble, 9.0-noble | [Dockerfile](src/runtime/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-arm32v7, 9.0-noble-chiseled-arm32v7, 9.0.16-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime/9.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
 9.0.16-noble-chiseled-extra-arm32v7, 9.0-noble-chiseled-extra-arm32v7, 9.0.16-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime/9.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
 8.0.27-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.27-bookworm-slim, 8.0-bookworm-slim, 8.0.27, 8.0 | [Dockerfile](src/runtime/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
 8.0.27-alpine3.23-arm32v7, 8.0-alpine3.23-arm32v7, 8.0-alpine-arm32v7, 8.0.27-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/runtime/8.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-arm32v7, 8.0-alpine3.24-arm32v7, 8.0.27-alpine3.24, 8.0-alpine3.24 | [Dockerfile](src/runtime/8.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 8.0.27-alpine3.23-extra-arm32v7, 8.0-alpine3.23-extra-arm32v7, 8.0-alpine-extra-arm32v7, 8.0.27-alpine3.23-extra, 8.0-alpine3.23-extra, 8.0-alpine-extra | [Dockerfile](src/runtime/8.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+8.0.27-alpine3.24-extra-arm32v7, 8.0-alpine3.24-extra-arm32v7, 8.0.27-alpine3.24-extra, 8.0-alpine3.24-extra | [Dockerfile](src/runtime/8.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
 8.0.27-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.27-jammy, 8.0-jammy | [Dockerfile](src/runtime/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
 8.0.27-jammy-chiseled-arm32v7, 8.0-jammy-chiseled-arm32v7, 8.0.27-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime/8.0/jammy-chiseled/arm32v7/Dockerfile) | Ubuntu 22.04
 8.0.27-jammy-chiseled-extra-arm32v7, 8.0-jammy-chiseled-extra-arm32v7, 8.0.27-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime/8.0/jammy-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 22.04
@@ -219,7 +241,9 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-preview.5-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-preview.5-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-preview.5-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.5-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-preview.5-alpine3.24-arm32v7, 11.0-preview-alpine3.24-arm32v7, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/runtime/11.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.5-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-preview.5-alpine3.24-extra-arm32v7, 11.0-preview-alpine3.24-extra-arm32v7, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/runtime/11.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
 
 ### Windows amd64 Tags
 
diff --git a/README.sdk.md b/README.sdk.md
index d274d71f3f..7f6700cd4c 100644
--- a/README.sdk.md
+++ b/README.sdk.md
@@ -79,17 +79,21 @@ Tags | Dockerfile | OS Version
 10.0.300-resolute-amd64, 10.0-resolute-amd64, 10.0.300-resolute, 10.0-resolute | [Dockerfile](src/sdk/10.0/resolute/amd64/Dockerfile) | Ubuntu 26.04
 10.0.300-resolute-aot-amd64, 10.0-resolute-aot-amd64, 10.0.300-resolute-aot, 10.0-resolute-aot | [Dockerfile](src/sdk/10.0/resolute-aot/amd64/Dockerfile) | Ubuntu 26.04
 10.0.300-alpine3.23-amd64, 10.0-alpine3.23-amd64, 10.0-alpine-amd64, 10.0.300-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+10.0.300-alpine3.24-amd64, 10.0-alpine3.24-amd64, 10.0.300-alpine3.24, 10.0-alpine3.24 | [Dockerfile](src/sdk/10.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 10.0.300-alpine3.23-aot-amd64, 10.0-alpine3.23-aot-amd64, 10.0-alpine-aot-amd64, 10.0.300-alpine3.23-aot, 10.0-alpine3.23-aot, 10.0-alpine-aot | [Dockerfile](src/sdk/10.0/alpine3.23-aot/amd64/Dockerfile) | Alpine 3.23
+10.0.300-alpine3.24-aot-amd64, 10.0-alpine3.24-aot-amd64, 10.0.300-alpine3.24-aot, 10.0-alpine3.24-aot | [Dockerfile](src/sdk/10.0/alpine3.24-aot/amd64/Dockerfile) | Alpine 3.24
 10.0.300-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.300-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/sdk/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 10.0.300-azurelinux3.0-aot-amd64, 10.0-azurelinux3.0-aot-amd64, 10.0.300-azurelinux3.0-aot, 10.0-azurelinux3.0-aot | [Dockerfile](src/sdk/10.0/azurelinux3.0-aot/amd64/Dockerfile) | Azure Linux 3.0
 10.0.300-azurelinux4.0-amd64, 10.0-azurelinux4.0-amd64, 10.0.300-azurelinux4.0, 10.0-azurelinux4.0 | [Dockerfile](src/sdk/10.0/azurelinux4.0/amd64/Dockerfile) | Azure Linux 4.0
 10.0.300-azurelinux4.0-aot-amd64, 10.0-azurelinux4.0-aot-amd64, 10.0.300-azurelinux4.0-aot, 10.0-azurelinux4.0-aot | [Dockerfile](src/sdk/10.0/azurelinux4.0-aot/amd64/Dockerfile) | Azure Linux 4.0
 9.0.314-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.314-bookworm-slim, 9.0-bookworm-slim, 9.0.314, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12
 9.0.314-alpine3.23-amd64, 9.0-alpine3.23-amd64, 9.0-alpine-amd64, 9.0.314-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+9.0.314-alpine3.24-amd64, 9.0-alpine3.24-amd64, 9.0.314-alpine3.24, 9.0-alpine3.24 | [Dockerfile](src/sdk/9.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 9.0.314-noble-amd64, 9.0-noble-amd64, 9.0.314-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 9.0.314-azurelinux3.0-amd64, 9.0-azurelinux3.0-amd64, 9.0.314-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/sdk/9.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 8.0.421-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.421-bookworm-slim, 8.0-bookworm-slim, 8.0.421, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12
 8.0.421-alpine3.23-amd64, 8.0-alpine3.23-amd64, 8.0-alpine-amd64, 8.0.421-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+8.0.421-alpine3.24-amd64, 8.0-alpine3.24-amd64, 8.0.421-alpine3.24, 8.0-alpine3.24 | [Dockerfile](src/sdk/8.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 8.0.421-noble-amd64, 8.0-noble-amd64, 8.0.421-noble, 8.0-noble | [Dockerfile](src/sdk/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 8.0.421-jammy-amd64, 8.0-jammy-amd64, 8.0.421-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04
 8.0.421-azurelinux3.0-amd64, 8.0-azurelinux3.0-amd64, 8.0.421-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/sdk/8.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
@@ -101,7 +105,9 @@ Tags | Dockerfile | OS Version
 11.0.100-preview.5-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.100-preview.5-resolute, 11.0-preview-resolute, 11.0.100-preview.5, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04
 11.0.100-preview.5-resolute-aot-amd64, 11.0-preview-resolute-aot-amd64, 11.0.100-preview.5-resolute-aot, 11.0-preview-resolute-aot, 11.0.100-preview.5-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/resolute-aot/amd64/Dockerfile) | Ubuntu 26.04
 11.0.100-preview.5-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.100-preview.5-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-preview.5-alpine3.24-amd64, 11.0-preview-alpine3.24-amd64, 11.0.100-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/sdk/11.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
 11.0.100-preview.5-alpine3.23-aot-amd64, 11.0-preview-alpine3.23-aot-amd64, 11.0-preview-alpine-aot-amd64, 11.0.100-preview.5-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-preview.5-alpine3.24-aot-amd64, 11.0-preview-alpine3.24-aot-amd64, 11.0.100-preview.5-alpine3.24-aot, 11.0-preview-alpine3.24-aot | [Dockerfile](src/sdk/11.0/alpine3.24-aot/amd64/Dockerfile) | Alpine 3.24
 11.0.100-preview.5-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.100-preview.5-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 11.0.100-preview.5-azurelinux3.0-aot-amd64, 11.0-preview-azurelinux3.0-aot-amd64, 11.0.100-preview.5-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-preview.5-azurelinux4.0-amd64, 11.0-preview-azurelinux4.0-amd64, 11.0.100-preview.5-azurelinux4.0, 11.0-preview-azurelinux4.0 | [Dockerfile](src/sdk/11.0/azurelinux4.0/amd64/Dockerfile) | Azure Linux 4.0
@@ -116,17 +122,21 @@ Tags | Dockerfile | OS Version
 10.0.300-resolute-arm64v8, 10.0-resolute-arm64v8, 10.0.300-resolute, 10.0-resolute | [Dockerfile](src/sdk/10.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04
 10.0.300-resolute-aot-arm64v8, 10.0-resolute-aot-arm64v8, 10.0.300-resolute-aot, 10.0-resolute-aot | [Dockerfile](src/sdk/10.0/resolute-aot/arm64v8/Dockerfile) | Ubuntu 26.04
 10.0.300-alpine3.23-arm64v8, 10.0-alpine3.23-arm64v8, 10.0-alpine-arm64v8, 10.0.300-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+10.0.300-alpine3.24-arm64v8, 10.0-alpine3.24-arm64v8, 10.0.300-alpine3.24, 10.0-alpine3.24 | [Dockerfile](src/sdk/10.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 10.0.300-alpine3.23-aot-arm64v8, 10.0-alpine3.23-aot-arm64v8, 10.0-alpine-aot-arm64v8, 10.0.300-alpine3.23-aot, 10.0-alpine3.23-aot, 10.0-alpine-aot | [Dockerfile](src/sdk/10.0/alpine3.23-aot/arm64v8/Dockerfile) | Alpine 3.23
+10.0.300-alpine3.24-aot-arm64v8, 10.0-alpine3.24-aot-arm64v8, 10.0.300-alpine3.24-aot, 10.0-alpine3.24-aot | [Dockerfile](src/sdk/10.0/alpine3.24-aot/arm64v8/Dockerfile) | Alpine 3.24
 10.0.300-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.300-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.300-azurelinux3.0-aot-arm64v8, 10.0-azurelinux3.0-aot-arm64v8, 10.0.300-azurelinux3.0-aot, 10.0-azurelinux3.0-aot | [Dockerfile](src/sdk/10.0/azurelinux3.0-aot/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.300-azurelinux4.0-arm64v8, 10.0-azurelinux4.0-arm64v8, 10.0.300-azurelinux4.0, 10.0-azurelinux4.0 | [Dockerfile](src/sdk/10.0/azurelinux4.0/arm64v8/Dockerfile) | Azure Linux 4.0
 10.0.300-azurelinux4.0-aot-arm64v8, 10.0-azurelinux4.0-aot-arm64v8, 10.0.300-azurelinux4.0-aot, 10.0-azurelinux4.0-aot | [Dockerfile](src/sdk/10.0/azurelinux4.0-aot/arm64v8/Dockerfile) | Azure Linux 4.0
 9.0.314-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.314-bookworm-slim, 9.0-bookworm-slim, 9.0.314, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
 9.0.314-alpine3.23-arm64v8, 9.0-alpine3.23-arm64v8, 9.0-alpine-arm64v8, 9.0.314-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+9.0.314-alpine3.24-arm64v8, 9.0-alpine3.24-arm64v8, 9.0.314-alpine3.24, 9.0-alpine3.24 | [Dockerfile](src/sdk/9.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 9.0.314-noble-arm64v8, 9.0-noble-arm64v8, 9.0.314-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 9.0.314-azurelinux3.0-arm64v8, 9.0-azurelinux3.0-arm64v8, 9.0.314-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/sdk/9.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 8.0.421-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.421-bookworm-slim, 8.0-bookworm-slim, 8.0.421, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
 8.0.421-alpine3.23-arm64v8, 8.0-alpine3.23-arm64v8, 8.0-alpine-arm64v8, 8.0.421-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+8.0.421-alpine3.24-arm64v8, 8.0-alpine3.24-arm64v8, 8.0.421-alpine3.24, 8.0-alpine3.24 | [Dockerfile](src/sdk/8.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 8.0.421-noble-arm64v8, 8.0-noble-arm64v8, 8.0.421-noble, 8.0-noble | [Dockerfile](src/sdk/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 8.0.421-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.421-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04
 8.0.421-azurelinux3.0-arm64v8, 8.0-azurelinux3.0-arm64v8, 8.0.421-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/sdk/8.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
@@ -138,7 +148,9 @@ Tags | Dockerfile | OS Version
 11.0.100-preview.5-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.100-preview.5-resolute, 11.0-preview-resolute, 11.0.100-preview.5, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.100-preview.5-resolute-aot-arm64v8, 11.0-preview-resolute-aot-arm64v8, 11.0.100-preview.5-resolute-aot, 11.0-preview-resolute-aot, 11.0.100-preview.5-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/resolute-aot/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.100-preview.5-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.100-preview.5-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-preview.5-alpine3.24-arm64v8, 11.0-preview-alpine3.24-arm64v8, 11.0.100-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/sdk/11.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
 11.0.100-preview.5-alpine3.23-aot-arm64v8, 11.0-preview-alpine3.23-aot-arm64v8, 11.0-preview-alpine-aot-arm64v8, 11.0.100-preview.5-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-preview.5-alpine3.24-aot-arm64v8, 11.0-preview-alpine3.24-aot-arm64v8, 11.0.100-preview.5-alpine3.24-aot, 11.0-preview-alpine3.24-aot | [Dockerfile](src/sdk/11.0/alpine3.24-aot/arm64v8/Dockerfile) | Alpine 3.24
 11.0.100-preview.5-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.100-preview.5-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 11.0.100-preview.5-azurelinux3.0-aot-arm64v8, 11.0-preview-azurelinux3.0-aot-arm64v8, 11.0.100-preview.5-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-preview.5-azurelinux4.0-arm64v8, 11.0-preview-azurelinux4.0-arm64v8, 11.0.100-preview.5-azurelinux4.0, 11.0-preview-azurelinux4.0 | [Dockerfile](src/sdk/11.0/azurelinux4.0/arm64v8/Dockerfile) | Azure Linux 4.0
@@ -151,11 +163,14 @@ Tags | Dockerfile | OS Version
 10.0.300-noble-arm32v7, 10.0-noble-arm32v7, 10.0.300-noble, 10.0-noble, 10.0.300, 10.0 | [Dockerfile](src/sdk/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.300-resolute-arm32v7, 10.0-resolute-arm32v7, 10.0.300-resolute, 10.0-resolute | [Dockerfile](src/sdk/10.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04
 10.0.300-alpine3.23-arm32v7, 10.0-alpine3.23-arm32v7, 10.0-alpine-arm32v7, 10.0.300-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+10.0.300-alpine3.24-arm32v7, 10.0-alpine3.24-arm32v7, 10.0.300-alpine3.24, 10.0-alpine3.24 | [Dockerfile](src/sdk/10.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 9.0.314-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.314-bookworm-slim, 9.0-bookworm-slim, 9.0.314, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
 9.0.314-alpine3.23-arm32v7, 9.0-alpine3.23-arm32v7, 9.0-alpine-arm32v7, 9.0.314-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+9.0.314-alpine3.24-arm32v7, 9.0-alpine3.24-arm32v7, 9.0.314-alpine3.24, 9.0-alpine3.24 | [Dockerfile](src/sdk/9.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 9.0.314-noble-arm32v7, 9.0-noble-arm32v7, 9.0.314-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 8.0.421-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.421-bookworm-slim, 8.0-bookworm-slim, 8.0.421, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
 8.0.421-alpine3.23-arm32v7, 8.0-alpine3.23-arm32v7, 8.0-alpine-arm32v7, 8.0.421-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+8.0.421-alpine3.24-arm32v7, 8.0-alpine3.24-arm32v7, 8.0.421-alpine3.24, 8.0-alpine3.24 | [Dockerfile](src/sdk/8.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 8.0.421-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.421-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
 
 #### .NET 11 Preview Tags
@@ -164,6 +179,7 @@ Tags | Dockerfile | OS Version
 ---- | ---------- | ----------
 11.0.100-preview.5-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.100-preview.5-resolute, 11.0-preview-resolute, 11.0.100-preview.5, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04
 11.0.100-preview.5-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.100-preview.5-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+11.0.100-preview.5-alpine3.24-arm32v7, 11.0-preview-alpine3.24-arm32v7, 11.0.100-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/sdk/11.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 
 ### Windows amd64 Tags
 
diff --git a/eng/dockerfile-templates/sdk/Dockerfile.linux.aot b/eng/dockerfile-templates/sdk/Dockerfile.linux.aot
index c003c9209a..a014b0ebe0 100644
--- a/eng/dockerfile-templates/sdk/Dockerfile.linux.aot
+++ b/eng/dockerfile-templates/sdk/Dockerfile.linux.aot
@@ -7,28 +7,80 @@
     set isUbuntu to find(OS_ARCH_HYPHENATED, "Ubuntu") >= 0 ^
     set ubuntuVersion to when(find(OS_VERSION, "jammy") >= 0, "jammy", "noble") ^
 
+    _ Native AOT only requires gcc. Native AOT in .NET really only needs a linker and something to drive the linker.
+      The runtime falls back to using gcc to drive linking when clang is not present, and both use the same bfd linker
+      under the hood, so dropping clang/llvm meaningfully shrinks the image. This optimization was made in .NET 11,
+      hence the conditional below. ^
+    set useGcc to dotnetVersion != "8.0" && dotnetVersion != "9.0" && dotnetVersion != "10.0" ^
+
+    _ The gcc package alone isn't always sufficient to link Native AOT binaries:
+      - Alpine: gcc pulls in binutils, but musl-dev (crt objects/headers) must be added.
+      - Azure Linux 3.0: gcc pulls in neither binutils (objcopy/ld) nor glibc-devel
+        (crt objects and -ldl/-lrt), so both are added explicitly.
+      - Azure Linux 4.0 and Ubuntu: gcc transitively pulls in binutils and libc dev
+        packages, so gcc alone is enough.
+      Installing these specific packages avoids the much larger build-base /
+      build-essential meta-packages that bundle make, g++, autotools, etc. ^
+
     set pkgs to cat(sort(
-        when(isAlpine,
-        [
-            "build-base",
-            "clang",
-            "zlib-dev"
-        ],
-        when(isAzureLinux,
-        when(OS_VERSION_NUMBER = "3.0",
-        [
-            "build-essential",
-            "clang",
-            "zlib-devel"
-        ],
-        [
-            "gcc"
-        ]),
-        [
-            "clang",
-            "zlib1g-dev",
-            "llvm"
-        ]))))
+        when(
+            useGcc,
+            when(
+                isAlpine,
+                [
+                    "gcc",
+                    "musl-dev",
+                    "zlib-dev"
+                ],
+                when(
+                    isAzureLinux,
+                    when(
+                        OS_VERSION_NUMBER = "3.0",
+                        [
+                            "binutils",
+                            "gcc",
+                            "glibc-devel",
+                            "zlib-devel"
+                        ],
+                        [
+                            "gcc"
+                        ]
+                    ),
+                    [
+                        "gcc",
+                        "zlib1g-dev"
+                    ]
+                )
+            ),
+            when(
+                isAlpine,
+                [
+                    "build-base",
+                    "clang",
+                    "zlib-dev"
+                ],
+                when(
+                    isAzureLinux,
+                    when(
+                        OS_VERSION_NUMBER = "3.0",
+                        [
+                            "build-essential",
+                            "clang",
+                            "zlib-devel"
+                        ],
+                        [
+                            "gcc"
+                        ]
+                    ),
+                    [
+                        "clang",
+                        "zlib1g-dev",
+                        "llvm"
+                    ]
+                )
+            )
+        )
+    ))
 
 }}ARG REPO=mcr.microsoft.com/dotnet/sdk
 FROM {{baseImageTag}}
diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
index ad6c4f1459..b684a304bd 100644
--- a/eng/mcr-tags-metadata-templates/aspnet-tags.yml
+++ b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
@@ -5,9 +5,13 @@ $(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.24|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.24-extra|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23-composite|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.24-composite|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23-composite-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.24-composite-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)
@@ -31,9 +35,13 @@ $(McrTagsYmlTagGroup:10.0-resolute-chiseled-extra)
 $(McrTagsYmlTagGroup:10.0-resolute-chiseled-composite)
 $(McrTagsYmlTagGroup:10.0-resolute-chiseled-composite-extra)
 $(McrTagsYmlTagGroup:10.0-alpine3.23)
+$(McrTagsYmlTagGroup:10.0-alpine3.24)
 $(McrTagsYmlTagGroup:10.0-alpine3.23-extra)
+$(McrTagsYmlTagGroup:10.0-alpine3.24-extra)
 $(McrTagsYmlTagGroup:10.0-alpine3.23-composite)
+$(McrTagsYmlTagGroup:10.0-alpine3.24-composite)
 $(McrTagsYmlTagGroup:10.0-alpine3.23-composite-extra)
+$(McrTagsYmlTagGroup:10.0-alpine3.24-composite-extra)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0-distroless)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0-distroless-extra)
@@ -46,9 +54,13 @@ $(McrTagsYmlTagGroup:10.0-azurelinux4.0-distroless-composite)
 $(McrTagsYmlTagGroup:10.0-azurelinux4.0-distroless-composite-extra)
 $(McrTagsYmlTagGroup:9.0-bookworm-slim)
 $(McrTagsYmlTagGroup:9.0-alpine3.23)
+$(McrTagsYmlTagGroup:9.0-alpine3.24)
 $(McrTagsYmlTagGroup:9.0-alpine3.23-extra)
+$(McrTagsYmlTagGroup:9.0-alpine3.24-extra)
 $(McrTagsYmlTagGroup:9.0-alpine3.23-composite)
+$(McrTagsYmlTagGroup:9.0-alpine3.24-composite)
 $(McrTagsYmlTagGroup:9.0-alpine3.23-composite-extra)
+$(McrTagsYmlTagGroup:9.0-alpine3.24-composite-extra)
 $(McrTagsYmlTagGroup:9.0-noble)
 $(McrTagsYmlTagGroup:9.0-noble-chiseled)
 $(McrTagsYmlTagGroup:9.0-noble-chiseled-extra)
@@ -61,9 +73,13 @@ $(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-composite)
 $(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-composite-extra)
 $(McrTagsYmlTagGroup:8.0-bookworm-slim)
 $(McrTagsYmlTagGroup:8.0-alpine3.23)
+$(McrTagsYmlTagGroup:8.0-alpine3.24)
 $(McrTagsYmlTagGroup:8.0-alpine3.23-extra)
+$(McrTagsYmlTagGroup:8.0-alpine3.24-extra)
 $(McrTagsYmlTagGroup:8.0-alpine3.23-composite)
+$(McrTagsYmlTagGroup:8.0-alpine3.24-composite)
 $(McrTagsYmlTagGroup:8.0-alpine3.23-composite-extra)
+$(McrTagsYmlTagGroup:8.0-alpine3.24-composite-extra)
 $(McrTagsYmlTagGroup:8.0-noble)
 $(McrTagsYmlTagGroup:8.0-noble-chiseled)
 $(McrTagsYmlTagGroup:8.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 d4f6aaaeda..6023a46801 100644
--- a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml
+++ b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml
@@ -3,7 +3,9 @@ $(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.24|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.24-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)
@@ -17,7 +19,9 @@ $(McrTagsYmlTagGroup:10.0-resolute)
 $(McrTagsYmlTagGroup:10.0-resolute-chiseled)
 $(McrTagsYmlTagGroup:10.0-resolute-chiseled-extra)
 $(McrTagsYmlTagGroup:10.0-alpine3.23)
+$(McrTagsYmlTagGroup:10.0-alpine3.24)
 $(McrTagsYmlTagGroup:10.0-alpine3.23-extra)
+$(McrTagsYmlTagGroup:10.0-alpine3.24-extra)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0-distroless)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0-distroless-extra)
@@ -26,7 +30,9 @@ $(McrTagsYmlTagGroup:10.0-azurelinux4.0-distroless)
 $(McrTagsYmlTagGroup:10.0-azurelinux4.0-distroless-extra)
 $(McrTagsYmlTagGroup:9.0-bookworm-slim)
 $(McrTagsYmlTagGroup:9.0-alpine3.23)
+$(McrTagsYmlTagGroup:9.0-alpine3.24)
 $(McrTagsYmlTagGroup:9.0-alpine3.23-extra)
+$(McrTagsYmlTagGroup:9.0-alpine3.24-extra)
 $(McrTagsYmlTagGroup:9.0-noble)
 $(McrTagsYmlTagGroup:9.0-noble-chiseled)
 $(McrTagsYmlTagGroup:9.0-noble-chiseled-extra)
@@ -35,7 +41,9 @@ $(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless)
 $(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-extra)
 $(McrTagsYmlTagGroup:8.0-bookworm-slim)
 $(McrTagsYmlTagGroup:8.0-alpine3.23)
+$(McrTagsYmlTagGroup:8.0-alpine3.24)
 $(McrTagsYmlTagGroup:8.0-alpine3.23-extra)
+$(McrTagsYmlTagGroup:8.0-alpine3.24-extra)
 $(McrTagsYmlTagGroup:8.0-noble)
 $(McrTagsYmlTagGroup:8.0-noble-chiseled)
 $(McrTagsYmlTagGroup:8.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 818ae8c6c2..620e8480ea 100644
--- a/eng/mcr-tags-metadata-templates/runtime-tags.yml
+++ b/eng/mcr-tags-metadata-templates/runtime-tags.yml
@@ -3,7 +3,9 @@ $(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.24|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23-extra|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.24-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)
@@ -19,7 +21,9 @@ $(McrTagsYmlTagGroup:10.0-resolute)
 $(McrTagsYmlTagGroup:10.0-resolute-chiseled)
 $(McrTagsYmlTagGroup:10.0-resolute-chiseled-extra)
 $(McrTagsYmlTagGroup:10.0-alpine3.23)
+$(McrTagsYmlTagGroup:10.0-alpine3.24)
 $(McrTagsYmlTagGroup:10.0-alpine3.23-extra)
+$(McrTagsYmlTagGroup:10.0-alpine3.24-extra)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0-distroless)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0-distroless-extra)
@@ -28,7 +32,9 @@ $(McrTagsYmlTagGroup:10.0-azurelinux4.0-distroless)
 $(McrTagsYmlTagGroup:10.0-azurelinux4.0-distroless-extra)
 $(McrTagsYmlTagGroup:9.0-bookworm-slim)
 $(McrTagsYmlTagGroup:9.0-alpine3.23)
+$(McrTagsYmlTagGroup:9.0-alpine3.24)
 $(McrTagsYmlTagGroup:9.0-alpine3.23-extra)
+$(McrTagsYmlTagGroup:9.0-alpine3.24-extra)
 $(McrTagsYmlTagGroup:9.0-noble)
 $(McrTagsYmlTagGroup:9.0-noble-chiseled)
 $(McrTagsYmlTagGroup:9.0-noble-chiseled-extra)
@@ -37,7 +43,9 @@ $(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless)
 $(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-extra)
 $(McrTagsYmlTagGroup:8.0-bookworm-slim)
 $(McrTagsYmlTagGroup:8.0-alpine3.23)
+$(McrTagsYmlTagGroup:8.0-alpine3.24)
 $(McrTagsYmlTagGroup:8.0-alpine3.23-extra)
+$(McrTagsYmlTagGroup:8.0-alpine3.24-extra)
 $(McrTagsYmlTagGroup:8.0-noble)
 $(McrTagsYmlTagGroup:8.0-noble-chiseled)
 $(McrTagsYmlTagGroup:8.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 20e6b5ee28..ec2078d96b 100644
--- a/eng/mcr-tags-metadata-templates/sdk-tags.yml
+++ b/eng/mcr-tags-metadata-templates/sdk-tags.yml
@@ -2,7 +2,9 @@ $(McrTagsYmlRepo:sdk)
 $(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.24|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23-aot|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.24-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-azurelinux4.0|.NET 11 Preview Tags)
@@ -14,17 +16,21 @@ $(McrTagsYmlTagGroup:10.0-noble-aot)
 $(McrTagsYmlTagGroup:10.0-resolute)
 $(McrTagsYmlTagGroup:10.0-resolute-aot)
 $(McrTagsYmlTagGroup:10.0-alpine3.23)
+$(McrTagsYmlTagGroup:10.0-alpine3.24)
 $(McrTagsYmlTagGroup:10.0-alpine3.23-aot)
+$(McrTagsYmlTagGroup:10.0-alpine3.24-aot)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0-aot)
 $(McrTagsYmlTagGroup:10.0-azurelinux4.0)
 $(McrTagsYmlTagGroup:10.0-azurelinux4.0-aot)
 $(McrTagsYmlTagGroup:9.0-bookworm-slim)
 $(McrTagsYmlTagGroup:9.0-alpine3.23)
+$(McrTagsYmlTagGroup:9.0-alpine3.24)
 $(McrTagsYmlTagGroup:9.0-noble)
 $(McrTagsYmlTagGroup:9.0-azurelinux3.0)
 $(McrTagsYmlTagGroup:8.0-bookworm-slim)
 $(McrTagsYmlTagGroup:8.0-alpine3.23)
+$(McrTagsYmlTagGroup:8.0-alpine3.24)
 $(McrTagsYmlTagGroup:8.0-noble)
 $(McrTagsYmlTagGroup:8.0-jammy)
 $(McrTagsYmlTagGroup:8.0-azurelinux3.0)
diff --git a/manifest.json b/manifest.json
index fd2748ad4b..93fc8e9fc5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -78,6 +78,73 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.24": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.24": {},
+            "$(dotnet|8.0|fixed-tag)-alpine3.24-aot": {
+              "docType": "Undocumented"
+            },
+            "$(dotnet|8.0|minor-tag)-alpine3.24-aot": {
+              "docType": "Undocumented"
+            }
+          },
+          "platforms": [
+            {
+              "dockerfile": "src/runtime-deps/8.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-amd64": {},
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-aot-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-alpine3.24-aot-amd64": {
+                  "docType": "Undocumented"
+                }
+              }
+            },
+            {
+              "architecture": "arm",
+              "dockerfile": "src/runtime-deps/8.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-aot-arm32v7": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-alpine3.24-aot-arm32v7": {
+                  "docType": "Undocumented"
+                }
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "dockerfile": "src/runtime-deps/8.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-arm64v8": {},
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-aot-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-alpine3.24-aot-arm64v8": {
+                  "docType": "Undocumented"
+                }
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
@@ -158,6 +225,76 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.24-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.24-extra": {}
+          },
+          "platforms": [
+            {
+              "dockerfile": "src/runtime-deps/8.0/alpine3.24-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.24-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm",
+              "dockerfile": "src/runtime-deps/8.0/alpine3.24-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-extra-arm32v7": {}
+              },
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.24-arm32v7"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "dockerfile": "src/runtime-deps/8.0/alpine3.24-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-extra-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
@@ -791,6 +928,73 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-alpine3.24": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.24": {},
+            "$(dotnet|9.0|fixed-tag)-alpine3.24-aot": {
+              "docType": "Undocumented"
+            },
+            "$(dotnet|9.0|minor-tag)-alpine3.24-aot": {
+              "docType": "Undocumented"
+            }
+          },
+          "platforms": [
+            {
+              "dockerfile": "src/runtime-deps/9.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-amd64": {},
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-aot-amd64": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|9.0|minor-tag)-alpine3.24-aot-amd64": {
+                  "docType": "Undocumented"
+                }
+              }
+            },
+            {
+              "architecture": "arm",
+              "dockerfile": "src/runtime-deps/9.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-aot-arm32v7": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|9.0|minor-tag)-alpine3.24-aot-arm32v7": {
+                  "docType": "Undocumented"
+                }
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "dockerfile": "src/runtime-deps/9.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-arm64v8": {},
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-aot-arm64v8": {
+                  "docType": "Undocumented"
+                },
+                "$(dotnet|9.0|minor-tag)-alpine3.24-aot-arm64v8": {
+                  "docType": "Undocumented"
+                }
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
@@ -874,6 +1078,76 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-alpine3.24-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.24-extra": {}
+          },
+          "platforms": [
+            {
+              "dockerfile": "src/runtime-deps/9.0/alpine3.24-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.24-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm",
+              "dockerfile": "src/runtime-deps/9.0/alpine3.24-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-extra-arm32v7": {}
+              },
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.24-arm32v7"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "dockerfile": "src/runtime-deps/9.0/alpine3.24-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-extra-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
@@ -1361,6 +1635,49 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-alpine3.24": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.24": {}
+          },
+          "platforms": [
+            {
+              "dockerfile": "src/runtime-deps/10.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "dockerfile": "src/runtime-deps/10.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "dockerfile": "src/runtime-deps/10.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
@@ -1411,41 +1728,38 @@
         {
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-alpine3.23-extra": {},
-            "$(dotnet|10.0|minor-tag)-alpine3.23-extra": {},
-            "$(dotnet|10.0|minor-tag)-alpine-extra": {}
+            "$(dotnet|10.0|fixed-tag)-alpine3.24-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.24-extra": {}
           },
           "platforms": [
             {
-              "dockerfile": "src/runtime-deps/10.0/alpine3.23-extra/amd64",
+              "dockerfile": "src/runtime-deps/10.0/alpine3.24-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.24",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-extra-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine-extra-amd64": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-amd64"
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.24-amd64"
                   ]
                 }
               ]
             },
             {
               "architecture": "arm",
-              "dockerfile": "src/runtime-deps/10.0/alpine3.23-extra/arm32v7",
+              "dockerfile": "src/runtime-deps/10.0/alpine3.24-extra/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.24",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-extra-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine-extra-arm32v7": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-extra-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -1453,21 +1767,20 @@
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-arm32v7"
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.24-arm32v7"
                   ]
                 }
               ]
             },
             {
               "architecture": "arm64",
-              "dockerfile": "src/runtime-deps/10.0/alpine3.23-extra/arm64v8",
+              "dockerfile": "src/runtime-deps/10.0/alpine3.24-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.24",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-extra-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine-extra-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -1475,7 +1788,7 @@
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-arm64v8"
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.24-arm64v8"
                   ]
                 }
               ]
@@ -1485,15 +1798,89 @@
         {
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-azurelinux3.0": {},
-            "$(dotnet|10.0|minor-tag)-azurelinux3.0": {}
+            "$(dotnet|10.0|fixed-tag)-alpine3.23-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.23-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine-extra": {}
           },
           "platforms": [
             {
-              "dockerfile": "src/runtime-deps/10.0/azurelinux3.0/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "dockerfile": "src/runtime-deps/10.0/alpine3.23-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
               "os": "linux",
-              "osVersion": "azurelinux3.0",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm",
+              "dockerfile": "src/runtime-deps/10.0/alpine3.23-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine-extra-arm32v7": {}
+              },
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-arm32v7"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "dockerfile": "src/runtime-deps/10.0/alpine3.23-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine-extra-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-azurelinux3.0": {},
+            "$(dotnet|10.0|minor-tag)-azurelinux3.0": {}
+          },
+          "platforms": [
+            {
+              "dockerfile": "src/runtime-deps/10.0/azurelinux3.0/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-azurelinux3.0-amd64": {},
                 "$(dotnet|10.0|minor-tag)-azurelinux3.0-amd64": {}
@@ -2137,6 +2524,49 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-alpine3.24": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.24": {}
+          },
+          "platforms": [
+            {
+              "dockerfile": "src/runtime-deps/11.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "dockerfile": "src/runtime-deps/11.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "dockerfile": "src/runtime-deps/11.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
@@ -2184,6 +2614,76 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-alpine3.24-extra": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.24-extra": {}
+          },
+          "platforms": [
+            {
+              "dockerfile": "src/runtime-deps/11.0/alpine3.24-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm",
+              "dockerfile": "src/runtime-deps/11.0/alpine3.24-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-arm32v7": {}
+              },
+              "variant": "v7",
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm32v7"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "dockerfile": "src/runtime-deps/11.0/alpine3.24-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
@@ -2745,6 +3245,58 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.24": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.24": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/8.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/8.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/8.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
@@ -2801,6 +3353,85 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.24-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.24-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/8.0/alpine3.24-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.24-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/8.0/alpine3.24-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.24-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/8.0/alpine3.24-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
@@ -3567,6 +4198,58 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-alpine3.24": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.24": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
@@ -3623,6 +4306,85 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-alpine3.24-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.24-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/alpine3.24-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.24-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/alpine3.24-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.24-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/alpine3.24-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
@@ -4242,6 +5004,58 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-alpine3.24": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.24": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/10.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/10.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/10.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
@@ -4298,6 +5112,85 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-alpine3.24-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.24-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/10.0/alpine3.24-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.24-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/10.0/alpine3.24-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.24-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/10.0/alpine3.24-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
@@ -5228,6 +6121,58 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-alpine3.24": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.24": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/11.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/11.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/11.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
@@ -5287,30 +6232,28 @@
         {
           "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)-alpine-extra": {}
+            "$(dotnet|11.0|fixed-tag)-alpine3.24-extra": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.24-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/11.0/alpine3.23-extra/amd64",
+              "dockerfile": "src/runtime/11.0/alpine3.24-extra/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.24",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.23-extra-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-extra-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine-extra-amd64": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-amd64"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-amd64"
                   ]
                 }
               ]
@@ -5319,21 +6262,20 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/11.0/alpine3.23-extra/arm32v7",
+              "dockerfile": "src/runtime/11.0/alpine3.24-extra/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.24",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.23-extra-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-extra-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine-extra-arm32v7": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-arm32v7": {}
               },
               "customBuildLegGroups": [
                 {
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm32v7"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm32v7"
                   ]
                 }
               ],
@@ -5344,12 +6286,94 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/11.0/alpine3.23-extra/arm64v8",
+              "dockerfile": "src/runtime/11.0/alpine3.24-extra/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.24",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.23-extra-arm64v8": {},
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "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)-alpine-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/11.0/alpine3.23-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.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": {},
+                "$(dotnet|11.0|minor-tag)-alpine-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/11.0/alpine3.23-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "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)-alpine-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/11.0/alpine3.23-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "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)-alpine-extra-arm64v8": {}
               },
@@ -5973,6 +6997,58 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.24": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.24": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
@@ -6029,6 +7105,85 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.24-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.24-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.24-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.24-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.24-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.24-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.24-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
@@ -6112,6 +7267,58 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.24-composite": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.24-composite": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.24-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-composite-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-composite-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.24-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-composite-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-composite-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.24-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-composite-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
@@ -6164,6 +7371,85 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.24-composite-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.24-composite-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.24-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-composite-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-composite-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.24-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.24-composite-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-composite-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-composite-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.24-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.24-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.24-composite-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.24-composite-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
@@ -7232,6 +8518,58 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-alpine3.24": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.24": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
@@ -7288,6 +8626,85 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-alpine3.24-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.24-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.24-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.24-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.24-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.24-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.24-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
@@ -7374,51 +8791,182 @@
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-alpine3.23-composite": {},
-            "$(dotnet|9.0|minor-tag)-alpine3.23-composite": {}
+            "$(dotnet|9.0|fixed-tag)-alpine3.24-composite": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.24-composite": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.24-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-composite-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-composite-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.24-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-composite-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-composite-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.24-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-composite-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(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/9.0/alpine3.23-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-alpine3.24-composite-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.24-composite-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/9.0/alpine3.24-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.24",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-amd64": {}
-              }
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-composite-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-composite-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.24-amd64"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/9.0/alpine3.24-composite-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.24",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-composite-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-composite-extra-arm32v7": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.24-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
               "variant": "v7"
             },
             {
-              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/9.0/alpine3.24-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.24",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.24-composite-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.24-composite-extra-arm64v8": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -8312,6 +9860,58 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-alpine3.24": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.24": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
@@ -8368,6 +9968,85 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-alpine3.24-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.24-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.24-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.24-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.24-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.24-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.24-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
@@ -8437,16 +10116,120 @@
                 "$(dotnet|10.0|minor-tag)-alpine3.23-extra-arm64v8": {},
                 "$(dotnet|10.0|minor-tag)-alpine-extra-arm64v8": {}
               },
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-arm64v8"
-                  ]
-                }
-              ],
-              "architecture": "arm64",
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-alpine3.24-composite": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.24-composite": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.24-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-composite-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-composite-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.24-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-composite-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-composite-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.24-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-composite-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-composite-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"
             }
           ]
@@ -8454,51 +10237,78 @@
         {
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-alpine3.23-composite": {},
-            "$(dotnet|10.0|minor-tag)-alpine3.23-composite": {}
+            "$(dotnet|10.0|fixed-tag)-alpine3.24-composite-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.24-composite-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.23-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/10.0/alpine3.24-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.24",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-amd64": {}
-              }
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-composite-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-composite-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.24-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",
+              "dockerfile": "src/aspnet/10.0/alpine3.24-composite-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.24",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-arm32v7": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-composite-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-composite-extra-arm32v7": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.24-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
               "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",
+              "dockerfile": "src/aspnet/10.0/alpine3.24-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.24",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.24-composite-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.24-composite-extra-arm64v8": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -9953,6 +11763,58 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-alpine3.24": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.24": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
@@ -10009,6 +11871,85 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-alpine3.24-extra": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.24-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.24-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.24-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.24-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
@@ -10092,6 +12033,58 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-alpine3.24-composite": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.24-composite": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.24-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-composite-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.24-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-composite-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.24-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-composite-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
@@ -10131,19 +12124,98 @@
               "variant": "v7"
             },
             {
-              "architecture": "arm64",
+              "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": {},
+                "$(dotnet|11.0|minor-tag)-alpine-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|11.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|11.0|fixed-tag)-alpine3.24-composite-extra": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.24-composite-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.24-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-composite-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/11.0/alpine3.24-composite-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-composite-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/11.0/alpine3.23-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/11.0/alpine3.24-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.24",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-composite-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine-composite-arm64v8": {}
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-composite-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-extra-arm64v8": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -11251,6 +13323,58 @@
             }
           ]
         },
+        {
+          "productVersion": "$(sdk|8.0|product-version)",
+          "sharedTags": {
+            "$(sdk|8.0|fixed-tag)-alpine3.24": {},
+            "$(sdk|8.0|minor-tag)-alpine3.24": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "dockerfile": "src/sdk/8.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(sdk|8.0|minor-tag)-alpine3.24-amd64": {}
+              }
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "architecture": "arm",
+              "dockerfile": "src/sdk/8.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(sdk|8.0|minor-tag)-alpine3.24-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "architecture": "arm64",
+              "dockerfile": "src/sdk/8.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|8.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(sdk|8.0|minor-tag)-alpine3.24-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(sdk|8.0|product-version)",
           "sharedTags": {
@@ -11595,6 +13719,58 @@
             }
           ]
         },
+        {
+          "productVersion": "$(sdk|9.0|product-version)",
+          "sharedTags": {
+            "$(sdk|9.0|fixed-tag)-alpine3.24": {},
+            "$(sdk|9.0|minor-tag)-alpine3.24": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "dockerfile": "src/sdk/9.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|9.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(sdk|9.0|minor-tag)-alpine3.24-amd64": {}
+              }
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "architecture": "arm",
+              "dockerfile": "src/sdk/9.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|9.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(sdk|9.0|minor-tag)-alpine3.24-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "architecture": "arm64",
+              "dockerfile": "src/sdk/9.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|9.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(sdk|9.0|minor-tag)-alpine3.24-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(sdk|9.0|product-version)",
           "sharedTags": {
@@ -12030,6 +14206,58 @@
             }
           ]
         },
+        {
+          "productVersion": "$(sdk|10.0|product-version)",
+          "sharedTags": {
+            "$(sdk|10.0|fixed-tag)-alpine3.24": {},
+            "$(sdk|10.0|minor-tag)-alpine3.24": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "dockerfile": "src/sdk/10.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|10.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(sdk|10.0|minor-tag)-alpine3.24-amd64": {}
+              }
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "architecture": "arm",
+              "dockerfile": "src/sdk/10.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|10.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(sdk|10.0|minor-tag)-alpine3.24-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "architecture": "arm64",
+              "dockerfile": "src/sdk/10.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|10.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(sdk|10.0|minor-tag)-alpine3.24-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(sdk|10.0|product-version)",
           "sharedTags": {
@@ -12086,6 +14314,61 @@
             }
           ]
         },
+        {
+          "productVersion": "$(sdk|10.0|product-version)",
+          "sharedTags": {
+            "$(sdk|10.0|fixed-tag)-alpine3.24-aot": {},
+            "$(sdk|10.0|minor-tag)-alpine3.24-aot": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:sdk)"
+              },
+              "dockerfile": "src/sdk/10.0/alpine3.24-aot/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|10.0|fixed-tag)-alpine3.24-aot-amd64": {},
+                "$(sdk|10.0|minor-tag)-alpine3.24-aot-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.24-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:sdk)"
+              },
+              "architecture": "arm64",
+              "dockerfile": "src/sdk/10.0/alpine3.24-aot/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|10.0|fixed-tag)-alpine3.24-aot-arm64v8": {},
+                "$(sdk|10.0|minor-tag)-alpine3.24-aot-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
         {
           "productVersion": "$(sdk|10.0|product-version)",
           "sharedTags": {
@@ -12458,6 +14741,58 @@
             }
           ]
         },
+        {
+          "productVersion": "$(sdk|11.0|product-version)",
+          "sharedTags": {
+            "$(sdk|11.0|fixed-tag)-alpine3.24": {},
+            "$(sdk|11.0|minor-tag)-alpine3.24": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "dockerfile": "src/sdk/11.0/alpine3.24/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|11.0|fixed-tag)-alpine3.24-amd64": {},
+                "$(sdk|11.0|minor-tag)-alpine3.24-amd64": {}
+              }
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "architecture": "arm",
+              "dockerfile": "src/sdk/11.0/alpine3.24/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|11.0|fixed-tag)-alpine3.24-arm32v7": {},
+                "$(sdk|11.0|minor-tag)-alpine3.24-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:aspnet)"
+              },
+              "architecture": "arm64",
+              "dockerfile": "src/sdk/11.0/alpine3.24/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|11.0|fixed-tag)-alpine3.24-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-alpine3.24-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
@@ -12514,6 +14849,61 @@
             }
           ]
         },
+        {
+          "productVersion": "$(sdk|11.0|product-version)",
+          "sharedTags": {
+            "$(sdk|11.0|fixed-tag)-alpine3.24-aot": {},
+            "$(sdk|11.0|minor-tag)-alpine3.24-aot": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:sdk)"
+              },
+              "dockerfile": "src/sdk/11.0/alpine3.24-aot/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|11.0|fixed-tag)-alpine3.24-aot-amd64": {},
+                "$(sdk|11.0|minor-tag)-alpine3.24-aot-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:sdk)"
+              },
+              "architecture": "arm64",
+              "dockerfile": "src/sdk/11.0/alpine3.24-aot/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
+              "os": "linux",
+              "osVersion": "alpine3.24",
+              "tags": {
+                "$(sdk|11.0|fixed-tag)-alpine3.24-aot-arm64v8": {},
+                "$(sdk|11.0|minor-tag)-alpine3.24-aot-arm64v8": {}
+              },
+              "variant": "v8",
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm64v8"
+                  ]
+                }
+              ]
+            }
+          ]
+        },
         {
           "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
diff --git a/manifest.versions.json b/manifest.versions.json
index de622df9be..a656fa7b05 100644
--- a/manifest.versions.json
+++ b/manifest.versions.json
@@ -120,6 +120,7 @@
     "libicu|resolute": 78,
 
     "libssl|alpine3.23": "3",
+    "libssl|alpine3.24": "3",
     "libssl|bookworm": "3",
     "libssl|bullseye": "1.1",
     "libssl|focal": "1.1",
diff --git a/src/aspnet/10.0/alpine3.24-composite-extra/amd64/Dockerfile b/src/aspnet/10.0/alpine3.24-composite-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..5c99b33ee4
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.24-composite-extra/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.8 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/10.0/alpine3.24-composite-extra/arm32v7/Dockerfile b/src/aspnet/10.0/alpine3.24-composite-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..9066b6c8ff
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.24-composite-extra/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.8 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/10.0/alpine3.24-composite-extra/arm64v8/Dockerfile b/src/aspnet/10.0/alpine3.24-composite-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..832136cc11
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.24-composite-extra/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.8 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/10.0/alpine3.24-composite/amd64/Dockerfile b/src/aspnet/10.0/alpine3.24-composite/amd64/Dockerfile
new file mode 100644
index 0000000000..c4458e49eb
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.24-composite/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.8 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/10.0/alpine3.24-composite/arm32v7/Dockerfile b/src/aspnet/10.0/alpine3.24-composite/arm32v7/Dockerfile
new file mode 100644
index 0000000000..5c1ed733ed
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.24-composite/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.8 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/10.0/alpine3.24-composite/arm64v8/Dockerfile b/src/aspnet/10.0/alpine3.24-composite/arm64v8/Dockerfile
new file mode 100644
index 0000000000..1d08a1f645
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.24-composite/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.8 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/10.0/alpine3.24-extra/amd64/Dockerfile b/src/aspnet/10.0/alpine3.24-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..714800b0dc
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.24-extra/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.24-extra/arm32v7/Dockerfile b/src/aspnet/10.0/alpine3.24-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..1c411a60a5
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.24-extra/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.24-extra/arm64v8/Dockerfile b/src/aspnet/10.0/alpine3.24-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..76af1eaf73
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.24-extra/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.24/amd64/Dockerfile b/src/aspnet/10.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..f90493e87f
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.24/arm32v7/Dockerfile b/src/aspnet/10.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..3991e022e3
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.24/arm64v8/Dockerfile b/src/aspnet/10.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..47fa88fc66
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.24-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/alpine3.24-composite-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..d46ab3af39
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.24-composite-extra/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.5.26302.115 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.5.26302.115
+
+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.24-composite-extra/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.24-composite-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..d690b39904
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.24-composite-extra/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.5.26302.115 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.5.26302.115
+
+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.24-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.24-composite-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..1e1ce6e718
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.24-composite-extra/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.5.26302.115 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.5.26302.115
+
+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.24-composite/amd64/Dockerfile b/src/aspnet/11.0/alpine3.24-composite/amd64/Dockerfile
new file mode 100644
index 0000000000..8d80039e92
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.24-composite/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.5.26302.115 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.5.26302.115
+
+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.24-composite/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.24-composite/arm32v7/Dockerfile
new file mode 100644
index 0000000000..44c05c4baa
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.24-composite/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.5.26302.115 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.5.26302.115
+
+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.24-composite/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.24-composite/arm64v8/Dockerfile
new file mode 100644
index 0000000000..e5bd2492b2
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.24-composite/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-preview.5.26302.115 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-preview.5.26302.115
+
+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.24-extra/amd64/Dockerfile b/src/aspnet/11.0/alpine3.24-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..45f9e1a85f
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.24-extra/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.5.26302.115
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.24-extra/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.24-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..8c61f2cc01
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.24-extra/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.5.26302.115
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.24-extra/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.24-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..4e203695ef
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.24-extra/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.5.26302.115
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.24/amd64/Dockerfile b/src/aspnet/11.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..3c78e9c474
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.5.26302.115
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.24/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..31364e1938
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.5.26302.115
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.24/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..c218644fd1
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-preview.5.26302.115
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.24-composite-extra/amd64/Dockerfile b/src/aspnet/8.0/alpine3.24-composite-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..6ff2f73cab
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.24-composite-extra/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Composite Image
+FROM $REPO:8.0.27-alpine3.24-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.27 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/8.0/alpine3.24-composite-extra/arm32v7/Dockerfile b/src/aspnet/8.0/alpine3.24-composite-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..d4e146c5bb
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.24-composite-extra/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Composite Image
+FROM $REPO:8.0.27-alpine3.24-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.27 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/8.0/alpine3.24-composite-extra/arm64v8/Dockerfile b/src/aspnet/8.0/alpine3.24-composite-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..13a9dd976c
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.24-composite-extra/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Composite Image
+FROM $REPO:8.0.27-alpine3.24-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.27 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/8.0/alpine3.24-composite/amd64/Dockerfile b/src/aspnet/8.0/alpine3.24-composite/amd64/Dockerfile
new file mode 100644
index 0000000000..1db1f7d346
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.24-composite/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Composite Image
+FROM $REPO:8.0.27-alpine3.24-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.27 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/8.0/alpine3.24-composite/arm32v7/Dockerfile b/src/aspnet/8.0/alpine3.24-composite/arm32v7/Dockerfile
new file mode 100644
index 0000000000..d2627b9190
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.24-composite/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Composite Image
+FROM $REPO:8.0.27-alpine3.24-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.27 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/8.0/alpine3.24-composite/arm64v8/Dockerfile b/src/aspnet/8.0/alpine3.24-composite/arm64v8/Dockerfile
new file mode 100644
index 0000000000..55c1f28108
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.24-composite/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Composite Image
+FROM $REPO:8.0.27-alpine3.24-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.27 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/8.0/alpine3.24-extra/amd64/Dockerfile b/src/aspnet/8.0/alpine3.24-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..95bad24a28
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.24-extra/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Core image
+FROM $REPO:8.0.27-alpine3.24-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.24-extra/arm32v7/Dockerfile b/src/aspnet/8.0/alpine3.24-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..9827b357ff
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.24-extra/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Core image
+FROM $REPO:8.0.27-alpine3.24-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.24-extra/arm64v8/Dockerfile b/src/aspnet/8.0/alpine3.24-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..8463168109
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.24-extra/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Core image
+FROM $REPO:8.0.27-alpine3.24-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.24/amd64/Dockerfile b/src/aspnet/8.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..d612b2b910
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Core image
+FROM $REPO:8.0.27-alpine3.24-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.24/arm32v7/Dockerfile b/src/aspnet/8.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..98ab01a759
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Core image
+FROM $REPO:8.0.27-alpine3.24-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.24/arm64v8/Dockerfile b/src/aspnet/8.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..08e55ace65
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Core image
+FROM $REPO:8.0.27-alpine3.24-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.24-composite-extra/amd64/Dockerfile b/src/aspnet/9.0/alpine3.24-composite-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..90bce6b2b4
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.24-composite-extra/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Composite Image
+FROM $REPO:9.0.16-alpine3.24-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.16 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/9.0/alpine3.24-composite-extra/arm32v7/Dockerfile b/src/aspnet/9.0/alpine3.24-composite-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..5e5f1406f3
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.24-composite-extra/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Composite Image
+FROM $REPO:9.0.16-alpine3.24-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.16 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/9.0/alpine3.24-composite-extra/arm64v8/Dockerfile b/src/aspnet/9.0/alpine3.24-composite-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..b5c0ae734a
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.24-composite-extra/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Composite Image
+FROM $REPO:9.0.16-alpine3.24-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.16 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/9.0/alpine3.24-composite/amd64/Dockerfile b/src/aspnet/9.0/alpine3.24-composite/amd64/Dockerfile
new file mode 100644
index 0000000000..8ccc69faa5
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.24-composite/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Composite Image
+FROM $REPO:9.0.16-alpine3.24-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.16 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/9.0/alpine3.24-composite/arm32v7/Dockerfile b/src/aspnet/9.0/alpine3.24-composite/arm32v7/Dockerfile
new file mode 100644
index 0000000000..be3fa413b2
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.24-composite/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Composite Image
+FROM $REPO:9.0.16-alpine3.24-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.16 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/9.0/alpine3.24-composite/arm64v8/Dockerfile b/src/aspnet/9.0/alpine3.24-composite/arm64v8/Dockerfile
new file mode 100644
index 0000000000..622230bfdf
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.24-composite/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Composite Image
+FROM $REPO:9.0.16-alpine3.24-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.16 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/9.0/alpine3.24-extra/amd64/Dockerfile b/src/aspnet/9.0/alpine3.24-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..4404c9ea13
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.24-extra/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Core image
+FROM $REPO:9.0.16-alpine3.24-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.24-extra/arm32v7/Dockerfile b/src/aspnet/9.0/alpine3.24-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..9bd8b9bf53
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.24-extra/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Core image
+FROM $REPO:9.0.16-alpine3.24-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.24-extra/arm64v8/Dockerfile b/src/aspnet/9.0/alpine3.24-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..a103541c18
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.24-extra/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Core image
+FROM $REPO:9.0.16-alpine3.24-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.24/amd64/Dockerfile b/src/aspnet/9.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..9c80f5c32a
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Core image
+FROM $REPO:9.0.16-alpine3.24-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.24/arm32v7/Dockerfile b/src/aspnet/9.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..e4eec4dadd
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Core image
+FROM $REPO:9.0.16-alpine3.24-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.24/arm64v8/Dockerfile b/src/aspnet/9.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..26c52a11fa
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
+    && awk -v file="aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" '{gsub(/\r/, "")} $2 == file' $aspnetcore_version-sha.txt | 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_version-sha.txt
+
+
+# ASP.NET Core image
+FROM $REPO:9.0.16-alpine3.24-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/runtime-deps/10.0/alpine3.24-extra/amd64/Dockerfile b/src/runtime-deps/10.0/alpine3.24-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..5439f310c8
--- /dev/null
+++ b/src/runtime-deps/10.0/alpine3.24-extra/amd64/Dockerfile
@@ -0,0 +1,33 @@
+FROM amd64/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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/10.0/alpine3.24-extra/arm32v7/Dockerfile b/src/runtime-deps/10.0/alpine3.24-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..54a99ec253
--- /dev/null
+++ b/src/runtime-deps/10.0/alpine3.24-extra/arm32v7/Dockerfile
@@ -0,0 +1,33 @@
+FROM arm32v7/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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/10.0/alpine3.24-extra/arm64v8/Dockerfile b/src/runtime-deps/10.0/alpine3.24-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..0d1e2e9b99
--- /dev/null
+++ b/src/runtime-deps/10.0/alpine3.24-extra/arm64v8/Dockerfile
@@ -0,0 +1,33 @@
+FROM arm64v8/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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/10.0/alpine3.24/amd64/Dockerfile b/src/runtime-deps/10.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..0af1f38aca
--- /dev/null
+++ b/src/runtime-deps/10.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,32 @@
+FROM amd64/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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/10.0/alpine3.24/arm32v7/Dockerfile b/src/runtime-deps/10.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..9eece45d61
--- /dev/null
+++ b/src/runtime-deps/10.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,32 @@
+FROM arm32v7/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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/10.0/alpine3.24/arm64v8/Dockerfile b/src/runtime-deps/10.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..f5e1e5ab10
--- /dev/null
+++ b/src/runtime-deps/10.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,32 @@
+FROM arm64v8/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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.24-extra/amd64/Dockerfile b/src/runtime-deps/11.0/alpine3.24-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..5439f310c8
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.24-extra/amd64/Dockerfile
@@ -0,0 +1,33 @@
+FROM amd64/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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.24-extra/arm32v7/Dockerfile b/src/runtime-deps/11.0/alpine3.24-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..54a99ec253
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.24-extra/arm32v7/Dockerfile
@@ -0,0 +1,33 @@
+FROM arm32v7/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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.24-extra/arm64v8/Dockerfile b/src/runtime-deps/11.0/alpine3.24-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..0d1e2e9b99
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.24-extra/arm64v8/Dockerfile
@@ -0,0 +1,33 @@
+FROM arm64v8/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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.24/amd64/Dockerfile b/src/runtime-deps/11.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..0af1f38aca
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,32 @@
+FROM amd64/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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.24/arm32v7/Dockerfile b/src/runtime-deps/11.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..9eece45d61
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,32 @@
+FROM arm32v7/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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.24/arm64v8/Dockerfile b/src/runtime-deps/11.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..f5e1e5ab10
--- /dev/null
+++ b/src/runtime-deps/11.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,32 @@
+FROM arm64v8/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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/8.0/alpine3.24-extra/amd64/Dockerfile b/src/runtime-deps/8.0/alpine3.24-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..d3ac495342
--- /dev/null
+++ b/src/runtime-deps/8.0/alpine3.24-extra/amd64/Dockerfile
@@ -0,0 +1,31 @@
+FROM amd64/alpine:3.24
+
+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 \
+        zlib
+
+# 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/8.0/alpine3.24-extra/arm32v7/Dockerfile b/src/runtime-deps/8.0/alpine3.24-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..6a12136a7f
--- /dev/null
+++ b/src/runtime-deps/8.0/alpine3.24-extra/arm32v7/Dockerfile
@@ -0,0 +1,31 @@
+FROM arm32v7/alpine:3.24
+
+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 \
+        zlib
+
+# 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/8.0/alpine3.24-extra/arm64v8/Dockerfile b/src/runtime-deps/8.0/alpine3.24-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..6eee6ee8db
--- /dev/null
+++ b/src/runtime-deps/8.0/alpine3.24-extra/arm64v8/Dockerfile
@@ -0,0 +1,31 @@
+FROM arm64v8/alpine:3.24
+
+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 \
+        zlib
+
+# 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/8.0/alpine3.24/amd64/Dockerfile b/src/runtime-deps/8.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..e1fc682e71
--- /dev/null
+++ b/src/runtime-deps/8.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,30 @@
+FROM amd64/alpine:3.24
+
+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++ \
+        zlib
+
+# 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/8.0/alpine3.24/arm32v7/Dockerfile b/src/runtime-deps/8.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..c035b12a3f
--- /dev/null
+++ b/src/runtime-deps/8.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,30 @@
+FROM arm32v7/alpine:3.24
+
+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++ \
+        zlib
+
+# 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/8.0/alpine3.24/arm64v8/Dockerfile b/src/runtime-deps/8.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..9cb9994f66
--- /dev/null
+++ b/src/runtime-deps/8.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,30 @@
+FROM arm64v8/alpine:3.24
+
+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++ \
+        zlib
+
+# 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/9.0/alpine3.24-extra/amd64/Dockerfile b/src/runtime-deps/9.0/alpine3.24-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..5439f310c8
--- /dev/null
+++ b/src/runtime-deps/9.0/alpine3.24-extra/amd64/Dockerfile
@@ -0,0 +1,33 @@
+FROM amd64/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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/9.0/alpine3.24-extra/arm32v7/Dockerfile b/src/runtime-deps/9.0/alpine3.24-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..54a99ec253
--- /dev/null
+++ b/src/runtime-deps/9.0/alpine3.24-extra/arm32v7/Dockerfile
@@ -0,0 +1,33 @@
+FROM arm32v7/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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/9.0/alpine3.24-extra/arm64v8/Dockerfile b/src/runtime-deps/9.0/alpine3.24-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..0d1e2e9b99
--- /dev/null
+++ b/src/runtime-deps/9.0/alpine3.24-extra/arm64v8/Dockerfile
@@ -0,0 +1,33 @@
+FROM arm64v8/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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/9.0/alpine3.24/amd64/Dockerfile b/src/runtime-deps/9.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..0af1f38aca
--- /dev/null
+++ b/src/runtime-deps/9.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,32 @@
+FROM amd64/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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/9.0/alpine3.24/arm32v7/Dockerfile b/src/runtime-deps/9.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..9eece45d61
--- /dev/null
+++ b/src/runtime-deps/9.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,32 @@
+FROM arm32v7/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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/9.0/alpine3.24/arm64v8/Dockerfile b/src/runtime-deps/9.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..f5e1e5ab10
--- /dev/null
+++ b/src/runtime-deps/9.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,32 @@
+FROM arm64v8/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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/10.0/alpine3.24-extra/amd64/Dockerfile b/src/runtime/10.0/alpine3.24-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..2d06b87dfe
--- /dev/null
+++ b/src/runtime/10.0/alpine3.24-extra/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
+    && sha512sum -c dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/10.0/alpine3.24-extra/arm32v7/Dockerfile b/src/runtime/10.0/alpine3.24-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..fe7004e7cb
--- /dev/null
+++ b/src/runtime/10.0/alpine3.24-extra/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
+    && sha512sum -c dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/10.0/alpine3.24-extra/arm64v8/Dockerfile b/src/runtime/10.0/alpine3.24-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..2aef995084
--- /dev/null
+++ b/src/runtime/10.0/alpine3.24-extra/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
+    && sha512sum -c dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/10.0/alpine3.24/amd64/Dockerfile b/src/runtime/10.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..a327e9804a
--- /dev/null
+++ b/src/runtime/10.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
+    && sha512sum -c dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/10.0/alpine3.24/arm32v7/Dockerfile b/src/runtime/10.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..a4d003558a
--- /dev/null
+++ b/src/runtime/10.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
+    && sha512sum -c dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.8
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/10.0/alpine3.24/arm64v8/Dockerfile b/src/runtime/10.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..ac5e42d00a
--- /dev/null
+++ b/src/runtime/10.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.8 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
+    && sha512sum -c dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.8
+
+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.24-extra/amd64/Dockerfile b/src/runtime/11.0/alpine3.24-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..341837d266
--- /dev/null
+++ b/src/runtime/11.0/alpine3.24-extra/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.5.26302.115
+
+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.24-extra/arm32v7/Dockerfile b/src/runtime/11.0/alpine3.24-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..45e1b95d00
--- /dev/null
+++ b/src/runtime/11.0/alpine3.24-extra/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.5.26302.115
+
+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.24-extra/arm64v8/Dockerfile b/src/runtime/11.0/alpine3.24-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..810acb9e68
--- /dev/null
+++ b/src/runtime/11.0/alpine3.24-extra/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.5.26302.115
+
+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.24/amd64/Dockerfile b/src/runtime/11.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..c4fc13cfe9
--- /dev/null
+++ b/src/runtime/11.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.5.26302.115
+
+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.24/arm32v7/Dockerfile b/src/runtime/11.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..76f61faf25
--- /dev/null
+++ b/src/runtime/11.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.5.26302.115
+
+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.24/arm64v8/Dockerfile b/src/runtime/11.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..3ee40df189
--- /dev/null
+++ b/src/runtime/11.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-preview.5.26302.115 \
+    && 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.5-alpine3.24-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-preview.5.26302.115
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/8.0/alpine3.24-extra/amd64/Dockerfile b/src/runtime/8.0/alpine3.24-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..6f9f685c92
--- /dev/null
+++ b/src/runtime/8.0/alpine3.24-extra/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | 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_version-sha.txt
+
+
+# .NET runtime image
+FROM $REPO:8.0.27-alpine3.24-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/8.0/alpine3.24-extra/arm32v7/Dockerfile b/src/runtime/8.0/alpine3.24-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..e0994e9f48
--- /dev/null
+++ b/src/runtime/8.0/alpine3.24-extra/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | 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_version-sha.txt
+
+
+# .NET runtime image
+FROM $REPO:8.0.27-alpine3.24-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/8.0/alpine3.24-extra/arm64v8/Dockerfile b/src/runtime/8.0/alpine3.24-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..6d58a030ae
--- /dev/null
+++ b/src/runtime/8.0/alpine3.24-extra/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | 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_version-sha.txt
+
+
+# .NET runtime image
+FROM $REPO:8.0.27-alpine3.24-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/8.0/alpine3.24/amd64/Dockerfile b/src/runtime/8.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..8f5d777d05
--- /dev/null
+++ b/src/runtime/8.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | 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_version-sha.txt
+
+
+# .NET runtime image
+FROM $REPO:8.0.27-alpine3.24-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/8.0/alpine3.24/arm32v7/Dockerfile b/src/runtime/8.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..13146ab9e7
--- /dev/null
+++ b/src/runtime/8.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | 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_version-sha.txt
+
+
+# .NET runtime image
+FROM $REPO:8.0.27-alpine3.24-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/8.0/alpine3.24/arm64v8/Dockerfile b/src/runtime/8.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..e03c7811cd
--- /dev/null
+++ b/src/runtime/8.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | 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_version-sha.txt
+
+
+# .NET runtime image
+FROM $REPO:8.0.27-alpine3.24-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.27
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/9.0/alpine3.24-extra/amd64/Dockerfile b/src/runtime/9.0/alpine3.24-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..d08c0b33de
--- /dev/null
+++ b/src/runtime/9.0/alpine3.24-extra/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | 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_version-sha.txt
+
+
+# .NET runtime image
+FROM $REPO:9.0.16-alpine3.24-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/9.0/alpine3.24-extra/arm32v7/Dockerfile b/src/runtime/9.0/alpine3.24-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..59040bc5d0
--- /dev/null
+++ b/src/runtime/9.0/alpine3.24-extra/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | 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_version-sha.txt
+
+
+# .NET runtime image
+FROM $REPO:9.0.16-alpine3.24-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/9.0/alpine3.24-extra/arm64v8/Dockerfile b/src/runtime/9.0/alpine3.24-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..c9ff522d53
--- /dev/null
+++ b/src/runtime/9.0/alpine3.24-extra/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | 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_version-sha.txt
+
+
+# .NET runtime image
+FROM $REPO:9.0.16-alpine3.24-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/9.0/alpine3.24/amd64/Dockerfile b/src/runtime/9.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..de12b63598
--- /dev/null
+++ b/src/runtime/9.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | 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_version-sha.txt
+
+
+# .NET runtime image
+FROM $REPO:9.0.16-alpine3.24-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/9.0/alpine3.24/arm32v7/Dockerfile b/src/runtime/9.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..57b3b1372e
--- /dev/null
+++ b/src/runtime/9.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | 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_version-sha.txt
+
+
+# .NET runtime image
+FROM $REPO:9.0.16-alpine3.24-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/9.0/alpine3.24/arm64v8/Dockerfile b/src/runtime/9.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..9be646d73a
--- /dev/null
+++ b/src/runtime/9.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | 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_version-sha.txt
+
+
+# .NET runtime image
+FROM $REPO:9.0.16-alpine3.24-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.16
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/sdk/10.0/alpine3.24-aot/amd64/Dockerfile b/src/sdk/10.0/alpine3.24-aot/amd64/Dockerfile
new file mode 100644
index 0000000000..4701546bb0
--- /dev/null
+++ b/src/sdk/10.0/alpine3.24-aot/amd64/Dockerfile
@@ -0,0 +1,7 @@
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:10.0.300-alpine3.24-amd64
+
+RUN apk add --upgrade --no-cache \
+        build-base \
+        clang \
+        zlib-dev
diff --git a/src/sdk/10.0/alpine3.24-aot/arm64v8/Dockerfile b/src/sdk/10.0/alpine3.24-aot/arm64v8/Dockerfile
new file mode 100644
index 0000000000..ef8f4ff8b4
--- /dev/null
+++ b/src/sdk/10.0/alpine3.24-aot/arm64v8/Dockerfile
@@ -0,0 +1,7 @@
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:10.0.300-alpine3.24-arm64v8
+
+RUN apk add --upgrade --no-cache \
+        build-base \
+        clang \
+        zlib-dev
diff --git a/src/sdk/10.0/alpine3.24/amd64/Dockerfile b/src/sdk/10.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..79006dd32e
--- /dev/null
+++ b/src/sdk/10.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,68 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-amd64 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=10.0.300 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
+    && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-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=10.0.300 \
+    # 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.24 \
+    # 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.2 \
+    && 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='a6f152b23c3ab16676f173fc61d532b5853ccc92715cbcef02c2ffb92172e18d28a11b11b0bea0a939bb5d543e197cdce3c1162bc4a52ad96d91c6fe6664f830' \
+    && 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 \
+    && chmod 755 /usr/share/powershell/.store/powershell.linux.alpine/$powershell_version/powershell.linux.alpine/$powershell_version/tools/*/any/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/10.0/alpine3.24/arm32v7/Dockerfile b/src/sdk/10.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..634fbd77df
--- /dev/null
+++ b/src/sdk/10.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,47 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-arm32v7 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=10.0.300 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
+    && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-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=10.0.300 \
+    # 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/10.0/alpine3.24/arm64v8/Dockerfile b/src/sdk/10.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..bd65c6186a
--- /dev/null
+++ b/src/sdk/10.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,47 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:10.0.8-alpine3.24-arm64v8 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=10.0.300 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
+    && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
+    && 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:10.0.8-alpine3.24-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=10.0.300 \
+    # 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
index 03e6d3c837..d3737afcb4 100644
--- a/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile
+++ b/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile
@@ -2,6 +2,6 @@ ARG REPO=mcr.microsoft.com/dotnet/sdk
 FROM $REPO:11.0.100-preview.5-alpine3.23-amd64
 
 RUN apk add --upgrade --no-cache \
-        build-base \
-        clang \
+        gcc \
+        musl-dev \
         zlib-dev
diff --git a/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile
index 317c915362..6d6d9872be 100644
--- a/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile
+++ b/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile
@@ -2,6 +2,6 @@ ARG REPO=mcr.microsoft.com/dotnet/sdk
 FROM $REPO:11.0.100-preview.5-alpine3.23-arm64v8
 
 RUN apk add --upgrade --no-cache \
-        build-base \
-        clang \
+        gcc \
+        musl-dev \
         zlib-dev
diff --git a/src/sdk/11.0/alpine3.24-aot/amd64/Dockerfile b/src/sdk/11.0/alpine3.24-aot/amd64/Dockerfile
new file mode 100644
index 0000000000..5778984a7e
--- /dev/null
+++ b/src/sdk/11.0/alpine3.24-aot/amd64/Dockerfile
@@ -0,0 +1,7 @@
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:11.0.100-preview.5-alpine3.24-amd64
+
+RUN apk add --upgrade --no-cache \
+        gcc \
+        musl-dev \
+        zlib-dev
diff --git a/src/sdk/11.0/alpine3.24-aot/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.24-aot/arm64v8/Dockerfile
new file mode 100644
index 0000000000..cc118dbb7b
--- /dev/null
+++ b/src/sdk/11.0/alpine3.24-aot/arm64v8/Dockerfile
@@ -0,0 +1,7 @@
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:11.0.100-preview.5-alpine3.24-arm64v8
+
+RUN apk add --upgrade --no-cache \
+        gcc \
+        musl-dev \
+        zlib-dev
diff --git a/src/sdk/11.0/alpine3.24/amd64/Dockerfile b/src/sdk/11.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..24d97d3cba
--- /dev/null
+++ b/src/sdk/11.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,68 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-amd64 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=11.0.100-preview.5.26302.115 \
+    && 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.5-alpine3.24-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.5.26302.115 \
+    # 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.24 \
+    # 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.7.0-preview.2 \
+    && 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='4eba9c9b057620bef0b33d01e04b2d448d6c95896a27d4659c3b173e989f7c900e204b9b987d0587bc8941015f75a4bc2ab8f8cec6dd2e9860ffc02b98b72f62' \
+    && 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 \
+    && chmod 755 /usr/share/powershell/.store/powershell.linux.alpine/$powershell_version/powershell.linux.alpine/$powershell_version/tools/*/any/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.24/arm32v7/Dockerfile b/src/sdk/11.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..d49ae45e30
--- /dev/null
+++ b/src/sdk/11.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,47 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-arm32v7 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=11.0.100-preview.5.26302.115 \
+    && 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.5-alpine3.24-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.5.26302.115 \
+    # 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.24/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..dbdeeb71a7
--- /dev/null
+++ b/src/sdk/11.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,47 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:11.0.0-preview.5-alpine3.24-arm64v8 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=11.0.100-preview.5.26302.115 \
+    && 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.5-alpine3.24-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.5.26302.115 \
+    # 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
index 39f6b2567c..4dd191eb83 100644
--- a/src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile
+++ b/src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile
@@ -2,7 +2,8 @@ ARG REPO=mcr.microsoft.com/dotnet/sdk
 FROM $REPO:11.0.100-preview.5-azurelinux3.0-amd64
 
 RUN tdnf install -y \
-        build-essential \
-        clang \
+        binutils \
+        gcc \
+        glibc-devel \
         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
index cebb3e9677..0c64264c3e 100644
--- a/src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile
+++ b/src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile
@@ -2,7 +2,8 @@ ARG REPO=mcr.microsoft.com/dotnet/sdk
 FROM $REPO:11.0.100-preview.5-azurelinux3.0-arm64v8
 
 RUN tdnf install -y \
-        build-essential \
-        clang \
+        binutils \
+        gcc \
+        glibc-devel \
         zlib-devel \
     && tdnf clean all
diff --git a/src/sdk/11.0/resolute-aot/amd64/Dockerfile b/src/sdk/11.0/resolute-aot/amd64/Dockerfile
index ef7cab079a..cdaf6c1ffe 100644
--- a/src/sdk/11.0/resolute-aot/amd64/Dockerfile
+++ b/src/sdk/11.0/resolute-aot/amd64/Dockerfile
@@ -3,7 +3,6 @@ FROM $REPO:11.0.100-preview.5-resolute-amd64
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        clang \
-        llvm \
+        gcc \
         zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
diff --git a/src/sdk/11.0/resolute-aot/arm64v8/Dockerfile b/src/sdk/11.0/resolute-aot/arm64v8/Dockerfile
index b736ae2dca..8243e1c3a7 100644
--- a/src/sdk/11.0/resolute-aot/arm64v8/Dockerfile
+++ b/src/sdk/11.0/resolute-aot/arm64v8/Dockerfile
@@ -3,7 +3,6 @@ FROM $REPO:11.0.100-preview.5-resolute-arm64v8
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        clang \
-        llvm \
+        gcc \
         zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
diff --git a/src/sdk/8.0/alpine3.24/amd64/Dockerfile b/src/sdk/8.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..1711eb7bb0
--- /dev/null
+++ b/src/sdk/8.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,65 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-amd64 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=8.0.421 \
+    && dotnet_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | sha512sum -c \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        $dotnet_version-sha.txt
+
+
+# .NET SDK image
+FROM $REPO:8.0.27-alpine3.24-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=8.0.421 \
+    # 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.24
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=7.4.16 \
+    && 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='5b9f1362121a45fc06a89a58b28b66fff85fd1c1236e9df5e20f1eb44e6a480b01769874e88156972fd6b33719fa98fb7a6dae72073e37a2f87f6da1127d3988' \
+    && 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 \
+    && chmod 755 /usr/share/powershell/.store/powershell.linux.alpine/$powershell_version/powershell.linux.alpine/$powershell_version/tools/*/any/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/8.0/alpine3.24/arm32v7/Dockerfile b/src/sdk/8.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..2b7247336f
--- /dev/null
+++ b/src/sdk/8.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,48 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-arm32v7 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=8.0.421 \
+    && dotnet_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | sha512sum -c \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        $dotnet_version-sha.txt
+
+
+# .NET SDK image
+FROM $REPO:8.0.27-alpine3.24-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=8.0.421 \
+    # 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.24-arm32
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/src/sdk/8.0/alpine3.24/arm64v8/Dockerfile b/src/sdk/8.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..dd54a20f4e
--- /dev/null
+++ b/src/sdk/8.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,48 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:8.0.27-alpine3.24-arm64v8 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=8.0.421 \
+    && dotnet_version=8.0.27 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | sha512sum -c \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        $dotnet_version-sha.txt
+
+
+# .NET SDK image
+FROM $REPO:8.0.27-alpine3.24-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=8.0.421 \
+    # 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.24-arm64
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/src/sdk/9.0/alpine3.24/amd64/Dockerfile b/src/sdk/9.0/alpine3.24/amd64/Dockerfile
new file mode 100644
index 0000000000..2755570038
--- /dev/null
+++ b/src/sdk/9.0/alpine3.24/amd64/Dockerfile
@@ -0,0 +1,66 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-amd64 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=9.0.314 \
+    && dotnet_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | sha512sum -c \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
+        $dotnet_version-sha.txt
+
+
+# .NET SDK image
+FROM $REPO:9.0.16-alpine3.24-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=9.0.314 \
+    # 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.24
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
+
+# Install PowerShell global tool
+RUN powershell_version=7.5.7 \
+    && 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='c672bac9f736e794cd586195c87fcb6f26468cc49c1ec835cfcf25c79daeaef934b5d92bc0ce092cd02cc0a5b8d933e94dead0aa850a7b7f77afbec8338331fd' \
+    && 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 \
+    && chmod 755 /usr/share/powershell/.store/powershell.linux.alpine/$powershell_version/powershell.linux.alpine/$powershell_version/tools/*/any/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/9.0/alpine3.24/arm32v7/Dockerfile b/src/sdk/9.0/alpine3.24/arm32v7/Dockerfile
new file mode 100644
index 0000000000..f7bf44e655
--- /dev/null
+++ b/src/sdk/9.0/alpine3.24/arm32v7/Dockerfile
@@ -0,0 +1,49 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-arm32v7 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=9.0.314 \
+    && dotnet_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | sha512sum -c \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
+        $dotnet_version-sha.txt
+
+
+# .NET SDK image
+FROM $REPO:9.0.16-alpine3.24-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=9.0.314 \
+    # 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.24-arm32
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/src/sdk/9.0/alpine3.24/arm64v8/Dockerfile b/src/sdk/9.0/alpine3.24/arm64v8/Dockerfile
new file mode 100644
index 0000000000..77097d0d0d
--- /dev/null
+++ b/src/sdk/9.0/alpine3.24/arm64v8/Dockerfile
@@ -0,0 +1,49 @@
+ARG REPO=mcr.microsoft.com/dotnet/aspnet
+# Installer image
+FROM $REPO:9.0.16-alpine3.24-arm64v8 AS installer
+
+# Install .NET SDK
+RUN dotnet_sdk_version=9.0.314 \
+    && dotnet_version=9.0.16 \
+    && wget \
+        https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
+    && awk -v file="dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" '{gsub(/\r/, "")} $2 == file' $dotnet_version-sha.txt | sha512sum -c \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
+        $dotnet_version-sha.txt
+
+
+# .NET SDK image
+FROM $REPO:9.0.16-alpine3.24-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=9.0.314 \
+    # 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.24-arm64
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..b2ca3ee297
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-amd64-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_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-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..12688d7eec
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_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-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..f967e3af3f
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_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-10.0-alpine3.24-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..87fd5fdd84
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-amd64-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_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-10.0-alpine3.24-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..7719a1d651
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_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-10.0-alpine3.24-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..682d9ce905
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_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-10.0-alpine3.24-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..b365473445
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-10.0-alpine3.24-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..5d06d18f20
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-10.0-alpine3.24-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..024288bffc
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-composite-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-10.0-alpine3.24-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..083cff3684
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-alpine3.XX-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-10.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..6334113bba
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-alpine3.XX-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-10.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..f227a8ada9
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-alpine3.XX-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-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-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.24-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.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-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.24-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.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-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.24-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.24-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-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.24-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.24-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-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.24-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.24-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-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.24-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.24-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-composite-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..e0b5d64300
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-composite-extra-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-extra-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-extra-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.24-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-composite-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..a14ff3c1ee
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-composite-extra-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-extra-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-extra-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.24-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-composite-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..a0c2ff4a9d
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-composite-extra-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-extra-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-extra-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.24-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..9ad16a77c0
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-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-alpine3.24-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..943c45a2c4
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-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-alpine3.24-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..3c5e0d5f4a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-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-8.0-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..b2ca3ee297
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-amd64-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_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-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..12688d7eec
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_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-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..f967e3af3f
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_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-8.0-alpine3.24-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..87fd5fdd84
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-amd64-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_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-8.0-alpine3.24-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..7719a1d651
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_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-8.0-alpine3.24-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..682d9ce905
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_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-8.0-alpine3.24-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..b365473445
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-8.0-alpine3.24-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..5d06d18f20
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-8.0-alpine3.24-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..024288bffc
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-composite-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-8.0-alpine3.24-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..083cff3684
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-alpine3.XX-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-8.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..6334113bba
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-alpine3.XX-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-8.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..f227a8ada9
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-alpine3.XX-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-9.0-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..b2ca3ee297
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-amd64-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_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-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..12688d7eec
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_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-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..f967e3af3f
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_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-9.0-alpine3.24-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..87fd5fdd84
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-amd64-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_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-9.0-alpine3.24-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..7719a1d651
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_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-9.0-alpine3.24-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..682d9ce905
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+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 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_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-9.0-alpine3.24-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..b365473445
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-9.0-alpine3.24-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..5d06d18f20
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-9.0-alpine3.24-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..024288bffc
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-composite-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-9.0-alpine3.24-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..083cff3684
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-alpine3.XX-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-9.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..6334113bba
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-alpine3.XX-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-9.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..f227a8ada9
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,28 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=0.0.0 \
+    && aspnetcore_build_version=$aspnetcore_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_build_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:0.0.0-alpine3.XX-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/runtime-10.0-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..9ab3010977
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-amd64-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+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 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz \
+        dotnet-runtime-$dotnet_build_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-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..983a5c601c
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+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 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz \
+        dotnet-runtime-$dotnet_build_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-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..5775e40d95
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+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 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz \
+        dotnet-runtime-$dotnet_build_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-10.0-alpine3.24-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..3309448447
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz \
+        dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-10.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..fe1825c0bc
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-10.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..3936098cd0
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-alpine3.XX-extra-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.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.24-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.24-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.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.24-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.24-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.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.24-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.24-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.24-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..970977d515
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.24-extra-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-extra-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-extra-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.24-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..319ebb6062
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.24-extra-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-extra-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-extra-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.24-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..aa51503f49
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.24-extra-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-extra-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-extra-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-8.0-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..9ab3010977
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-amd64-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+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 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz \
+        dotnet-runtime-$dotnet_build_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-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..983a5c601c
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+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 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz \
+        dotnet-runtime-$dotnet_build_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-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..5775e40d95
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+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 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz \
+        dotnet-runtime-$dotnet_build_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-8.0-alpine3.24-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..3309448447
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz \
+        dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-8.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..fe1825c0bc
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-8.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..3936098cd0
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-9.0-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..9ab3010977
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-amd64-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+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 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz \
+        dotnet-runtime-$dotnet_build_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-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..983a5c601c
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+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 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz \
+        dotnet-runtime-$dotnet_build_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-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..5775e40d95
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+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 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz \
+        dotnet-runtime-$dotnet_build_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-9.0-alpine3.24-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..3309448447
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-amd64 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz \
+        dotnet-runtime-$dotnet_build_version-linux-musl-x64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-9.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..fe1825c0bc
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm32v7 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-9.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..3936098cd0
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:0.0.0-alpine3.XX-extra-arm64v8 AS installer
+
+ARG ACCESSTOKEN
+
+# Retrieve .NET Runtime
+RUN dotnet_version=0.0.0 \
+    && dotnet_build_version=$dotnet_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz \
+        dotnet-runtime-$dotnet_build_version-linux-musl-arm64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:0.0.0-alpine3.XX-extra-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-deps-10.0-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..0af1f38aca
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-amd64-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+FROM amd64/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..9eece45d61
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+FROM arm32v7/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..f5e1e5ab10
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+FROM arm64v8/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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-10.0-alpine3.24-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..5439f310c8
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+FROM amd64/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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-10.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..54a99ec253
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+FROM arm32v7/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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-10.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..0d1e2e9b99
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+FROM arm64v8/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..0af1f38aca
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-amd64-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+FROM amd64/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..9eece45d61
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+FROM arm32v7/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..f5e1e5ab10
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+FROM arm64v8/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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.24-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..5439f310c8
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+FROM amd64/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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.24-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..54a99ec253
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+FROM arm32v7/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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.24-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..0d1e2e9b99
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+FROM arm64v8/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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-8.0-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..e1fc682e71
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-amd64-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+FROM amd64/alpine:3.24
+
+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++ \
+        zlib
+
+# 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-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..c035b12a3f
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+FROM arm32v7/alpine:3.24
+
+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++ \
+        zlib
+
+# 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-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..9cb9994f66
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,30 @@
+FROM arm64v8/alpine:3.24
+
+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++ \
+        zlib
+
+# 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-8.0-alpine3.24-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..d3ac495342
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,31 @@
+FROM amd64/alpine:3.24
+
+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 \
+        zlib
+
+# 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-8.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..6a12136a7f
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,31 @@
+FROM arm32v7/alpine:3.24
+
+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 \
+        zlib
+
+# 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-8.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..6eee6ee8db
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,31 @@
+FROM arm64v8/alpine:3.24
+
+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 \
+        zlib
+
+# 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-9.0-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..0af1f38aca
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-amd64-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+FROM amd64/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..9eece45d61
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+FROM arm32v7/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..f5e1e5ab10
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,32 @@
+FROM arm64v8/alpine:3.24
+
+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++ \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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-9.0-alpine3.24-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..5439f310c8
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-extra-amd64-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+FROM amd64/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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-9.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..54a99ec253
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-extra-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+FROM arm32v7/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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-9.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..0d1e2e9b99
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.24-extra-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,33 @@
+FROM arm64v8/alpine:3.24
+
+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 \
+        \
+        # manually update zlib from alpine base image
+        zlib
+
+# 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/sdk-10.0-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..bd38e7b178
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-amd64-Dockerfile.approved.txt
@@ -0,0 +1,71 @@
+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 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_build_version-linux-musl-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_build_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_build_version-linux-musl-x64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_build_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.24 \
+    # 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 \
+    && chmod 755 /usr/share/powershell/.store/powershell.linux.alpine/$powershell_version/powershell.linux.alpine/$powershell_version/tools/*/any/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-10.0-alpine3.24-aot-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-aot-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..1e41f1a95a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-aot-amd64-Dockerfile.approved.txt
@@ -0,0 +1,7 @@
+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-10.0-alpine3.24-aot-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-aot-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..08b5490921
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-aot-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,7 @@
+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-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..c5ca252037
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,50 @@
+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 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm.tar.gz \
+        dotnet-sdk-$dotnet_sdk_build_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-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..59244a1190
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,50 @@
+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 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_build_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-aot-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-aot-amd64-Dockerfile.approved.txt
index 1e41f1a95a..38c0f13dfc 100644
--- 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
@@ -2,6 +2,6 @@ ARG REPO=mcr.microsoft.com/dotnet/sdk
 FROM $REPO:0.0.0-alpine3.XX-amd64
 
 RUN apk add --upgrade --no-cache \
-        build-base \
-        clang \
+        gcc \
+        musl-dev \
         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
index 08b5490921..76c6fb7d0b 100644
--- 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
@@ -2,6 +2,6 @@ ARG REPO=mcr.microsoft.com/dotnet/sdk
 FROM $REPO:0.0.0-alpine3.XX-arm64v8
 
 RUN apk add --upgrade --no-cache \
-        build-base \
-        clang \
+        gcc \
+        musl-dev \
         zlib-dev
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..117ae7265a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-amd64-Dockerfile.approved.txt
@@ -0,0 +1,70 @@
+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.24 \
+    # 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 \
+    && chmod 755 /usr/share/powershell/.store/powershell.linux.alpine/$powershell_version/powershell.linux.alpine/$powershell_version/tools/*/any/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.24-aot-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-aot-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..38c0f13dfc
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-aot-amd64-Dockerfile.approved.txt
@@ -0,0 +1,7 @@
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:0.0.0-alpine3.XX-amd64
+
+RUN apk add --upgrade --no-cache \
+        gcc \
+        musl-dev \
+        zlib-dev
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-aot-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-aot-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..76c6fb7d0b
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-aot-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,7 @@
+ARG REPO=mcr.microsoft.com/dotnet/sdk
+FROM $REPO:0.0.0-alpine3.XX-arm64v8
+
+RUN apk add --upgrade --no-cache \
+        gcc \
+        musl-dev \
+        zlib-dev
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-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.24-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.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-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.24-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-aot-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-aot-amd64-Dockerfile.approved.txt
index 9f786aa5b2..a1c8544cd0 100644
--- 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
@@ -2,7 +2,8 @@ ARG REPO=mcr.microsoft.com/dotnet/sdk
 FROM $REPO:0.0.0-azurelinux3.0-amd64
 
 RUN tdnf install -y \
-        build-essential \
-        clang \
+        binutils \
+        gcc \
+        glibc-devel \
         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
index a571885bdc..04105723a9 100644
--- 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
@@ -2,7 +2,8 @@ ARG REPO=mcr.microsoft.com/dotnet/sdk
 FROM $REPO:0.0.0-azurelinux3.0-arm64v8
 
 RUN tdnf install -y \
-        build-essential \
-        clang \
+        binutils \
+        gcc \
+        glibc-devel \
         zlib-devel \
     && tdnf clean all
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 46cc956529..db9d3bfebf 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
@@ -3,7 +3,6 @@ FROM $REPO:0.0.0-resolute-amd64
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        clang \
-        llvm \
+        gcc \
         zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
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 3f7a45495a..eed7e06c54 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
@@ -3,7 +3,6 @@ FROM $REPO:0.0.0-resolute-arm64v8
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        clang \
-        llvm \
+        gcc \
         zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-alpine3.24-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..d6d763c4ea
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-alpine3.24-amd64-Dockerfile.approved.txt
@@ -0,0 +1,67 @@
+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 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_build_version-linux-musl-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_build_version-linux-musl-x64.tar.gz --directory /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_build_version-linux-musl-x64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_build_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.24
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN 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 \
+    && chmod 755 /usr/share/powershell/.store/powershell.linux.alpine/$powershell_version/powershell.linux.alpine/$powershell_version/tools/*/any/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-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..88db701ff9
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-alpine3.24-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,50 @@
+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 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm.tar.gz --directory /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm.tar.gz \
+        dotnet-sdk-$dotnet_sdk_build_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 \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.24-arm32
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..ba4033657a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-alpine3.24-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,50 @@
+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 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm64.tar.gz --directory /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_build_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 \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.24-arm64
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-alpine3.24-amd64-Dockerfile.approved.txt
new file mode 100644
index 0000000000..0b2f6afbf8
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-alpine3.24-amd64-Dockerfile.approved.txt
@@ -0,0 +1,68 @@
+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 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version \
+    && 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_build_version-linux-musl-x64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_build_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_build_version-linux-musl-x64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_build_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_build_version-linux-musl-x64.tar.gz --directory /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_build_version-linux-musl-x64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_build_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.24
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN 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 \
+    && chmod 755 /usr/share/powershell/.store/powershell.linux.alpine/$powershell_version/powershell.linux.alpine/$powershell_version/tools/*/any/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-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt
new file mode 100644
index 0000000000..8c7e9be1fc
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-alpine3.24-arm32v7-Dockerfile.approved.txt
@@ -0,0 +1,51 @@
+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 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version \
+    && 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_build_version-linux-musl-arm.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm.tar.gz --directory /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm.tar.gz \
+        dotnet-sdk-$dotnet_sdk_build_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 \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.24-arm32
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt
new file mode 100644
index 0000000000..96b3cca49a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-alpine3.24-arm64v8-Dockerfile.approved.txt
@@ -0,0 +1,51 @@
+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 \
+    && dotnet_sdk_build_version=$dotnet_sdk_version \
+    && 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_build_version-linux-musl-arm64.tar.gz \
+        https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm64.tar.gz.sha512)  dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm64.tar.gz --directory /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
+    && rm \
+        dotnet-sdk-$dotnet_sdk_build_version-linux-musl-arm64.tar.gz \
+        dotnet-sdk-$dotnet_sdk_build_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 \
+    # PowerShell telemetry for docker image usage
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.24-arm64
+
+RUN apk add --upgrade --no-cache \
+        curl \
+        git \
+        icu-data-full \
+        icu-libs \
+        libatomic \
+        tzdata
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+# Trigger first run experience by running arbitrary cmd
+RUN dotnet help
diff --git a/tests/Microsoft.DotNet.Docker.Tests/OS.cs b/tests/Microsoft.DotNet.Docker.Tests/OS.cs
index 276678ada3..ff36cbec5f 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/OS.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/OS.cs
@@ -17,6 +17,7 @@ internal static class OS
     // Alpine
     public static OSInfo AlpineFloating { get; } = new(OSType.Linux, OSFamily.Alpine, "");
     public static OSInfo Alpine323 { get; } = AlpineFloating with { Version = "3.23" };
+    public static OSInfo Alpine324 { get; } = AlpineFloating with { Version = "3.24" };
 
     // Azure Linux
     public static OSInfo AzureLinux30 { get; } = new(OSType.Linux, OSFamily.AzureLinux, "3.0");
diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
index cebcb785f2..e5ee67d8f2 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
@@ -34,12 +34,19 @@ public static class TestData
             new ProductImageData { Version = V8_0, OS = OS.NobleChiseled,       Arch = Arch.Amd64,   SdkOS = OS.Noble,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.Alpine323,           Arch = Arch.Amd64 },
+            new ProductImageData { Version = V8_0, OS = OS.Alpine324,           Arch = Arch.Amd64 },
             new ProductImageData { Version = V8_0, OS = OS.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V8_0, OS = OS.Alpine324,           Arch = Arch.Amd64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V8_0, OS = OS.Alpine324,           Arch = Arch.Amd64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V8_0, OS = OS.Alpine324,           Arch = Arch.Amd64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.AzureLinux30,           Arch = Arch.Amd64 },
             new ProductImageData { Version = V8_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Amd64,   SdkOS = OS.AzureLinux30 },
             new ProductImageData { Version = V8_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Amd64,   SdkOS = OS.AzureLinux30,
@@ -75,12 +82,19 @@ public static class TestData
             new ProductImageData { Version = V8_0, OS = OS.NobleChiseled,       Arch = Arch.Arm64,   SdkOS = OS.Noble,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.Alpine323,           Arch = Arch.Arm64 },
+            new ProductImageData { Version = V8_0, OS = OS.Alpine324,           Arch = Arch.Arm64 },
             new ProductImageData { Version = V8_0, OS = OS.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V8_0, OS = OS.Alpine324,           Arch = Arch.Arm64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V8_0, OS = OS.Alpine324,           Arch = Arch.Arm64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V8_0, OS = OS.Alpine324,           Arch = Arch.Arm64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
 
             new ProductImageData { Version = V8_0, OS = OS.BookwormSlim,        Arch = Arch.Arm },
             new ProductImageData { Version = V8_0, OS = OS.Jammy,               Arch = Arch.Arm },
@@ -92,12 +106,19 @@ public static class TestData
             new ProductImageData { Version = V8_0, OS = OS.JammyChiseled,       Arch = Arch.Arm,     SdkOS = OS.Jammy,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.Alpine323,           Arch = Arch.Arm },
+            new ProductImageData { Version = V8_0, OS = OS.Alpine324,           Arch = Arch.Arm },
             new ProductImageData { Version = V8_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V8_0, OS = OS.Alpine324,           Arch = Arch.Arm,     SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V8_0, OS = OS.Alpine324,           Arch = Arch.Arm,     SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V8_0, OS = OS.Alpine324,           Arch = Arch.Arm,     SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
 
             new ProductImageData { Version = V9_0, OS = OS.BookwormSlim,        Arch = Arch.Amd64 },
             new ProductImageData { Version = V9_0, OS = OS.Noble,               Arch = Arch.Amd64 },
@@ -110,12 +131,19 @@ public static class TestData
             new ProductImageData { Version = V9_0, OS = OS.NobleChiseled,       Arch = Arch.Amd64,   SdkOS = OS.Noble,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.Alpine323,           Arch = Arch.Amd64 },
+            new ProductImageData { Version = V9_0, OS = OS.Alpine324,           Arch = Arch.Amd64 },
             new ProductImageData { Version = V9_0, OS = OS.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V9_0, OS = OS.Alpine324,           Arch = Arch.Amd64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V9_0, OS = OS.Alpine324,           Arch = Arch.Amd64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V9_0, OS = OS.Alpine324,           Arch = Arch.Amd64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.AzureLinux30,           Arch = Arch.Amd64 },
             new ProductImageData { Version = V9_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Amd64,   SdkOS = OS.AzureLinux30 },
             new ProductImageData { Version = V9_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Amd64,   SdkOS = OS.AzureLinux30,
@@ -143,21 +171,35 @@ public static class TestData
             new ProductImageData { Version = V9_0, OS = OS.NobleChiseled,       Arch = Arch.Arm64,   SdkOS = OS.Noble,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.Alpine323,           Arch = Arch.Arm64 },
+            new ProductImageData { Version = V9_0, OS = OS.Alpine324,           Arch = Arch.Arm64 },
             new ProductImageData { Version = V9_0, OS = OS.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V9_0, OS = OS.Alpine324,           Arch = Arch.Arm64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V9_0, OS = OS.Alpine324,           Arch = Arch.Arm64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V9_0, OS = OS.Alpine324,           Arch = Arch.Arm64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
 
             new ProductImageData { Version = V9_0, OS = OS.BookwormSlim,        Arch = Arch.Arm },
             new ProductImageData { Version = V9_0, OS = OS.Alpine323,           Arch = Arch.Arm },
+            new ProductImageData { Version = V9_0, OS = OS.Alpine324,           Arch = Arch.Arm },
             new ProductImageData { Version = V9_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V9_0, OS = OS.Alpine324,           Arch = Arch.Arm,     SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V9_0, OS = OS.Alpine324,           Arch = Arch.Arm,     SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V9_0, OS = OS.Alpine324,           Arch = Arch.Arm,     SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.Noble,               Arch = Arch.Arm },
             new ProductImageData { Version = V9_0, OS = OS.NobleChiseled,       Arch = Arch.Arm,     SdkOS = OS.Noble },
             new ProductImageData { Version = V9_0, OS = OS.NobleChiseled,       Arch = Arch.Arm,     SdkOS = OS.Noble,
@@ -176,12 +218,19 @@ public static class TestData
             new ProductImageData { Version = V10_0, OS = OS.NobleChiseled,       Arch = Arch.Amd64,   SdkOS = OS.Noble,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.Alpine323,           Arch = Arch.Amd64 },
+            new ProductImageData { Version = V10_0, OS = OS.Alpine324,           Arch = Arch.Amd64 },
             new ProductImageData { Version = V10_0, OS = OS.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V10_0, OS = OS.Alpine324,           Arch = Arch.Amd64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V10_0, OS = OS.Alpine324,           Arch = Arch.Amd64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V10_0, OS = OS.Alpine324,           Arch = Arch.Amd64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.AzureLinux30,           Arch = Arch.Amd64 },
             new ProductImageData { Version = V10_0, OS = OS.AzureLinux40,           Arch = Arch.Amd64 },
             new ProductImageData { Version = V10_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Amd64,   SdkOS = OS.AzureLinux30 },
@@ -200,6 +249,7 @@ public static class TestData
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
 
             new() { Version = V10_0, Arch = Arch.Amd64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine323 },
+            new() { Version = V10_0, Arch = Arch.Amd64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine324 },
             new() { Version = V10_0, Arch = Arch.Amd64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.AzureLinux30Distroless, SdkOS = OS.AzureLinux30 },
             new() { Version = V10_0, Arch = Arch.Amd64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.AzureLinux40Distroless, SdkOS = OS.AzureLinux40 },
             new() { Version = V10_0, Arch = Arch.Amd64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.NobleChiseled, SdkOS = OS.Noble },
@@ -238,14 +288,22 @@ public static class TestData
             new ProductImageData { Version = V10_0, OS = OS.NobleChiseled,       Arch = Arch.Arm64,   SdkOS = OS.Noble,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.Alpine323,           Arch = Arch.Arm64 },
+            new ProductImageData { Version = V10_0, OS = OS.Alpine324,           Arch = Arch.Arm64 },
             new ProductImageData { Version = V10_0, OS = OS.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V10_0, OS = OS.Alpine324,           Arch = Arch.Arm64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V10_0, OS = OS.Alpine324,           Arch = Arch.Arm64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V10_0, OS = OS.Alpine324,           Arch = Arch.Arm64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
 
             new() { Version = V10_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine323 },
+            new() { Version = V10_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine324 },
             new() { Version = V10_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.AzureLinux30Distroless, SdkOS = OS.AzureLinux30 },
             new() { Version = V10_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.AzureLinux40Distroless, SdkOS = OS.AzureLinux40 },
             new() { Version = V10_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.NobleChiseled, SdkOS = OS.Noble },
@@ -260,12 +318,19 @@ public static class TestData
             new() { Version = V10_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.ResoluteChiseled, SdkOS = OS.Resolute },
 
             new ProductImageData { Version = V10_0, OS = OS.Alpine323,           Arch = Arch.Arm },
+            new ProductImageData { Version = V10_0, OS = OS.Alpine324,           Arch = Arch.Arm },
             new ProductImageData { Version = V10_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V10_0, OS = OS.Alpine324,           Arch = Arch.Arm,     SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V10_0, OS = OS.Alpine324,           Arch = Arch.Arm,     SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V10_0, OS = OS.Alpine324,           Arch = Arch.Arm,     SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.Noble,               Arch = Arch.Arm },
             new ProductImageData { Version = V10_0, OS = OS.NobleChiseled,       Arch = Arch.Arm,     SdkOS = OS.Noble },
             new ProductImageData { Version = V10_0, OS = OS.NobleChiseled,       Arch = Arch.Arm,     SdkOS = OS.Noble,
@@ -293,12 +358,19 @@ public static class TestData
             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.Alpine323,           Arch = Arch.Amd64 },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine324,           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.Alpine324,           Arch = Arch.Amd64,   SdkOS = OS.Alpine324,
+                    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 | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine324,           Arch = Arch.Amd64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine324,           Arch = Arch.Amd64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.AzureLinux30,           Arch = Arch.Amd64 },
             new ProductImageData { Version = V11_0, OS = OS.AzureLinux40,           Arch = Arch.Amd64 },
             new ProductImageData { Version = V11_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Amd64,   SdkOS = OS.AzureLinux30 },
@@ -317,6 +389,7 @@ public static class TestData
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
 
             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.Alpine324 },
             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.AzureLinux40Distroless, SdkOS = OS.AzureLinux40 },
             new() { Version = V11_0, Arch = Arch.Amd64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.ResoluteChiseled, SdkOS = OS.Resolute },
@@ -347,26 +420,41 @@ public static class TestData
             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.Alpine323,           Arch = Arch.Arm64 },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine324,           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.Alpine324,           Arch = Arch.Arm64,   SdkOS = OS.Alpine324,
+                    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 | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine324,           Arch = Arch.Arm64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine324,           Arch = Arch.Arm64,   SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
 
             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.Alpine324 },
             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.AzureLinux40Distroless, SdkOS = OS.AzureLinux40 },
             new() { Version = V11_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.ResoluteChiseled, SdkOS = OS.Resolute },
 
             // .NET 11 Linux Arm32
             new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine324,           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.Alpine324,           Arch = Arch.Arm,     SdkOS = OS.Alpine324,
+                    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 | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine324,           Arch = Arch.Arm,     SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V11_0, OS = OS.Alpine324,           Arch = Arch.Arm,     SdkOS = OS.Alpine324,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             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,

From 2159a25cb35f00e091fd7750410240d7fd6e7279 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Tue, 9 Jun 2026 15:39:41 -0700
Subject: [PATCH 2/2] Remove .NET 11 Alpine 3.23 images

For .NET 11, replace Alpine 3.23 entirely with Alpine 3.24. Since .NET 11
no longer has an Alpine 3.23 image, the floating `-alpine` tags move to
the Alpine 3.24 images, and `alpine|11.0|floating-tag-version` is pinned
to alpine3.24. Alpine 3.23 remains supported for .NET 8.0, 9.0, and 10.0.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 README.aspnet.md                              |  36 +-
 README.runtime-deps.md                        |  18 +-
 README.runtime.md                             |  18 +-
 README.sdk.md                                 |  15 +-
 .../aspnet-tags.yml                           |   4 -
 .../runtime-deps-tags.yml                     |   2 -
 .../runtime-tags.yml                          |   2 -
 eng/mcr-tags-metadata-templates/sdk-tags.yml  |   2 -
 manifest.json                                 | 797 ++----------------
 manifest.versions.json                        |   2 +-
 .../amd64/Dockerfile                          |  29 -
 .../arm32v7/Dockerfile                        |  29 -
 .../arm64v8/Dockerfile                        |  29 -
 .../alpine3.23-composite/amd64/Dockerfile     |  29 -
 .../alpine3.23-composite/arm32v7/Dockerfile   |  29 -
 .../alpine3.23-composite/arm64v8/Dockerfile   |  29 -
 .../11.0/alpine3.23-extra/amd64/Dockerfile    |  25 -
 .../11.0/alpine3.23-extra/arm32v7/Dockerfile  |  25 -
 .../11.0/alpine3.23-extra/arm64v8/Dockerfile  |  25 -
 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 -
 .../11.0/alpine3.23-extra/amd64/Dockerfile    |  33 -
 .../11.0/alpine3.23-extra/arm32v7/Dockerfile  |  33 -
 .../11.0/alpine3.23-extra/arm64v8/Dockerfile  |  33 -
 .../11.0/alpine3.23/amd64/Dockerfile          |  32 -
 .../11.0/alpine3.23/arm32v7/Dockerfile        |  32 -
 .../11.0/alpine3.23/arm64v8/Dockerfile        |  32 -
 .../11.0/alpine3.23-extra/amd64/Dockerfile    |  27 -
 .../11.0/alpine3.23-extra/arm32v7/Dockerfile  |  27 -
 .../11.0/alpine3.23-extra/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 -
 src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile  |   7 -
 .../11.0/alpine3.23-aot/arm64v8/Dockerfile    |   7 -
 src/sdk/11.0/alpine3.23/amd64/Dockerfile      |  68 --
 src/sdk/11.0/alpine3.23/arm32v7/Dockerfile    |  47 --
 src/sdk/11.0/alpine3.23/arm64v8/Dockerfile    |  47 --
 ...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 -
 ...posite-extra-amd64-Dockerfile.approved.txt |  31 -
 ...site-extra-arm32v7-Dockerfile.approved.txt |  31 -
 ...site-extra-arm64v8-Dockerfile.approved.txt |  31 -
 ...ne3.23-extra-amd64-Dockerfile.approved.txt |  27 -
 ...3.23-extra-arm32v7-Dockerfile.approved.txt |  27 -
 ...3.23-extra-arm64v8-Dockerfile.approved.txt |  27 -
 ...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 |  29 -
 ...3.23-extra-arm32v7-Dockerfile.approved.txt |  29 -
 ...3.23-extra-arm64v8-Dockerfile.approved.txt |  29 -
 ...0-alpine3.23-amd64-Dockerfile.approved.txt |  32 -
 ...alpine3.23-arm32v7-Dockerfile.approved.txt |  32 -
 ...alpine3.23-arm64v8-Dockerfile.approved.txt |  32 -
 ...ne3.23-extra-amd64-Dockerfile.approved.txt |  33 -
 ...3.23-extra-arm32v7-Dockerfile.approved.txt |  33 -
 ...3.23-extra-arm64v8-Dockerfile.approved.txt |  33 -
 ...0-alpine3.23-amd64-Dockerfile.approved.txt |  70 --
 ...pine3.23-aot-amd64-Dockerfile.approved.txt |   7 -
 ...ne3.23-aot-arm64v8-Dockerfile.approved.txt |   7 -
 ...alpine3.23-arm32v7-Dockerfile.approved.txt |  49 --
 ...alpine3.23-arm64v8-Dockerfile.approved.txt |  49 --
 .../Microsoft.DotNet.Docker.Tests/TestData.cs |  23 -
 69 files changed, 122 insertions(+), 2553 deletions(-)
 delete mode 100644 src/aspnet/11.0/alpine3.23-composite-extra/amd64/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.23-composite-extra/arm32v7/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.23-composite-extra/arm64v8/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.23/amd64/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile
 delete mode 100644 src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile
 delete mode 100644 src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile
 delete mode 100644 src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile
 delete mode 100644 src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile
 delete mode 100644 src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile
 delete mode 100644 src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile
 delete mode 100644 src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile
 delete mode 100644 src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile
 delete mode 100644 src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile
 delete mode 100644 src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile
 delete mode 100644 src/runtime/11.0/alpine3.23/amd64/Dockerfile
 delete mode 100644 src/runtime/11.0/alpine3.23/arm32v7/Dockerfile
 delete mode 100644 src/runtime/11.0/alpine3.23/arm64v8/Dockerfile
 delete mode 100644 src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile
 delete mode 100644 src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile
 delete mode 100644 src/sdk/11.0/alpine3.23/amd64/Dockerfile
 delete mode 100644 src/sdk/11.0/alpine3.23/arm32v7/Dockerfile
 delete mode 100644 src/sdk/11.0/alpine3.23/arm64v8/Dockerfile
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-amd64-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm32v7-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm64v8-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-amd64-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-aot-amd64-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-aot-arm64v8-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
 delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt

diff --git a/README.aspnet.md b/README.aspnet.md
index 8c92967bcc..463255a71b 100644
--- a/README.aspnet.md
+++ b/README.aspnet.md
@@ -170,14 +170,10 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-preview.5-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-preview.5-resolute-chiseled-composite-amd64, 11.0-preview-resolute-chiseled-composite-amd64, 11.0.0-preview.5-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-preview.5-resolute-chiseled-composite-extra-amd64, 11.0-preview-resolute-chiseled-composite-extra-amd64, 11.0.0-preview.5-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-preview.5-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.5-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-preview.5-alpine3.24-amd64, 11.0-preview-alpine3.24-amd64, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/aspnet/11.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
-11.0.0-preview.5-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.5-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
-11.0.0-preview.5-alpine3.24-extra-amd64, 11.0-preview-alpine3.24-extra-amd64, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
-11.0.0-preview.5-alpine3.23-composite-amd64, 11.0-preview-alpine3.23-composite-amd64, 11.0-preview-alpine-composite-amd64, 11.0.0-preview.5-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-preview.5-alpine3.24-composite-amd64, 11.0-preview-alpine3.24-composite-amd64, 11.0.0-preview.5-alpine3.24-composite, 11.0-preview-alpine3.24-composite | [Dockerfile](src/aspnet/11.0/alpine3.24-composite/amd64/Dockerfile) | Alpine 3.24
-11.0.0-preview.5-alpine3.23-composite-extra-amd64, 11.0-preview-alpine3.23-composite-extra-amd64, 11.0-preview-alpine-composite-extra-amd64, 11.0.0-preview.5-alpine3.23-composite-extra, 11.0-preview-alpine3.23-composite-extra, 11.0-preview-alpine-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-composite-extra/amd64/Dockerfile) | Alpine 3.23
-11.0.0-preview.5-alpine3.24-composite-extra-amd64, 11.0-preview-alpine3.24-composite-extra-amd64, 11.0.0-preview.5-alpine3.24-composite-extra, 11.0-preview-alpine3.24-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-composite-extra/amd64/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-amd64, 11.0-preview-alpine3.24-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-extra-amd64, 11.0-preview-alpine3.24-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-composite-amd64, 11.0-preview-alpine3.24-composite-amd64, 11.0-preview-alpine-composite-amd64, 11.0.0-preview.5-alpine3.24-composite, 11.0-preview-alpine3.24-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.24-composite/amd64/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-composite-extra-amd64, 11.0-preview-alpine3.24-composite-extra-amd64, 11.0-preview-alpine-composite-extra-amd64, 11.0.0-preview.5-alpine3.24-composite-extra, 11.0-preview-alpine3.24-composite-extra, 11.0-preview-alpine-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-composite-extra/amd64/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.5-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 11.0.0-preview.5-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.5-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
@@ -274,14 +270,10 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-preview.5-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-preview.5-resolute-chiseled-composite-arm64v8, 11.0-preview-resolute-chiseled-composite-arm64v8, 11.0.0-preview.5-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-preview.5-resolute-chiseled-composite-extra-arm64v8, 11.0-preview-resolute-chiseled-composite-extra-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.24-arm64v8, 11.0-preview-alpine3.24-arm64v8, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/aspnet/11.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
-11.0.0-preview.5-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.5-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
-11.0.0-preview.5-alpine3.24-extra-arm64v8, 11.0-preview-alpine3.24-extra-arm64v8, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
-11.0.0-preview.5-alpine3.23-composite-arm64v8, 11.0-preview-alpine3.23-composite-arm64v8, 11.0-preview-alpine-composite-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.24-composite-arm64v8, 11.0-preview-alpine3.24-composite-arm64v8, 11.0.0-preview.5-alpine3.24-composite, 11.0-preview-alpine3.24-composite | [Dockerfile](src/aspnet/11.0/alpine3.24-composite/arm64v8/Dockerfile) | Alpine 3.24
-11.0.0-preview.5-alpine3.23-composite-extra-arm64v8, 11.0-preview-alpine3.23-composite-extra-arm64v8, 11.0-preview-alpine-composite-extra-arm64v8, 11.0.0-preview.5-alpine3.23-composite-extra, 11.0-preview-alpine3.23-composite-extra, 11.0-preview-alpine-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-composite-extra/arm64v8/Dockerfile) | Alpine 3.23
-11.0.0-preview.5-alpine3.24-composite-extra-arm64v8, 11.0-preview-alpine3.24-composite-extra-arm64v8, 11.0.0-preview.5-alpine3.24-composite-extra, 11.0-preview-alpine3.24-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-composite-extra/arm64v8/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-arm64v8, 11.0-preview-alpine3.24-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-extra-arm64v8, 11.0-preview-alpine3.24-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-composite-arm64v8, 11.0-preview-alpine3.24-composite-arm64v8, 11.0-preview-alpine-composite-arm64v8, 11.0.0-preview.5-alpine3.24-composite, 11.0-preview-alpine3.24-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.24-composite/arm64v8/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-composite-extra-arm64v8, 11.0-preview-alpine3.24-composite-extra-arm64v8, 11.0-preview-alpine-composite-extra-arm64v8, 11.0.0-preview.5-alpine3.24-composite-extra, 11.0-preview-alpine3.24-composite-extra, 11.0-preview-alpine-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-composite-extra/arm64v8/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.5-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 11.0.0-preview.5-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.5-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
@@ -353,14 +345,10 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-preview.5-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-preview.5-resolute-chiseled-composite-arm32v7, 11.0-preview-resolute-chiseled-composite-arm32v7, 11.0.0-preview.5-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-preview.5-resolute-chiseled-composite-extra-arm32v7, 11.0-preview-resolute-chiseled-composite-extra-arm32v7, 11.0.0-preview.5-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-preview.5-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.5-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-preview.5-alpine3.24-arm32v7, 11.0-preview-alpine3.24-arm32v7, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/aspnet/11.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
-11.0.0-preview.5-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.5-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
-11.0.0-preview.5-alpine3.24-extra-arm32v7, 11.0-preview-alpine3.24-extra-arm32v7, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
-11.0.0-preview.5-alpine3.23-composite-arm32v7, 11.0-preview-alpine3.23-composite-arm32v7, 11.0-preview-alpine-composite-arm32v7, 11.0.0-preview.5-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
-11.0.0-preview.5-alpine3.24-composite-arm32v7, 11.0-preview-alpine3.24-composite-arm32v7, 11.0.0-preview.5-alpine3.24-composite, 11.0-preview-alpine3.24-composite | [Dockerfile](src/aspnet/11.0/alpine3.24-composite/arm32v7/Dockerfile) | Alpine 3.24
-11.0.0-preview.5-alpine3.23-composite-extra-arm32v7, 11.0-preview-alpine3.23-composite-extra-arm32v7, 11.0-preview-alpine-composite-extra-arm32v7, 11.0.0-preview.5-alpine3.23-composite-extra, 11.0-preview-alpine3.23-composite-extra, 11.0-preview-alpine-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-composite-extra/arm32v7/Dockerfile) | Alpine 3.23
-11.0.0-preview.5-alpine3.24-composite-extra-arm32v7, 11.0-preview-alpine3.24-composite-extra-arm32v7, 11.0.0-preview.5-alpine3.24-composite-extra, 11.0-preview-alpine3.24-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-composite-extra/arm32v7/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-arm32v7, 11.0-preview-alpine3.24-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-extra-arm32v7, 11.0-preview-alpine3.24-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-composite-arm32v7, 11.0-preview-alpine3.24-composite-arm32v7, 11.0-preview-alpine-composite-arm32v7, 11.0.0-preview.5-alpine3.24-composite, 11.0-preview-alpine3.24-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.24-composite/arm32v7/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-composite-extra-arm32v7, 11.0-preview-alpine3.24-composite-extra-arm32v7, 11.0-preview-alpine-composite-extra-arm32v7, 11.0.0-preview.5-alpine3.24-composite-extra, 11.0-preview-alpine3.24-composite-extra, 11.0-preview-alpine-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.24-composite-extra/arm32v7/Dockerfile) | Alpine 3.24
 
 ### Windows amd64 Tags
 
diff --git a/README.runtime-deps.md b/README.runtime-deps.md
index f029ca08c7..fadf777f99 100644
--- a/README.runtime-deps.md
+++ b/README.runtime-deps.md
@@ -120,10 +120,8 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.0-preview.5-resolute, 11.0-preview-resolute, 11.0.0-preview.5, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-preview.5-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-preview.5-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-preview.5-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.5-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-preview.5-alpine3.24-amd64, 11.0-preview-alpine3.24-amd64, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/runtime-deps/11.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
-11.0.0-preview.5-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.5-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-preview.5-alpine3.24-extra-amd64, 11.0-preview-alpine3.24-extra-amd64, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-amd64, 11.0-preview-alpine3.24-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-extra-amd64, 11.0-preview-alpine3.24-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.5-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
@@ -184,10 +182,8 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.0-preview.5-resolute, 11.0-preview-resolute, 11.0.0-preview.5, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-preview.5-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.24-arm64v8, 11.0-preview-alpine3.24-arm64v8, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/runtime-deps/11.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
-11.0.0-preview.5-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.24-extra-arm64v8, 11.0-preview-alpine3.24-extra-arm64v8, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-arm64v8, 11.0-preview-alpine3.24-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-extra-arm64v8, 11.0-preview-alpine3.24-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.5-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
@@ -233,10 +229,8 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.0-preview.5-resolute, 11.0-preview-resolute, 11.0.0-preview.5, 11.0-preview, latest | [Dockerfile](src/runtime-deps/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-preview.5-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-preview.5-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-preview.5-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.5-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-preview.5-alpine3.24-arm32v7, 11.0-preview-alpine3.24-arm32v7, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/runtime-deps/11.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
-11.0.0-preview.5-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.5-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
-11.0.0-preview.5-alpine3.24-extra-arm32v7, 11.0-preview-alpine3.24-extra-arm32v7, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-arm32v7, 11.0-preview-alpine3.24-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-extra-arm32v7, 11.0-preview-alpine3.24-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
 
 <!--End of generated tags-->
 
diff --git a/README.runtime.md b/README.runtime.md
index 28d8a1cd71..90f5de43fb 100644
--- a/README.runtime.md
+++ b/README.runtime.md
@@ -127,10 +127,8 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.0-preview.5-resolute, 11.0-preview-resolute, 11.0.0-preview.5, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-preview.5-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-preview.5-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-preview.5-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.5-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-preview.5-alpine3.24-amd64, 11.0-preview-alpine3.24-amd64, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/runtime/11.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
-11.0.0-preview.5-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.5-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
-11.0.0-preview.5-alpine3.24-extra-amd64, 11.0-preview-alpine3.24-extra-amd64, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/runtime/11.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-amd64, 11.0-preview-alpine3.24-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-extra-amd64, 11.0-preview-alpine3.24-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.24-extra/amd64/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.5-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 11.0.0-preview.5-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.5-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
@@ -191,10 +189,8 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.0-preview.5-resolute, 11.0-preview-resolute, 11.0.0-preview.5, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-preview.5-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.5-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-preview.5-alpine3.24-arm64v8, 11.0-preview-alpine3.24-arm64v8, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/runtime/11.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
-11.0.0-preview.5-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.5-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
-11.0.0-preview.5-alpine3.24-extra-arm64v8, 11.0-preview-alpine3.24-extra-arm64v8, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/runtime/11.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-arm64v8, 11.0-preview-alpine3.24-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-extra-arm64v8, 11.0-preview-alpine3.24-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.24-extra/arm64v8/Dockerfile) | Alpine 3.24
 11.0.0-preview.5-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.5-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 11.0.0-preview.5-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.5-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.5-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.5-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
@@ -240,10 +236,8 @@ Tags | Dockerfile | OS Version
 11.0.0-preview.5-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.0-preview.5-resolute, 11.0-preview-resolute, 11.0.0-preview.5, 11.0-preview, latest | [Dockerfile](src/runtime/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-preview.5-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04
 11.0.0-preview.5-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-preview.5-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-preview.5-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.5-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
-11.0.0-preview.5-alpine3.24-arm32v7, 11.0-preview-alpine3.24-arm32v7, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/runtime/11.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
-11.0.0-preview.5-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.5-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
-11.0.0-preview.5-alpine3.24-extra-arm32v7, 11.0-preview-alpine3.24-extra-arm32v7, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra | [Dockerfile](src/runtime/11.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-arm32v7, 11.0-preview-alpine3.24-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.5-alpine3.24, 11.0-preview-alpine3.24, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
+11.0.0-preview.5-alpine3.24-extra-arm32v7, 11.0-preview-alpine3.24-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.5-alpine3.24-extra, 11.0-preview-alpine3.24-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.24-extra/arm32v7/Dockerfile) | Alpine 3.24
 
 ### Windows amd64 Tags
 
diff --git a/README.sdk.md b/README.sdk.md
index 7f6700cd4c..a292fa1ece 100644
--- a/README.sdk.md
+++ b/README.sdk.md
@@ -104,10 +104,8 @@ Tags | Dockerfile | OS Version
 ---- | ---------- | ----------
 11.0.100-preview.5-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.100-preview.5-resolute, 11.0-preview-resolute, 11.0.100-preview.5, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04
 11.0.100-preview.5-resolute-aot-amd64, 11.0-preview-resolute-aot-amd64, 11.0.100-preview.5-resolute-aot, 11.0-preview-resolute-aot, 11.0.100-preview.5-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/resolute-aot/amd64/Dockerfile) | Ubuntu 26.04
-11.0.100-preview.5-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.100-preview.5-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-preview.5-alpine3.24-amd64, 11.0-preview-alpine3.24-amd64, 11.0.100-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/sdk/11.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
-11.0.100-preview.5-alpine3.23-aot-amd64, 11.0-preview-alpine3.23-aot-amd64, 11.0-preview-alpine-aot-amd64, 11.0.100-preview.5-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-preview.5-alpine3.24-aot-amd64, 11.0-preview-alpine3.24-aot-amd64, 11.0.100-preview.5-alpine3.24-aot, 11.0-preview-alpine3.24-aot | [Dockerfile](src/sdk/11.0/alpine3.24-aot/amd64/Dockerfile) | Alpine 3.24
+11.0.100-preview.5-alpine3.24-amd64, 11.0-preview-alpine3.24-amd64, 11.0-preview-alpine-amd64, 11.0.100-preview.5-alpine3.24, 11.0-preview-alpine3.24, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.24/amd64/Dockerfile) | Alpine 3.24
+11.0.100-preview.5-alpine3.24-aot-amd64, 11.0-preview-alpine3.24-aot-amd64, 11.0-preview-alpine-aot-amd64, 11.0.100-preview.5-alpine3.24-aot, 11.0-preview-alpine3.24-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.24-aot/amd64/Dockerfile) | Alpine 3.24
 11.0.100-preview.5-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.100-preview.5-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 11.0.100-preview.5-azurelinux3.0-aot-amd64, 11.0-preview-azurelinux3.0-aot-amd64, 11.0.100-preview.5-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-preview.5-azurelinux4.0-amd64, 11.0-preview-azurelinux4.0-amd64, 11.0.100-preview.5-azurelinux4.0, 11.0-preview-azurelinux4.0 | [Dockerfile](src/sdk/11.0/azurelinux4.0/amd64/Dockerfile) | Azure Linux 4.0
@@ -147,10 +145,8 @@ Tags | Dockerfile | OS Version
 ---- | ---------- | ----------
 11.0.100-preview.5-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.100-preview.5-resolute, 11.0-preview-resolute, 11.0.100-preview.5, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.100-preview.5-resolute-aot-arm64v8, 11.0-preview-resolute-aot-arm64v8, 11.0.100-preview.5-resolute-aot, 11.0-preview-resolute-aot, 11.0.100-preview.5-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/resolute-aot/arm64v8/Dockerfile) | Ubuntu 26.04
-11.0.100-preview.5-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.100-preview.5-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-preview.5-alpine3.24-arm64v8, 11.0-preview-alpine3.24-arm64v8, 11.0.100-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/sdk/11.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
-11.0.100-preview.5-alpine3.23-aot-arm64v8, 11.0-preview-alpine3.23-aot-arm64v8, 11.0-preview-alpine-aot-arm64v8, 11.0.100-preview.5-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-preview.5-alpine3.24-aot-arm64v8, 11.0-preview-alpine3.24-aot-arm64v8, 11.0.100-preview.5-alpine3.24-aot, 11.0-preview-alpine3.24-aot | [Dockerfile](src/sdk/11.0/alpine3.24-aot/arm64v8/Dockerfile) | Alpine 3.24
+11.0.100-preview.5-alpine3.24-arm64v8, 11.0-preview-alpine3.24-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.100-preview.5-alpine3.24, 11.0-preview-alpine3.24, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.24/arm64v8/Dockerfile) | Alpine 3.24
+11.0.100-preview.5-alpine3.24-aot-arm64v8, 11.0-preview-alpine3.24-aot-arm64v8, 11.0-preview-alpine-aot-arm64v8, 11.0.100-preview.5-alpine3.24-aot, 11.0-preview-alpine3.24-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.24-aot/arm64v8/Dockerfile) | Alpine 3.24
 11.0.100-preview.5-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.100-preview.5-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 11.0.100-preview.5-azurelinux3.0-aot-arm64v8, 11.0-preview-azurelinux3.0-aot-arm64v8, 11.0.100-preview.5-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-preview.5-azurelinux4.0-arm64v8, 11.0-preview-azurelinux4.0-arm64v8, 11.0.100-preview.5-azurelinux4.0, 11.0-preview-azurelinux4.0 | [Dockerfile](src/sdk/11.0/azurelinux4.0/arm64v8/Dockerfile) | Azure Linux 4.0
@@ -178,8 +174,7 @@ Tags | Dockerfile | OS Version
 Tags | Dockerfile | OS Version
 ---- | ---------- | ----------
 11.0.100-preview.5-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.100-preview.5-resolute, 11.0-preview-resolute, 11.0.100-preview.5, 11.0-preview, latest | [Dockerfile](src/sdk/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04
-11.0.100-preview.5-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.100-preview.5-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
-11.0.100-preview.5-alpine3.24-arm32v7, 11.0-preview-alpine3.24-arm32v7, 11.0.100-preview.5-alpine3.24, 11.0-preview-alpine3.24 | [Dockerfile](src/sdk/11.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
+11.0.100-preview.5-alpine3.24-arm32v7, 11.0-preview-alpine3.24-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.100-preview.5-alpine3.24, 11.0-preview-alpine3.24, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.24/arm32v7/Dockerfile) | Alpine 3.24
 
 ### Windows amd64 Tags
 
diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
index b684a304bd..442ddc2845 100644
--- a/eng/mcr-tags-metadata-templates/aspnet-tags.yml
+++ b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
@@ -4,13 +4,9 @@ $(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.24|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-extra|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.24-extra|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-composite|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.24-composite|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-composite-extra|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.24-composite-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)
diff --git a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml
index 6023a46801..b317c12dde 100644
--- a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml
+++ b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml
@@ -2,9 +2,7 @@ $(McrTagsYmlRepo:runtime-deps)
 $(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.24|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-extra|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.24-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)
diff --git a/eng/mcr-tags-metadata-templates/runtime-tags.yml b/eng/mcr-tags-metadata-templates/runtime-tags.yml
index 620e8480ea..626c547755 100644
--- a/eng/mcr-tags-metadata-templates/runtime-tags.yml
+++ b/eng/mcr-tags-metadata-templates/runtime-tags.yml
@@ -2,9 +2,7 @@ $(McrTagsYmlRepo:runtime)
 $(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.24|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-extra|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.24-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)
diff --git a/eng/mcr-tags-metadata-templates/sdk-tags.yml b/eng/mcr-tags-metadata-templates/sdk-tags.yml
index ec2078d96b..6410c30d46 100644
--- a/eng/mcr-tags-metadata-templates/sdk-tags.yml
+++ b/eng/mcr-tags-metadata-templates/sdk-tags.yml
@@ -1,9 +1,7 @@
 $(McrTagsYmlRepo:sdk)
 $(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.24|.NET 11 Preview Tags)
-$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-aot|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.24-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)
diff --git a/manifest.json b/manifest.json
index 93fc8e9fc5..025d3bcc0c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2528,7 +2528,8 @@
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
             "$(dotnet|11.0|fixed-tag)-alpine3.24": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.24": {}
+            "$(dotnet|11.0|minor-tag)-alpine3.24": {},
+            "$(dotnet|11.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -2538,7 +2539,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-amd64": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -2549,7 +2551,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-arm32v7": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -2561,53 +2564,7 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-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)-alpine": {}
-          },
-          "platforms": [
-            {
-              "dockerfile": "src/runtime-deps/11.0/alpine3.23/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
-              "os": "linux",
-              "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)-alpine-amd64": {}
-              }
-            },
-            {
-              "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": {},
-                "$(dotnet|11.0|minor-tag)-alpine-arm32v7": {}
-              },
-              "variant": "v7"
-            },
-            {
-              "architecture": "arm64",
-              "dockerfile": "src/runtime-deps/11.0/alpine3.23/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile",
-              "os": "linux",
-              "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.24-arm64v8": {},
                 "$(dotnet|11.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
@@ -2618,7 +2575,8 @@
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
             "$(dotnet|11.0|fixed-tag)-alpine3.24-extra": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.24-extra": {}
+            "$(dotnet|11.0|minor-tag)-alpine3.24-extra": {},
+            "$(dotnet|11.0|minor-tag)-alpine-extra": {}
           },
           "platforms": [
             {
@@ -2628,7 +2586,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-amd64": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
@@ -2648,7 +2607,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-arm32v7": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-extra-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -2669,80 +2629,7 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-arm64v8": {}
-              },
-              "variant": "v8",
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm64v8"
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "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)-alpine-extra": {}
-          },
-          "platforms": [
-            {
-              "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": {},
-                "$(dotnet|11.0|minor-tag)-alpine-extra-amd64": {}
-              },
-              "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": "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)-alpine-extra-arm32v7": {}
-              },
-              "variant": "v7",
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm32v7"
-                  ]
-                }
-              ]
-            },
-            {
-              "architecture": "arm64",
-              "dockerfile": "src/runtime-deps/11.0/alpine3.23-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.extra",
-              "os": "linux",
-              "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.24-extra-arm64v8": {},
                 "$(dotnet|11.0|minor-tag)-alpine-extra-arm64v8": {}
               },
               "variant": "v8",
@@ -2751,7 +2638,7 @@
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm64v8"
                   ]
                 }
               ]
@@ -6125,7 +6012,8 @@
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
             "$(dotnet|11.0|fixed-tag)-alpine3.24": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.24": {}
+            "$(dotnet|11.0|minor-tag)-alpine3.24": {},
+            "$(dotnet|11.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -6138,7 +6026,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-amd64": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -6152,7 +6041,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-arm32v7": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -6167,62 +6057,7 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-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)-alpine": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/11.0/alpine3.23/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
-              "os": "linux",
-              "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)-alpine-amd64": {}
-              }
-            },
-            {
-              "architecture": "arm",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/11.0/alpine3.23/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
-              "os": "linux",
-              "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)-alpine-arm32v7": {}
-              },
-              "variant": "v7"
-            },
-            {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/11.0/alpine3.23/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
-              "os": "linux",
-              "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.24-arm64v8": {},
                 "$(dotnet|11.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
@@ -6233,7 +6068,8 @@
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
             "$(dotnet|11.0|fixed-tag)-alpine3.24-extra": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.24-extra": {}
+            "$(dotnet|11.0|minor-tag)-alpine3.24-extra": {},
+            "$(dotnet|11.0|minor-tag)-alpine-extra": {}
           },
           "platforms": [
             {
@@ -6246,7 +6082,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-amd64": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
@@ -6268,7 +6105,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-arm32v7": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-extra-arm32v7": {}
               },
               "customBuildLegGroups": [
                 {
@@ -6292,89 +6130,7 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-arm64v8": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm64v8"
-                  ]
-                }
-              ],
-              "architecture": "arm64",
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "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)-alpine-extra": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/11.0/alpine3.23-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.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": {},
-                "$(dotnet|11.0|minor-tag)-alpine-extra-amd64": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-amd64"
-                  ]
-                }
-              ]
-            },
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/11.0/alpine3.23-extra/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
-              "os": "linux",
-              "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)-alpine-extra-arm32v7": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm32v7"
-                  ]
-                }
-              ],
-              "architecture": "arm",
-              "variant": "v7"
-            },
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/runtime/11.0/alpine3.23-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
-              "os": "linux",
-              "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.24-extra-arm64v8": {},
                 "$(dotnet|11.0|minor-tag)-alpine-extra-arm64v8": {}
               },
               "customBuildLegGroups": [
@@ -6382,7 +6138,7 @@
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm64v8"
                   ]
                 }
               ],
@@ -11767,7 +11523,8 @@
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
             "$(dotnet|11.0|fixed-tag)-alpine3.24": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.24": {}
+            "$(dotnet|11.0|minor-tag)-alpine3.24": {},
+            "$(dotnet|11.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -11780,7 +11537,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-amd64": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -11794,7 +11552,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-arm32v7": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -11809,7 +11568,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-arm64v8": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -11818,99 +11578,46 @@
         {
           "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)-alpine": {}
+            "$(dotnet|11.0|fixed-tag)-alpine3.24-extra": {},
+            "$(dotnet|11.0|minor-tag)-alpine3.24-extra": {},
+            "$(dotnet|11.0|minor-tag)-alpine-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/11.0/alpine3.23/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/aspnet/11.0/alpine3.24-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.24",
               "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine-amd64": {}
-              }
+                "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-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.24-amd64"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/11.0/alpine3.23/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/aspnet/11.0/alpine3.24-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "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)-alpine-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": {},
-                "$(dotnet|11.0|minor-tag)-alpine-arm64v8": {}
-              },
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|11.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-alpine3.24-extra": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.24-extra": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/11.0/alpine3.24-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
-              "os": "linux",
-              "osVersion": "alpine3.24",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-amd64": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-amd64"
-                  ]
-                }
-              ]
-            },
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/11.0/alpine3.24-extra/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
-              "os": "linux",
-              "osVersion": "alpine3.24",
+              "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-arm32v7": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-extra-arm32v7": {}
               },
               "customBuildLegGroups": [
                 {
@@ -11934,89 +11641,7 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-extra-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-extra-arm64v8": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm64v8"
-                  ]
-                }
-              ],
-              "architecture": "arm64",
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "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)-alpine-extra": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/11.0/alpine3.23-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.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": {},
-                "$(dotnet|11.0|minor-tag)-alpine-extra-amd64": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-amd64"
-                  ]
-                }
-              ]
-            },
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/11.0/alpine3.23-extra/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
-              "os": "linux",
-              "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)-alpine-extra-arm32v7": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm32v7"
-                  ]
-                }
-              ],
-              "architecture": "arm",
-              "variant": "v7"
-            },
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime)"
-              },
-              "dockerfile": "src/aspnet/11.0/alpine3.23-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
-              "os": "linux",
-              "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.24-extra-arm64v8": {},
                 "$(dotnet|11.0|minor-tag)-alpine-extra-arm64v8": {}
               },
               "customBuildLegGroups": [
@@ -12024,7 +11649,7 @@
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm64v8"
                   ]
                 }
               ],
@@ -12037,7 +11662,8 @@
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
             "$(dotnet|11.0|fixed-tag)-alpine3.24-composite": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.24-composite": {}
+            "$(dotnet|11.0|minor-tag)-alpine3.24-composite": {},
+            "$(dotnet|11.0|minor-tag)-alpine-composite": {}
           },
           "platforms": [
             {
@@ -12050,7 +11676,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-composite-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-amd64": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-composite-amd64": {}
               }
             },
             {
@@ -12064,7 +11691,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-composite-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-arm32v7": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-composite-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -12079,62 +11707,7 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-composite-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-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": {},
-            "$(dotnet|11.0|minor-tag)-alpine-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": {},
-                "$(dotnet|11.0|minor-tag)-alpine-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": {},
-                "$(dotnet|11.0|minor-tag)-alpine-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": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-arm64v8": {},
                 "$(dotnet|11.0|minor-tag)-alpine-composite-arm64v8": {}
               },
               "variant": "v8"
@@ -12145,7 +11718,8 @@
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
             "$(dotnet|11.0|fixed-tag)-alpine3.24-composite-extra": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.24-composite-extra": {}
+            "$(dotnet|11.0|minor-tag)-alpine3.24-composite-extra": {},
+            "$(dotnet|11.0|minor-tag)-alpine-composite-extra": {}
           },
           "platforms": [
             {
@@ -12158,7 +11732,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-composite-extra-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-extra-amd64": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-extra-amd64": {},
+                "$(dotnet|11.0|minor-tag)-alpine-composite-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
@@ -12180,7 +11755,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-composite-extra-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-extra-arm32v7": {}
+                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-extra-arm32v7": {},
+                "$(dotnet|11.0|minor-tag)-alpine-composite-extra-arm32v7": {}
               },
               "customBuildLegGroups": [
                 {
@@ -12204,89 +11780,7 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(dotnet|11.0|fixed-tag)-alpine3.24-composite-extra-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-extra-arm64v8": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm64v8"
-                  ]
-                }
-              ],
-              "architecture": "arm64",
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "productVersion": "$(dotnet|11.0|product-version)",
-          "sharedTags": {
-            "$(dotnet|11.0|fixed-tag)-alpine3.23-composite-extra": {},
-            "$(dotnet|11.0|minor-tag)-alpine3.23-composite-extra": {},
-            "$(dotnet|11.0|minor-tag)-alpine-composite-extra": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/aspnet/11.0/alpine3.23-composite-extra/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
-              "os": "linux",
-              "osVersion": "alpine3.23",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.23-composite-extra-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-composite-extra-amd64": {},
-                "$(dotnet|11.0|minor-tag)-alpine-composite-extra-amd64": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-amd64"
-                  ]
-                }
-              ]
-            },
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/aspnet/11.0/alpine3.23-composite-extra/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
-              "os": "linux",
-              "osVersion": "alpine3.23",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.23-composite-extra-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-composite-extra-arm32v7": {},
-                "$(dotnet|11.0|minor-tag)-alpine-composite-extra-arm32v7": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "test-dependencies",
-                  "type": "Integral",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm32v7"
-                  ]
-                }
-              ],
-              "architecture": "arm",
-              "variant": "v7"
-            },
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
-              },
-              "dockerfile": "src/aspnet/11.0/alpine3.23-composite-extra/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
-              "os": "linux",
-              "osVersion": "alpine3.23",
-              "tags": {
-                "$(dotnet|11.0|fixed-tag)-alpine3.23-composite-extra-arm64v8": {},
-                "$(dotnet|11.0|minor-tag)-alpine3.23-composite-extra-arm64v8": {},
+                "$(dotnet|11.0|minor-tag)-alpine3.24-composite-extra-arm64v8": {},
                 "$(dotnet|11.0|minor-tag)-alpine-composite-extra-arm64v8": {}
               },
               "customBuildLegGroups": [
@@ -12294,7 +11788,7 @@
                   "name": "test-dependencies",
                   "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm64v8"
                   ]
                 }
               ],
@@ -14745,7 +14239,8 @@
           "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
             "$(sdk|11.0|fixed-tag)-alpine3.24": {},
-            "$(sdk|11.0|minor-tag)-alpine3.24": {}
+            "$(sdk|11.0|minor-tag)-alpine3.24": {},
+            "$(sdk|11.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -14758,7 +14253,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(sdk|11.0|fixed-tag)-alpine3.24-amd64": {},
-                "$(sdk|11.0|minor-tag)-alpine3.24-amd64": {}
+                "$(sdk|11.0|minor-tag)-alpine3.24-amd64": {},
+                "$(sdk|11.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -14772,7 +14268,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(sdk|11.0|fixed-tag)-alpine3.24-arm32v7": {},
-                "$(sdk|11.0|minor-tag)-alpine3.24-arm32v7": {}
+                "$(sdk|11.0|minor-tag)-alpine3.24-arm32v7": {},
+                "$(sdk|11.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -14787,62 +14284,7 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(sdk|11.0|fixed-tag)-alpine3.24-arm64v8": {},
-                "$(sdk|11.0|minor-tag)-alpine3.24-arm64v8": {}
-              },
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "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)-alpine": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "dockerfile": "src/sdk/11.0/alpine3.23/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
-              "os": "linux",
-              "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)-alpine-amd64": {}
-              }
-            },
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "architecture": "arm",
-              "dockerfile": "src/sdk/11.0/alpine3.23/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
-              "os": "linux",
-              "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)-alpine-arm32v7": {}
-              },
-              "variant": "v7"
-            },
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "architecture": "arm64",
-              "dockerfile": "src/sdk/11.0/alpine3.23/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux",
-              "os": "linux",
-              "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.24-arm64v8": {},
                 "$(sdk|11.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
@@ -14853,7 +14295,8 @@
           "productVersion": "$(sdk|11.0|product-version)",
           "sharedTags": {
             "$(sdk|11.0|fixed-tag)-alpine3.24-aot": {},
-            "$(sdk|11.0|minor-tag)-alpine3.24-aot": {}
+            "$(sdk|11.0|minor-tag)-alpine3.24-aot": {},
+            "$(sdk|11.0|minor-tag)-alpine-aot": {}
           },
           "platforms": [
             {
@@ -14866,7 +14309,8 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(sdk|11.0|fixed-tag)-alpine3.24-aot-amd64": {},
-                "$(sdk|11.0|minor-tag)-alpine3.24-aot-amd64": {}
+                "$(sdk|11.0|minor-tag)-alpine3.24-aot-amd64": {},
+                "$(sdk|11.0|minor-tag)-alpine-aot-amd64": {}
               },
               "customBuildLegGroups": [
                 {
@@ -14889,64 +14333,7 @@
               "osVersion": "alpine3.24",
               "tags": {
                 "$(sdk|11.0|fixed-tag)-alpine3.24-aot-arm64v8": {},
-                "$(sdk|11.0|minor-tag)-alpine3.24-aot-arm64v8": {}
-              },
-              "variant": "v8",
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm64v8"
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "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)-alpine-aot": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:sdk)"
-              },
-              "dockerfile": "src/sdk/11.0/alpine3.23-aot/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
-              "os": "linux",
-              "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)-alpine-aot-amd64": {}
-              },
-              "customBuildLegGroups": [
-                {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-amd64"
-                  ]
-                }
-              ]
-            },
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:sdk)"
-              },
-              "architecture": "arm64",
-              "dockerfile": "src/sdk/11.0/alpine3.23-aot/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux.aot",
-              "os": "linux",
-              "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.24-aot-arm64v8": {},
                 "$(sdk|11.0|minor-tag)-alpine-aot-arm64v8": {}
               },
               "variant": "v8",
@@ -14955,7 +14342,7 @@
                   "name": "pr-build",
                   "type": "Supplemental",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm64v8"
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.24-arm64v8"
                   ]
                 }
               ]
diff --git a/manifest.versions.json b/manifest.versions.json
index a656fa7b05..f9cb4da97d 100644
--- a/manifest.versions.json
+++ b/manifest.versions.json
@@ -16,7 +16,7 @@
     "azurelinux|4.0|repo": "mcr.microsoft.com/azurelinux-beta",
 
     "alpine|floating-tag-version": "alpine3.23",
-    "alpine|11.0|floating-tag-version": "$(alpine|floating-tag-version)",
+    "alpine|11.0|floating-tag-version": "alpine3.24",
     "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.23-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23-composite-extra/amd64/Dockerfile
deleted file mode 100644
index 29066526db..0000000000
--- a/src/aspnet/11.0/alpine3.23-composite-extra/amd64/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-extra-amd64 AS installer
-
-# Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-extra-amd64
-
-ENV \
-    # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.5.26302.115 \
-    # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.5.26302.115
-
-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-extra/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23-composite-extra/arm32v7/Dockerfile
deleted file mode 100644
index 6c6f1e4e3a..0000000000
--- a/src/aspnet/11.0/alpine3.23-composite-extra/arm32v7/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-extra-arm32v7 AS installer
-
-# Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-extra-arm32v7
-
-ENV \
-    # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.5.26302.115 \
-    # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.5.26302.115
-
-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-extra/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23-composite-extra/arm64v8/Dockerfile
deleted file mode 100644
index 6bfb295797..0000000000
--- a/src/aspnet/11.0/alpine3.23-composite-extra/arm64v8/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-extra-arm64v8 AS installer
-
-# Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-extra-arm64v8
-
-ENV \
-    # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.5.26302.115 \
-    # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.5.26302.115
-
-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/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile
deleted file mode 100644
index 41926b8de0..0000000000
--- a/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-amd64 AS installer
-
-# Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-amd64
-
-ENV \
-    # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.5.26302.115 \
-    # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.5.26302.115
-
-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
deleted file mode 100644
index 3b423f5da1..0000000000
--- a/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-arm32v7 AS installer
-
-# Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-arm32v7
-
-ENV \
-    # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.5.26302.115 \
-    # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.5.26302.115
-
-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
deleted file mode 100644
index ba4dd963ea..0000000000
--- a/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-arm64v8 AS installer
-
-# Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-arm64v8
-
-ENV \
-    # .NET Runtime version
-    DOTNET_VERSION=11.0.0-preview.5.26302.115 \
-    # ASP.NET Core version
-    ASPNET_VERSION=11.0.0-preview.5.26302.115
-
-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-extra/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile
deleted file mode 100644
index a40833e7e1..0000000000
--- a/src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-extra-amd64 AS installer
-
-# Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-extra-amd64
-
-# ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.5.26302.115
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile
deleted file mode 100644
index 3b8a98a2dd..0000000000
--- a/src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-extra-arm32v7 AS installer
-
-# Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-extra-arm32v7
-
-# ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.5.26302.115
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile
deleted file mode 100644
index 1ee26e870f..0000000000
--- a/src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-extra-arm64v8 AS installer
-
-# Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-extra-arm64v8
-
-# ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.5.26302.115
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.23/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23/amd64/Dockerfile
deleted file mode 100644
index e12a033cdd..0000000000
--- a/src/aspnet/11.0/alpine3.23/amd64/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-amd64 AS installer
-
-# Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-amd64
-
-# ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.5.26302.115
-
-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
deleted file mode 100644
index 743e912de7..0000000000
--- a/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-arm32v7 AS installer
-
-# Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-arm32v7
-
-# ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.5.26302.115
-
-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
deleted file mode 100644
index 7a5fcb7b88..0000000000
--- a/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-arm64v8 AS installer
-
-# Retrieve ASP.NET Core
-RUN aspnetcore_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-arm64v8
-
-# ASP.NET Core version
-ENV ASPNET_VERSION=11.0.0-preview.5.26302.115
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile b/src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile
deleted file mode 100644
index c1c2d27ef7..0000000000
--- a/src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-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 \
-        \
-        # manually update zlib from alpine base image
-        zlib
-
-# 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
deleted file mode 100644
index 3a06263815..0000000000
--- a/src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-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 \
-        \
-        # manually update zlib from alpine base image
-        zlib
-
-# 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
deleted file mode 100644
index b3f0e62189..0000000000
--- a/src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-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 \
-        \
-        # manually update zlib from alpine base image
-        zlib
-
-# 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
deleted file mode 100644
index f7db4b33db..0000000000
--- a/src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-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++ \
-        \
-        # manually update zlib from alpine base image
-        zlib
-
-# 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
deleted file mode 100644
index 64d2dcfee0..0000000000
--- a/src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-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++ \
-        \
-        # manually update zlib from alpine base image
-        zlib
-
-# 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
deleted file mode 100644
index f82fbc936d..0000000000
--- a/src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-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++ \
-        \
-        # manually update zlib from alpine base image
-        zlib
-
-# 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.23-extra/amd64/Dockerfile b/src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile
deleted file mode 100644
index 976ff7935c..0000000000
--- a/src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-extra-amd64 AS installer
-
-# Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-extra-amd64
-
-# .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.5.26302.115
-
-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-extra/arm32v7/Dockerfile b/src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile
deleted file mode 100644
index ebe3064c33..0000000000
--- a/src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-extra-arm32v7 AS installer
-
-# Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-extra-arm32v7
-
-# .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.5.26302.115
-
-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-extra/arm64v8/Dockerfile b/src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile
deleted file mode 100644
index 4e3cd273ce..0000000000
--- a/src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-extra-arm64v8 AS installer
-
-# Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-extra-arm64v8
-
-# .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.5.26302.115
-
-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
deleted file mode 100644
index af4af7361a..0000000000
--- a/src/runtime/11.0/alpine3.23/amd64/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-amd64 AS installer
-
-# Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-amd64
-
-# .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.5.26302.115
-
-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
deleted file mode 100644
index e76ccb8b5f..0000000000
--- a/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-arm32v7 AS installer
-
-# Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-arm32v7
-
-# .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.5.26302.115
-
-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
deleted file mode 100644
index 7556d5db86..0000000000
--- a/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-arm64v8 AS installer
-
-# Retrieve .NET Runtime
-RUN dotnet_version=11.0.0-preview.5.26302.115 \
-    && 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.5-alpine3.23-arm64v8
-
-# .NET Runtime version
-ENV DOTNET_VERSION=11.0.0-preview.5.26302.115
-
-COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
-
-RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile b/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile
deleted file mode 100644
index d3737afcb4..0000000000
--- a/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:11.0.100-preview.5-alpine3.23-amd64
-
-RUN apk add --upgrade --no-cache \
-        gcc \
-        musl-dev \
-        zlib-dev
diff --git a/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile
deleted file mode 100644
index 6d6d9872be..0000000000
--- a/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:11.0.100-preview.5-alpine3.23-arm64v8
-
-RUN apk add --upgrade --no-cache \
-        gcc \
-        musl-dev \
-        zlib-dev
diff --git a/src/sdk/11.0/alpine3.23/amd64/Dockerfile b/src/sdk/11.0/alpine3.23/amd64/Dockerfile
deleted file mode 100644
index 69347e011a..0000000000
--- a/src/sdk/11.0/alpine3.23/amd64/Dockerfile
+++ /dev/null
@@ -1,68 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-amd64 AS installer
-
-# Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-preview.5.26302.115 \
-    && 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.5-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.5.26302.115 \
-    # 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.7.0-preview.2 \
-    && 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='4eba9c9b057620bef0b33d01e04b2d448d6c95896a27d4659c3b173e989f7c900e204b9b987d0587bc8941015f75a4bc2ab8f8cec6dd2e9860ffc02b98b72f62' \
-    && 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 \
-    && chmod 755 /usr/share/powershell/.store/powershell.linux.alpine/$powershell_version/powershell.linux.alpine/$powershell_version/tools/*/any/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
deleted file mode 100644
index 1df6c12fba..0000000000
--- a/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile
+++ /dev/null
@@ -1,47 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-arm32v7 AS installer
-
-# Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-preview.5.26302.115 \
-    && 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.5-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.5.26302.115 \
-    # 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
deleted file mode 100644
index e7680a072c..0000000000
--- a/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile
+++ /dev/null
@@ -1,47 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-# Installer image
-FROM $REPO:11.0.0-preview.5-alpine3.23-arm64v8 AS installer
-
-# Install .NET SDK
-RUN dotnet_sdk_version=11.0.100-preview.5.26302.115 \
-    && 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.5-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.5.26302.115 \
-    # 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/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
deleted file mode 100644
index 57cc13e47c..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index fecc264cad..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 8b582b3053..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 934bed0d0b..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index d4f7e29776..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index 971ff2df28..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-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-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-amd64-Dockerfile.approved.txt
deleted file mode 100644
index e0b5d64300..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-amd64-Dockerfile.approved.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:0.0.0-alpine3.XX-extra-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-extra-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-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm32v7-Dockerfile.approved.txt
deleted file mode 100644
index a14ff3c1ee..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm32v7-Dockerfile.approved.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:0.0.0-alpine3.XX-extra-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-extra-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-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm64v8-Dockerfile.approved.txt
deleted file mode 100644
index a0c2ff4a9d..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm64v8-Dockerfile.approved.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:0.0.0-alpine3.XX-extra-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-extra-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-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt
deleted file mode 100644
index 9ad16a77c0..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime
-
-# Installer image
-FROM $REPO:0.0.0-alpine3.XX-extra-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-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-alpine3.23-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt
deleted file mode 100644
index 943c45a2c4..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime
-
-# Installer image
-FROM $REPO:0.0.0-alpine3.XX-extra-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-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-alpine3.23-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt
deleted file mode 100644
index 3c5e0d5f4a..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime
-
-# Installer image
-FROM $REPO:0.0.0-alpine3.XX-extra-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-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/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
deleted file mode 100644
index 32b28e65af..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100644
index 531f790cac..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100644
index 3bb298e1ca..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-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-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt
deleted file mode 100644
index 970977d515..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:0.0.0-alpine3.XX-extra-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-extra-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-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt
deleted file mode 100644
index 319ebb6062..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:0.0.0-alpine3.XX-extra-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-extra-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-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt
deleted file mode 100644
index aa51503f49..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
-
-# Installer image
-FROM $REPO:0.0.0-alpine3.XX-extra-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-extra-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-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
deleted file mode 100644
index f7db4b33db..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-amd64-Dockerfile.approved.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-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++ \
-        \
-        # manually update zlib from alpine base image
-        zlib
-
-# 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
deleted file mode 100644
index 64d2dcfee0..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-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++ \
-        \
-        # manually update zlib from alpine base image
-        zlib
-
-# 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
deleted file mode 100644
index f82fbc936d..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-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++ \
-        \
-        # manually update zlib from alpine base image
-        zlib
-
-# 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
deleted file mode 100644
index c1c2d27ef7..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-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 \
-        \
-        # manually update zlib from alpine base image
-        zlib
-
-# 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
deleted file mode 100644
index 3a06263815..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-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 \
-        \
-        # manually update zlib from alpine base image
-        zlib
-
-# 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
deleted file mode 100644
index b3f0e62189..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-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 \
-        \
-        # manually update zlib from alpine base image
-        zlib
-
-# 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/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
deleted file mode 100644
index 8d5318a53c..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-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 \
-    && chmod 755 /usr/share/powershell/.store/powershell.linux.alpine/$powershell_version/powershell.linux.alpine/$powershell_version/tools/*/any/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
deleted file mode 100644
index 38c0f13dfc..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-aot-amd64-Dockerfile.approved.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:0.0.0-alpine3.XX-amd64
-
-RUN apk add --upgrade --no-cache \
-        gcc \
-        musl-dev \
-        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
deleted file mode 100644
index 76c6fb7d0b..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-aot-arm64v8-Dockerfile.approved.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:0.0.0-alpine3.XX-arm64v8
-
-RUN apk add --upgrade --no-cache \
-        gcc \
-        musl-dev \
-        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
deleted file mode 100644
index 34dc206b0e..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-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
deleted file mode 100644
index 691687fa4a..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-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/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
index e5ee67d8f2..d743d289a1 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
@@ -357,18 +357,11 @@ public static class TestData
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             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.Alpine323,           Arch = Arch.Amd64 },
             new ProductImageData { Version = V11_0, OS = OS.Alpine324,           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.Alpine324,           Arch = Arch.Amd64,   SdkOS = OS.Alpine324,
                     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 | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine324,           Arch = Arch.Amd64,   SdkOS = OS.Alpine324,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
-            new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
-                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine324,           Arch = Arch.Amd64,   SdkOS = OS.Alpine324,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.AzureLinux30,           Arch = Arch.Amd64 },
@@ -388,7 +381,6 @@ public static class TestData
             new ProductImageData { Version = V11_0, OS = OS.AzureLinux40Distroless, Arch = Arch.Amd64,   SdkOS = OS.AzureLinux40,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
 
-            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.Alpine324 },
             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.AzureLinux40Distroless, SdkOS = OS.AzureLinux40 },
@@ -419,40 +411,25 @@ public static class TestData
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             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.Alpine323,           Arch = Arch.Arm64 },
             new ProductImageData { Version = V11_0, OS = OS.Alpine324,           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.Alpine324,           Arch = Arch.Arm64,   SdkOS = OS.Alpine324,
                     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 | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine324,           Arch = Arch.Arm64,   SdkOS = OS.Alpine324,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
-            new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
-                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine324,           Arch = Arch.Arm64,   SdkOS = OS.Alpine324,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
 
-            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.Alpine324 },
             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.AzureLinux40Distroless, SdkOS = OS.AzureLinux40 },
             new() { Version = V11_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.ResoluteChiseled, SdkOS = OS.Resolute },
 
             // .NET 11 Linux Arm32
-            new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm },
             new ProductImageData { Version = V11_0, OS = OS.Alpine324,           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.Alpine324,           Arch = Arch.Arm,     SdkOS = OS.Alpine324,
                     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 | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine324,           Arch = Arch.Arm,     SdkOS = OS.Alpine324,
                     ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
-            new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
-                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine324,           Arch = Arch.Arm,     SdkOS = OS.Alpine324,
                     ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Resolute,               Arch = Arch.Arm },