diff --git a/README.aspnet.md b/README.aspnet.md
index 01ed8c1ff4..eb68a7a0b4 100644
--- a/README.aspnet.md
+++ b/README.aspnet.md
@@ -95,9 +95,13 @@ Tags | Dockerfile | OS Version
 10.0.1-noble-chiseled-composite-amd64, 10.0-noble-chiseled-composite-amd64, 10.0.1-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-composite-extra-amd64, 10.0-noble-chiseled-composite-extra-amd64, 10.0.1-noble-chiseled-composite-extra, 10.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.1-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/aspnet/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+10.0.1-alpine3.22-extra-amd64, 10.0-alpine3.22-extra-amd64, 10.0-alpine-extra-amd64, 10.0.1-alpine3.22-extra, 10.0-alpine3.22-extra, 10.0-alpine-extra | [Dockerfile](src/aspnet/10.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
 10.0.1-alpine3.22-composite-amd64, 10.0-alpine3.22-composite-amd64, 10.0-alpine-composite-amd64, 10.0.1-alpine3.22-composite, 10.0-alpine3.22-composite, 10.0-alpine-composite | [Dockerfile](src/aspnet/10.0/alpine3.22-composite/amd64/Dockerfile) | Alpine 3.22
+10.0.1-alpine3.22-composite-extra-amd64, 10.0-alpine3.22-composite-extra-amd64, 10.0-alpine-composite-extra-amd64, 10.0.1-alpine3.22-composite-extra, 10.0-alpine3.22-composite-extra, 10.0-alpine-composite-extra | [Dockerfile](src/aspnet/10.0/alpine3.22-composite-extra/amd64/Dockerfile) | Alpine 3.22
 10.0.1-alpine3.23-amd64, 10.0-alpine3.23-amd64, 10.0.1-alpine3.23, 10.0-alpine3.23 | [Dockerfile](src/aspnet/10.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+10.0.1-alpine3.23-extra-amd64, 10.0-alpine3.23-extra-amd64, 10.0.1-alpine3.23-extra, 10.0-alpine3.23-extra | [Dockerfile](src/aspnet/10.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
 10.0.1-alpine3.23-composite-amd64, 10.0-alpine3.23-composite-amd64, 10.0.1-alpine3.23-composite, 10.0-alpine3.23-composite | [Dockerfile](src/aspnet/10.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
+10.0.1-alpine3.23-composite-extra-amd64, 10.0-alpine3.23-composite-extra-amd64, 10.0.1-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.1-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.1-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/aspnet/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 10.0.1-azurelinux3.0-distroless-amd64, 10.0-azurelinux3.0-distroless-amd64, 10.0.1-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
 10.0.1-azurelinux3.0-distroless-extra-amd64, 10.0-azurelinux3.0-distroless-extra-amd64, 10.0.1-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
@@ -105,9 +109,13 @@ Tags | Dockerfile | OS Version
 10.0.1-azurelinux3.0-distroless-composite-extra-amd64, 10.0-azurelinux3.0-distroless-composite-extra-amd64, 10.0.1-azurelinux3.0-distroless-composite-extra, 10.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0
 9.0.11-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.11-bookworm-slim, 9.0-bookworm-slim, 9.0.11, 9.0 | [Dockerfile](src/aspnet/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12
 9.0.11-alpine3.22-amd64, 9.0-alpine3.22-amd64, 9.0-alpine-amd64, 9.0.11-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/aspnet/9.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+9.0.11-alpine3.22-extra-amd64, 9.0-alpine3.22-extra-amd64, 9.0-alpine-extra-amd64, 9.0.11-alpine3.22-extra, 9.0-alpine3.22-extra, 9.0-alpine-extra | [Dockerfile](src/aspnet/9.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
 9.0.11-alpine3.22-composite-amd64, 9.0-alpine3.22-composite-amd64, 9.0-alpine-composite-amd64, 9.0.11-alpine3.22-composite, 9.0-alpine3.22-composite, 9.0-alpine-composite | [Dockerfile](src/aspnet/9.0/alpine3.22-composite/amd64/Dockerfile) | Alpine 3.22
+9.0.11-alpine3.22-composite-extra-amd64, 9.0-alpine3.22-composite-extra-amd64, 9.0-alpine-composite-extra-amd64, 9.0.11-alpine3.22-composite-extra, 9.0-alpine3.22-composite-extra, 9.0-alpine-composite-extra | [Dockerfile](src/aspnet/9.0/alpine3.22-composite-extra/amd64/Dockerfile) | Alpine 3.22
 9.0.11-alpine3.23-amd64, 9.0-alpine3.23-amd64, 9.0.11-alpine3.23, 9.0-alpine3.23 | [Dockerfile](src/aspnet/9.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+9.0.11-alpine3.23-extra-amd64, 9.0-alpine3.23-extra-amd64, 9.0.11-alpine3.23-extra, 9.0-alpine3.23-extra | [Dockerfile](src/aspnet/9.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
 9.0.11-alpine3.23-composite-amd64, 9.0-alpine3.23-composite-amd64, 9.0.11-alpine3.23-composite, 9.0-alpine3.23-composite | [Dockerfile](src/aspnet/9.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
+9.0.11-alpine3.23-composite-extra-amd64, 9.0-alpine3.23-composite-extra-amd64, 9.0.11-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.11-noble-amd64, 9.0-noble-amd64, 9.0.11-noble, 9.0-noble | [Dockerfile](src/aspnet/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 9.0.11-noble-chiseled-amd64, 9.0-noble-chiseled-amd64, 9.0.11-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/aspnet/9.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 9.0.11-noble-chiseled-extra-amd64, 9.0-noble-chiseled-extra-amd64, 9.0.11-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -120,9 +128,13 @@ Tags | Dockerfile | OS Version
 9.0.11-azurelinux3.0-distroless-composite-extra-amd64, 9.0-azurelinux3.0-distroless-composite-extra-amd64, 9.0.11-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.22-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.22-bookworm-slim, 8.0-bookworm-slim, 8.0.22, 8.0 | [Dockerfile](src/aspnet/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12
 8.0.22-alpine3.22-amd64, 8.0-alpine3.22-amd64, 8.0-alpine-amd64, 8.0.22-alpine3.22, 8.0-alpine3.22, 8.0-alpine | [Dockerfile](src/aspnet/8.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+8.0.22-alpine3.22-extra-amd64, 8.0-alpine3.22-extra-amd64, 8.0-alpine-extra-amd64, 8.0.22-alpine3.22-extra, 8.0-alpine3.22-extra, 8.0-alpine-extra | [Dockerfile](src/aspnet/8.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
 8.0.22-alpine3.22-composite-amd64, 8.0-alpine3.22-composite-amd64, 8.0-alpine-composite-amd64, 8.0.22-alpine3.22-composite, 8.0-alpine3.22-composite, 8.0-alpine-composite | [Dockerfile](src/aspnet/8.0/alpine3.22-composite/amd64/Dockerfile) | Alpine 3.22
+8.0.22-alpine3.22-composite-extra-amd64, 8.0-alpine3.22-composite-extra-amd64, 8.0-alpine-composite-extra-amd64, 8.0.22-alpine3.22-composite-extra, 8.0-alpine3.22-composite-extra, 8.0-alpine-composite-extra | [Dockerfile](src/aspnet/8.0/alpine3.22-composite-extra/amd64/Dockerfile) | Alpine 3.22
 8.0.22-alpine3.23-amd64, 8.0-alpine3.23-amd64, 8.0.22-alpine3.23, 8.0-alpine3.23 | [Dockerfile](src/aspnet/8.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+8.0.22-alpine3.23-extra-amd64, 8.0-alpine3.23-extra-amd64, 8.0.22-alpine3.23-extra, 8.0-alpine3.23-extra | [Dockerfile](src/aspnet/8.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
 8.0.22-alpine3.23-composite-amd64, 8.0-alpine3.23-composite-amd64, 8.0.22-alpine3.23-composite, 8.0-alpine3.23-composite | [Dockerfile](src/aspnet/8.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
+8.0.22-alpine3.23-composite-extra-amd64, 8.0-alpine3.23-composite-extra-amd64, 8.0.22-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.22-noble-amd64, 8.0-noble-amd64, 8.0.22-noble, 8.0-noble | [Dockerfile](src/aspnet/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 8.0.22-noble-chiseled-amd64, 8.0-noble-chiseled-amd64, 8.0.22-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/aspnet/8.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 8.0.22-noble-chiseled-extra-amd64, 8.0-noble-chiseled-extra-amd64, 8.0.22-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/aspnet/8.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -149,7 +161,9 @@ Tags | Dockerfile | OS Version
 11.0.0-alpha.1-resolute-chiseled-composite-amd64, 11.0-preview-resolute-chiseled-composite-amd64, 11.0.0-alpha.1-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-resolute-chiseled-composite-extra-amd64, 11.0-preview-resolute-chiseled-composite-extra-amd64, 11.0.0-alpha.1-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-alpine3.23-composite-amd64, 11.0-preview-alpine3.23-composite-amd64, 11.0-preview-alpine-composite-amd64, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-composite-extra-amd64, 11.0-preview-alpine3.23-composite-extra-amd64, 11.0-preview-alpine-composite-extra-amd64, 11.0.0-alpha.1-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-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 11.0.0-alpha.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
 11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
@@ -166,9 +180,13 @@ Tags | Dockerfile | OS Version
 10.0.1-noble-chiseled-composite-arm64v8, 10.0-noble-chiseled-composite-arm64v8, 10.0.1-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-composite-extra-arm64v8, 10.0-noble-chiseled-composite-extra-arm64v8, 10.0.1-noble-chiseled-composite-extra, 10.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.1-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/aspnet/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+10.0.1-alpine3.22-extra-arm64v8, 10.0-alpine3.22-extra-arm64v8, 10.0-alpine-extra-arm64v8, 10.0.1-alpine3.22-extra, 10.0-alpine3.22-extra, 10.0-alpine-extra | [Dockerfile](src/aspnet/10.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
 10.0.1-alpine3.22-composite-arm64v8, 10.0-alpine3.22-composite-arm64v8, 10.0-alpine-composite-arm64v8, 10.0.1-alpine3.22-composite, 10.0-alpine3.22-composite, 10.0-alpine-composite | [Dockerfile](src/aspnet/10.0/alpine3.22-composite/arm64v8/Dockerfile) | Alpine 3.22
+10.0.1-alpine3.22-composite-extra-arm64v8, 10.0-alpine3.22-composite-extra-arm64v8, 10.0-alpine-composite-extra-arm64v8, 10.0.1-alpine3.22-composite-extra, 10.0-alpine3.22-composite-extra, 10.0-alpine-composite-extra | [Dockerfile](src/aspnet/10.0/alpine3.22-composite-extra/arm64v8/Dockerfile) | Alpine 3.22
 10.0.1-alpine3.23-arm64v8, 10.0-alpine3.23-arm64v8, 10.0.1-alpine3.23, 10.0-alpine3.23 | [Dockerfile](src/aspnet/10.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+10.0.1-alpine3.23-extra-arm64v8, 10.0-alpine3.23-extra-arm64v8, 10.0.1-alpine3.23-extra, 10.0-alpine3.23-extra | [Dockerfile](src/aspnet/10.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
 10.0.1-alpine3.23-composite-arm64v8, 10.0-alpine3.23-composite-arm64v8, 10.0.1-alpine3.23-composite, 10.0-alpine3.23-composite | [Dockerfile](src/aspnet/10.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
+10.0.1-alpine3.23-composite-extra-arm64v8, 10.0-alpine3.23-composite-extra-arm64v8, 10.0.1-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.1-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.1-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/aspnet/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.1-azurelinux3.0-distroless-arm64v8, 10.0-azurelinux3.0-distroless-arm64v8, 10.0.1-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.1-azurelinux3.0-distroless-extra-arm64v8, 10.0-azurelinux3.0-distroless-extra-arm64v8, 10.0.1-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
@@ -176,9 +194,13 @@ Tags | Dockerfile | OS Version
 10.0.1-azurelinux3.0-distroless-composite-extra-arm64v8, 10.0-azurelinux3.0-distroless-composite-extra-arm64v8, 10.0.1-azurelinux3.0-distroless-composite-extra, 10.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 9.0.11-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.11-bookworm-slim, 9.0-bookworm-slim, 9.0.11, 9.0 | [Dockerfile](src/aspnet/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
 9.0.11-alpine3.22-arm64v8, 9.0-alpine3.22-arm64v8, 9.0-alpine-arm64v8, 9.0.11-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/aspnet/9.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+9.0.11-alpine3.22-extra-arm64v8, 9.0-alpine3.22-extra-arm64v8, 9.0-alpine-extra-arm64v8, 9.0.11-alpine3.22-extra, 9.0-alpine3.22-extra, 9.0-alpine-extra | [Dockerfile](src/aspnet/9.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
 9.0.11-alpine3.22-composite-arm64v8, 9.0-alpine3.22-composite-arm64v8, 9.0-alpine-composite-arm64v8, 9.0.11-alpine3.22-composite, 9.0-alpine3.22-composite, 9.0-alpine-composite | [Dockerfile](src/aspnet/9.0/alpine3.22-composite/arm64v8/Dockerfile) | Alpine 3.22
+9.0.11-alpine3.22-composite-extra-arm64v8, 9.0-alpine3.22-composite-extra-arm64v8, 9.0-alpine-composite-extra-arm64v8, 9.0.11-alpine3.22-composite-extra, 9.0-alpine3.22-composite-extra, 9.0-alpine-composite-extra | [Dockerfile](src/aspnet/9.0/alpine3.22-composite-extra/arm64v8/Dockerfile) | Alpine 3.22
 9.0.11-alpine3.23-arm64v8, 9.0-alpine3.23-arm64v8, 9.0.11-alpine3.23, 9.0-alpine3.23 | [Dockerfile](src/aspnet/9.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+9.0.11-alpine3.23-extra-arm64v8, 9.0-alpine3.23-extra-arm64v8, 9.0.11-alpine3.23-extra, 9.0-alpine3.23-extra | [Dockerfile](src/aspnet/9.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
 9.0.11-alpine3.23-composite-arm64v8, 9.0-alpine3.23-composite-arm64v8, 9.0.11-alpine3.23-composite, 9.0-alpine3.23-composite | [Dockerfile](src/aspnet/9.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
+9.0.11-alpine3.23-composite-extra-arm64v8, 9.0-alpine3.23-composite-extra-arm64v8, 9.0.11-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.11-noble-arm64v8, 9.0-noble-arm64v8, 9.0.11-noble, 9.0-noble | [Dockerfile](src/aspnet/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 9.0.11-noble-chiseled-arm64v8, 9.0-noble-chiseled-arm64v8, 9.0.11-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/aspnet/9.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 9.0.11-noble-chiseled-extra-arm64v8, 9.0-noble-chiseled-extra-arm64v8, 9.0.11-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -191,9 +213,13 @@ Tags | Dockerfile | OS Version
 9.0.11-azurelinux3.0-distroless-composite-extra-arm64v8, 9.0-azurelinux3.0-distroless-composite-extra-arm64v8, 9.0.11-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.22-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.22-bookworm-slim, 8.0-bookworm-slim, 8.0.22, 8.0 | [Dockerfile](src/aspnet/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
 8.0.22-alpine3.22-arm64v8, 8.0-alpine3.22-arm64v8, 8.0-alpine-arm64v8, 8.0.22-alpine3.22, 8.0-alpine3.22, 8.0-alpine | [Dockerfile](src/aspnet/8.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+8.0.22-alpine3.22-extra-arm64v8, 8.0-alpine3.22-extra-arm64v8, 8.0-alpine-extra-arm64v8, 8.0.22-alpine3.22-extra, 8.0-alpine3.22-extra, 8.0-alpine-extra | [Dockerfile](src/aspnet/8.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
 8.0.22-alpine3.22-composite-arm64v8, 8.0-alpine3.22-composite-arm64v8, 8.0-alpine-composite-arm64v8, 8.0.22-alpine3.22-composite, 8.0-alpine3.22-composite, 8.0-alpine-composite | [Dockerfile](src/aspnet/8.0/alpine3.22-composite/arm64v8/Dockerfile) | Alpine 3.22
+8.0.22-alpine3.22-composite-extra-arm64v8, 8.0-alpine3.22-composite-extra-arm64v8, 8.0-alpine-composite-extra-arm64v8, 8.0.22-alpine3.22-composite-extra, 8.0-alpine3.22-composite-extra, 8.0-alpine-composite-extra | [Dockerfile](src/aspnet/8.0/alpine3.22-composite-extra/arm64v8/Dockerfile) | Alpine 3.22
 8.0.22-alpine3.23-arm64v8, 8.0-alpine3.23-arm64v8, 8.0.22-alpine3.23, 8.0-alpine3.23 | [Dockerfile](src/aspnet/8.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+8.0.22-alpine3.23-extra-arm64v8, 8.0-alpine3.23-extra-arm64v8, 8.0.22-alpine3.23-extra, 8.0-alpine3.23-extra | [Dockerfile](src/aspnet/8.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
 8.0.22-alpine3.23-composite-arm64v8, 8.0-alpine3.23-composite-arm64v8, 8.0.22-alpine3.23-composite, 8.0-alpine3.23-composite | [Dockerfile](src/aspnet/8.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
+8.0.22-alpine3.23-composite-extra-arm64v8, 8.0-alpine3.23-composite-extra-arm64v8, 8.0.22-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.22-noble-arm64v8, 8.0-noble-arm64v8, 8.0.22-noble, 8.0-noble | [Dockerfile](src/aspnet/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 8.0.22-noble-chiseled-arm64v8, 8.0-noble-chiseled-arm64v8, 8.0.22-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/aspnet/8.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 8.0.22-noble-chiseled-extra-arm64v8, 8.0-noble-chiseled-extra-arm64v8, 8.0.22-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/aspnet/8.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -220,7 +246,9 @@ Tags | Dockerfile | OS Version
 11.0.0-alpha.1-resolute-chiseled-composite-arm64v8, 11.0-preview-resolute-chiseled-composite-arm64v8, 11.0.0-alpha.1-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-resolute-chiseled-composite-extra-arm64v8, 11.0-preview-resolute-chiseled-composite-extra-arm64v8, 11.0.0-alpha.1-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-alpine3.23-composite-arm64v8, 11.0-preview-alpine3.23-composite-arm64v8, 11.0-preview-alpine-composite-arm64v8, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-composite-extra-arm64v8, 11.0-preview-alpine3.23-composite-extra-arm64v8, 11.0-preview-alpine-composite-extra-arm64v8, 11.0.0-alpha.1-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-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
 11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
@@ -237,14 +265,22 @@ Tags | Dockerfile | OS Version
 10.0.1-noble-chiseled-composite-arm32v7, 10.0-noble-chiseled-composite-arm32v7, 10.0.1-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-composite-extra-arm32v7, 10.0-noble-chiseled-composite-extra-arm32v7, 10.0.1-noble-chiseled-composite-extra, 10.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.1-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/aspnet/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+10.0.1-alpine3.22-extra-arm32v7, 10.0-alpine3.22-extra-arm32v7, 10.0-alpine-extra-arm32v7, 10.0.1-alpine3.22-extra, 10.0-alpine3.22-extra, 10.0-alpine-extra | [Dockerfile](src/aspnet/10.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
 10.0.1-alpine3.22-composite-arm32v7, 10.0-alpine3.22-composite-arm32v7, 10.0-alpine-composite-arm32v7, 10.0.1-alpine3.22-composite, 10.0-alpine3.22-composite, 10.0-alpine-composite | [Dockerfile](src/aspnet/10.0/alpine3.22-composite/arm32v7/Dockerfile) | Alpine 3.22
+10.0.1-alpine3.22-composite-extra-arm32v7, 10.0-alpine3.22-composite-extra-arm32v7, 10.0-alpine-composite-extra-arm32v7, 10.0.1-alpine3.22-composite-extra, 10.0-alpine3.22-composite-extra, 10.0-alpine-composite-extra | [Dockerfile](src/aspnet/10.0/alpine3.22-composite-extra/arm32v7/Dockerfile) | Alpine 3.22
 10.0.1-alpine3.23-arm32v7, 10.0-alpine3.23-arm32v7, 10.0.1-alpine3.23, 10.0-alpine3.23 | [Dockerfile](src/aspnet/10.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+10.0.1-alpine3.23-extra-arm32v7, 10.0-alpine3.23-extra-arm32v7, 10.0.1-alpine3.23-extra, 10.0-alpine3.23-extra | [Dockerfile](src/aspnet/10.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
 10.0.1-alpine3.23-composite-arm32v7, 10.0-alpine3.23-composite-arm32v7, 10.0.1-alpine3.23-composite, 10.0-alpine3.23-composite | [Dockerfile](src/aspnet/10.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
+10.0.1-alpine3.23-composite-extra-arm32v7, 10.0-alpine3.23-composite-extra-arm32v7, 10.0.1-alpine3.23-composite-extra, 10.0-alpine3.23-composite-extra | [Dockerfile](src/aspnet/10.0/alpine3.23-composite-extra/arm32v7/Dockerfile) | Alpine 3.23
 9.0.11-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.11-bookworm-slim, 9.0-bookworm-slim, 9.0.11, 9.0 | [Dockerfile](src/aspnet/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
 9.0.11-alpine3.22-arm32v7, 9.0-alpine3.22-arm32v7, 9.0-alpine-arm32v7, 9.0.11-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/aspnet/9.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+9.0.11-alpine3.22-extra-arm32v7, 9.0-alpine3.22-extra-arm32v7, 9.0-alpine-extra-arm32v7, 9.0.11-alpine3.22-extra, 9.0-alpine3.22-extra, 9.0-alpine-extra | [Dockerfile](src/aspnet/9.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
 9.0.11-alpine3.22-composite-arm32v7, 9.0-alpine3.22-composite-arm32v7, 9.0-alpine-composite-arm32v7, 9.0.11-alpine3.22-composite, 9.0-alpine3.22-composite, 9.0-alpine-composite | [Dockerfile](src/aspnet/9.0/alpine3.22-composite/arm32v7/Dockerfile) | Alpine 3.22
+9.0.11-alpine3.22-composite-extra-arm32v7, 9.0-alpine3.22-composite-extra-arm32v7, 9.0-alpine-composite-extra-arm32v7, 9.0.11-alpine3.22-composite-extra, 9.0-alpine3.22-composite-extra, 9.0-alpine-composite-extra | [Dockerfile](src/aspnet/9.0/alpine3.22-composite-extra/arm32v7/Dockerfile) | Alpine 3.22
 9.0.11-alpine3.23-arm32v7, 9.0-alpine3.23-arm32v7, 9.0.11-alpine3.23, 9.0-alpine3.23 | [Dockerfile](src/aspnet/9.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+9.0.11-alpine3.23-extra-arm32v7, 9.0-alpine3.23-extra-arm32v7, 9.0.11-alpine3.23-extra, 9.0-alpine3.23-extra | [Dockerfile](src/aspnet/9.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
 9.0.11-alpine3.23-composite-arm32v7, 9.0-alpine3.23-composite-arm32v7, 9.0.11-alpine3.23-composite, 9.0-alpine3.23-composite | [Dockerfile](src/aspnet/9.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
+9.0.11-alpine3.23-composite-extra-arm32v7, 9.0-alpine3.23-composite-extra-arm32v7, 9.0.11-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.11-noble-arm32v7, 9.0-noble-arm32v7, 9.0.11-noble, 9.0-noble | [Dockerfile](src/aspnet/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 9.0.11-noble-chiseled-arm32v7, 9.0-noble-chiseled-arm32v7, 9.0.11-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/aspnet/9.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
 9.0.11-noble-chiseled-extra-arm32v7, 9.0-noble-chiseled-extra-arm32v7, 9.0.11-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
@@ -252,9 +288,13 @@ Tags | Dockerfile | OS Version
 9.0.11-noble-chiseled-composite-extra-arm32v7, 9.0-noble-chiseled-composite-extra-arm32v7, 9.0.11-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.22-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.22-bookworm-slim, 8.0-bookworm-slim, 8.0.22, 8.0 | [Dockerfile](src/aspnet/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
 8.0.22-alpine3.22-arm32v7, 8.0-alpine3.22-arm32v7, 8.0-alpine-arm32v7, 8.0.22-alpine3.22, 8.0-alpine3.22, 8.0-alpine | [Dockerfile](src/aspnet/8.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+8.0.22-alpine3.22-extra-arm32v7, 8.0-alpine3.22-extra-arm32v7, 8.0-alpine-extra-arm32v7, 8.0.22-alpine3.22-extra, 8.0-alpine3.22-extra, 8.0-alpine-extra | [Dockerfile](src/aspnet/8.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
 8.0.22-alpine3.22-composite-arm32v7, 8.0-alpine3.22-composite-arm32v7, 8.0-alpine-composite-arm32v7, 8.0.22-alpine3.22-composite, 8.0-alpine3.22-composite, 8.0-alpine-composite | [Dockerfile](src/aspnet/8.0/alpine3.22-composite/arm32v7/Dockerfile) | Alpine 3.22
+8.0.22-alpine3.22-composite-extra-arm32v7, 8.0-alpine3.22-composite-extra-arm32v7, 8.0-alpine-composite-extra-arm32v7, 8.0.22-alpine3.22-composite-extra, 8.0-alpine3.22-composite-extra, 8.0-alpine-composite-extra | [Dockerfile](src/aspnet/8.0/alpine3.22-composite-extra/arm32v7/Dockerfile) | Alpine 3.22
 8.0.22-alpine3.23-arm32v7, 8.0-alpine3.23-arm32v7, 8.0.22-alpine3.23, 8.0-alpine3.23 | [Dockerfile](src/aspnet/8.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+8.0.22-alpine3.23-extra-arm32v7, 8.0-alpine3.23-extra-arm32v7, 8.0.22-alpine3.23-extra, 8.0-alpine3.23-extra | [Dockerfile](src/aspnet/8.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
 8.0.22-alpine3.23-composite-arm32v7, 8.0-alpine3.23-composite-arm32v7, 8.0.22-alpine3.23-composite, 8.0-alpine3.23-composite | [Dockerfile](src/aspnet/8.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
+8.0.22-alpine3.23-composite-extra-arm32v7, 8.0-alpine3.23-composite-extra-arm32v7, 8.0.22-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.22-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.22-jammy, 8.0-jammy | [Dockerfile](src/aspnet/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
 8.0.22-jammy-chiseled-arm32v7, 8.0-jammy-chiseled-arm32v7, 8.0.22-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/aspnet/8.0/jammy-chiseled/arm32v7/Dockerfile) | Ubuntu 22.04
 8.0.22-jammy-chiseled-extra-arm32v7, 8.0-jammy-chiseled-extra-arm32v7, 8.0.22-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/aspnet/8.0/jammy-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 22.04
@@ -271,7 +311,9 @@ Tags | Dockerfile | OS Version
 11.0.0-alpha.1-resolute-chiseled-composite-arm32v7, 11.0-preview-resolute-chiseled-composite-arm32v7, 11.0.0-alpha.1-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-resolute-chiseled-composite-extra-arm32v7, 11.0-preview-resolute-chiseled-composite-extra-arm32v7, 11.0.0-alpha.1-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-alpine3.23-composite-arm32v7, 11.0-preview-alpine3.23-composite-arm32v7, 11.0-preview-alpine-composite-arm32v7, 11.0.0-alpha.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-composite-extra-arm32v7, 11.0-preview-alpine3.23-composite-extra-arm32v7, 11.0-preview-alpine-composite-extra-arm32v7, 11.0.0-alpha.1-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
 
 ### Nano Server 2025 amd64 Tags
 
diff --git a/README.runtime.md b/README.runtime.md
index e599e0f13f..8385f5f769 100644
--- a/README.runtime.md
+++ b/README.runtime.md
@@ -82,13 +82,17 @@ Tags | Dockerfile | OS Version
 10.0.1-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
 10.0.1-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.1-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+10.0.1-alpine3.22-extra-amd64, 10.0-alpine3.22-extra-amd64, 10.0-alpine-extra-amd64, 10.0.1-alpine3.22-extra, 10.0-alpine3.22-extra, 10.0-alpine-extra | [Dockerfile](src/runtime/10.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
 10.0.1-alpine3.23-amd64, 10.0-alpine3.23-amd64, 10.0.1-alpine3.23, 10.0-alpine3.23 | [Dockerfile](src/runtime/10.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+10.0.1-alpine3.23-extra-amd64, 10.0-alpine3.23-extra-amd64, 10.0.1-alpine3.23-extra, 10.0-alpine3.23-extra | [Dockerfile](src/runtime/10.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
 10.0.1-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.1-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 10.0.1-azurelinux3.0-distroless-amd64, 10.0-azurelinux3.0-distroless-amd64, 10.0.1-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
 10.0.1-azurelinux3.0-distroless-extra-amd64, 10.0-azurelinux3.0-distroless-extra-amd64, 10.0.1-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
 9.0.11-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.11-bookworm-slim, 9.0-bookworm-slim, 9.0.11, 9.0 | [Dockerfile](src/runtime/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12
 9.0.11-alpine3.22-amd64, 9.0-alpine3.22-amd64, 9.0-alpine-amd64, 9.0.11-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/runtime/9.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+9.0.11-alpine3.22-extra-amd64, 9.0-alpine3.22-extra-amd64, 9.0-alpine-extra-amd64, 9.0.11-alpine3.22-extra, 9.0-alpine3.22-extra, 9.0-alpine-extra | [Dockerfile](src/runtime/9.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
 9.0.11-alpine3.23-amd64, 9.0-alpine3.23-amd64, 9.0.11-alpine3.23, 9.0-alpine3.23 | [Dockerfile](src/runtime/9.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+9.0.11-alpine3.23-extra-amd64, 9.0-alpine3.23-extra-amd64, 9.0.11-alpine3.23-extra, 9.0-alpine3.23-extra | [Dockerfile](src/runtime/9.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
 9.0.11-noble-amd64, 9.0-noble-amd64, 9.0.11-noble, 9.0-noble | [Dockerfile](src/runtime/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 9.0.11-noble-chiseled-amd64, 9.0-noble-chiseled-amd64, 9.0.11-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime/9.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 9.0.11-noble-chiseled-extra-amd64, 9.0-noble-chiseled-extra-amd64, 9.0.11-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime/9.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -97,7 +101,9 @@ Tags | Dockerfile | OS Version
 9.0.11-azurelinux3.0-distroless-extra-amd64, 9.0-azurelinux3.0-distroless-extra-amd64, 9.0.11-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.22-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.22-bookworm-slim, 8.0-bookworm-slim, 8.0.22, 8.0 | [Dockerfile](src/runtime/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12
 8.0.22-alpine3.22-amd64, 8.0-alpine3.22-amd64, 8.0-alpine-amd64, 8.0.22-alpine3.22, 8.0-alpine3.22, 8.0-alpine | [Dockerfile](src/runtime/8.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+8.0.22-alpine3.22-extra-amd64, 8.0-alpine3.22-extra-amd64, 8.0-alpine-extra-amd64, 8.0.22-alpine3.22-extra, 8.0-alpine3.22-extra, 8.0-alpine-extra | [Dockerfile](src/runtime/8.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
 8.0.22-alpine3.23-amd64, 8.0-alpine3.23-amd64, 8.0.22-alpine3.23, 8.0-alpine3.23 | [Dockerfile](src/runtime/8.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+8.0.22-alpine3.23-extra-amd64, 8.0-alpine3.23-extra-amd64, 8.0.22-alpine3.23-extra, 8.0-alpine3.23-extra | [Dockerfile](src/runtime/8.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
 8.0.22-noble-amd64, 8.0-noble-amd64, 8.0.22-noble, 8.0-noble | [Dockerfile](src/runtime/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 8.0.22-noble-chiseled-amd64, 8.0-noble-chiseled-amd64, 8.0.22-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/runtime/8.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
 8.0.22-noble-chiseled-extra-amd64, 8.0-noble-chiseled-extra-amd64, 8.0.22-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/runtime/8.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
@@ -116,6 +122,7 @@ Tags | Dockerfile | OS Version
 11.0.0-alpha.1-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 11.0.0-alpha.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
 11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
@@ -128,13 +135,17 @@ Tags | Dockerfile | OS Version
 10.0.1-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
 10.0.1-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.1-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+10.0.1-alpine3.22-extra-arm64v8, 10.0-alpine3.22-extra-arm64v8, 10.0-alpine-extra-arm64v8, 10.0.1-alpine3.22-extra, 10.0-alpine3.22-extra, 10.0-alpine-extra | [Dockerfile](src/runtime/10.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
 10.0.1-alpine3.23-arm64v8, 10.0-alpine3.23-arm64v8, 10.0.1-alpine3.23, 10.0-alpine3.23 | [Dockerfile](src/runtime/10.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+10.0.1-alpine3.23-extra-arm64v8, 10.0-alpine3.23-extra-arm64v8, 10.0.1-alpine3.23-extra, 10.0-alpine3.23-extra | [Dockerfile](src/runtime/10.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
 10.0.1-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.1-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.1-azurelinux3.0-distroless-arm64v8, 10.0-azurelinux3.0-distroless-arm64v8, 10.0.1-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
 10.0.1-azurelinux3.0-distroless-extra-arm64v8, 10.0-azurelinux3.0-distroless-extra-arm64v8, 10.0.1-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
 9.0.11-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.11-bookworm-slim, 9.0-bookworm-slim, 9.0.11, 9.0 | [Dockerfile](src/runtime/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
 9.0.11-alpine3.22-arm64v8, 9.0-alpine3.22-arm64v8, 9.0-alpine-arm64v8, 9.0.11-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/runtime/9.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+9.0.11-alpine3.22-extra-arm64v8, 9.0-alpine3.22-extra-arm64v8, 9.0-alpine-extra-arm64v8, 9.0.11-alpine3.22-extra, 9.0-alpine3.22-extra, 9.0-alpine-extra | [Dockerfile](src/runtime/9.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
 9.0.11-alpine3.23-arm64v8, 9.0-alpine3.23-arm64v8, 9.0.11-alpine3.23, 9.0-alpine3.23 | [Dockerfile](src/runtime/9.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+9.0.11-alpine3.23-extra-arm64v8, 9.0-alpine3.23-extra-arm64v8, 9.0.11-alpine3.23-extra, 9.0-alpine3.23-extra | [Dockerfile](src/runtime/9.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
 9.0.11-noble-arm64v8, 9.0-noble-arm64v8, 9.0.11-noble, 9.0-noble | [Dockerfile](src/runtime/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 9.0.11-noble-chiseled-arm64v8, 9.0-noble-chiseled-arm64v8, 9.0.11-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime/9.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 9.0.11-noble-chiseled-extra-arm64v8, 9.0-noble-chiseled-extra-arm64v8, 9.0.11-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime/9.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -143,7 +154,9 @@ Tags | Dockerfile | OS Version
 9.0.11-azurelinux3.0-distroless-extra-arm64v8, 9.0-azurelinux3.0-distroless-extra-arm64v8, 9.0.11-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.22-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.22-bookworm-slim, 8.0-bookworm-slim, 8.0.22, 8.0 | [Dockerfile](src/runtime/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
 8.0.22-alpine3.22-arm64v8, 8.0-alpine3.22-arm64v8, 8.0-alpine-arm64v8, 8.0.22-alpine3.22, 8.0-alpine3.22, 8.0-alpine | [Dockerfile](src/runtime/8.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+8.0.22-alpine3.22-extra-arm64v8, 8.0-alpine3.22-extra-arm64v8, 8.0-alpine-extra-arm64v8, 8.0.22-alpine3.22-extra, 8.0-alpine3.22-extra, 8.0-alpine-extra | [Dockerfile](src/runtime/8.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
 8.0.22-alpine3.23-arm64v8, 8.0-alpine3.23-arm64v8, 8.0.22-alpine3.23, 8.0-alpine3.23 | [Dockerfile](src/runtime/8.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+8.0.22-alpine3.23-extra-arm64v8, 8.0-alpine3.23-extra-arm64v8, 8.0.22-alpine3.23-extra, 8.0-alpine3.23-extra | [Dockerfile](src/runtime/8.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
 8.0.22-noble-arm64v8, 8.0-noble-arm64v8, 8.0.22-noble, 8.0-noble | [Dockerfile](src/runtime/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 8.0.22-noble-chiseled-arm64v8, 8.0-noble-chiseled-arm64v8, 8.0.22-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/runtime/8.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
 8.0.22-noble-chiseled-extra-arm64v8, 8.0-noble-chiseled-extra-arm64v8, 8.0.22-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/runtime/8.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
@@ -162,6 +175,7 @@ Tags | Dockerfile | OS Version
 11.0.0-alpha.1-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
 11.0.0-alpha.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-alpha.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 11.0.0-alpha.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
 11.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-alpha.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
@@ -174,16 +188,22 @@ Tags | Dockerfile | OS Version
 10.0.1-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
 10.0.1-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.1-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+10.0.1-alpine3.22-extra-arm32v7, 10.0-alpine3.22-extra-arm32v7, 10.0-alpine-extra-arm32v7, 10.0.1-alpine3.22-extra, 10.0-alpine3.22-extra, 10.0-alpine-extra | [Dockerfile](src/runtime/10.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
 10.0.1-alpine3.23-arm32v7, 10.0-alpine3.23-arm32v7, 10.0.1-alpine3.23, 10.0-alpine3.23 | [Dockerfile](src/runtime/10.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+10.0.1-alpine3.23-extra-arm32v7, 10.0-alpine3.23-extra-arm32v7, 10.0.1-alpine3.23-extra, 10.0-alpine3.23-extra | [Dockerfile](src/runtime/10.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
 9.0.11-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.11-bookworm-slim, 9.0-bookworm-slim, 9.0.11, 9.0 | [Dockerfile](src/runtime/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
 9.0.11-alpine3.22-arm32v7, 9.0-alpine3.22-arm32v7, 9.0-alpine-arm32v7, 9.0.11-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/runtime/9.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+9.0.11-alpine3.22-extra-arm32v7, 9.0-alpine3.22-extra-arm32v7, 9.0-alpine-extra-arm32v7, 9.0.11-alpine3.22-extra, 9.0-alpine3.22-extra, 9.0-alpine-extra | [Dockerfile](src/runtime/9.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
 9.0.11-alpine3.23-arm32v7, 9.0-alpine3.23-arm32v7, 9.0.11-alpine3.23, 9.0-alpine3.23 | [Dockerfile](src/runtime/9.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+9.0.11-alpine3.23-extra-arm32v7, 9.0-alpine3.23-extra-arm32v7, 9.0.11-alpine3.23-extra, 9.0-alpine3.23-extra | [Dockerfile](src/runtime/9.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
 9.0.11-noble-arm32v7, 9.0-noble-arm32v7, 9.0.11-noble, 9.0-noble | [Dockerfile](src/runtime/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
 9.0.11-noble-chiseled-arm32v7, 9.0-noble-chiseled-arm32v7, 9.0.11-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime/9.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
 9.0.11-noble-chiseled-extra-arm32v7, 9.0-noble-chiseled-extra-arm32v7, 9.0.11-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime/9.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
 8.0.22-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.22-bookworm-slim, 8.0-bookworm-slim, 8.0.22, 8.0 | [Dockerfile](src/runtime/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
 8.0.22-alpine3.22-arm32v7, 8.0-alpine3.22-arm32v7, 8.0-alpine-arm32v7, 8.0.22-alpine3.22, 8.0-alpine3.22, 8.0-alpine | [Dockerfile](src/runtime/8.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+8.0.22-alpine3.22-extra-arm32v7, 8.0-alpine3.22-extra-arm32v7, 8.0-alpine-extra-arm32v7, 8.0.22-alpine3.22-extra, 8.0-alpine3.22-extra, 8.0-alpine-extra | [Dockerfile](src/runtime/8.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
 8.0.22-alpine3.23-arm32v7, 8.0-alpine3.23-arm32v7, 8.0.22-alpine3.23, 8.0-alpine3.23 | [Dockerfile](src/runtime/8.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+8.0.22-alpine3.23-extra-arm32v7, 8.0-alpine3.23-extra-arm32v7, 8.0.22-alpine3.23-extra, 8.0-alpine3.23-extra | [Dockerfile](src/runtime/8.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
 8.0.22-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.22-jammy, 8.0-jammy | [Dockerfile](src/runtime/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
 8.0.22-jammy-chiseled-arm32v7, 8.0-jammy-chiseled-arm32v7, 8.0.22-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime/8.0/jammy-chiseled/arm32v7/Dockerfile) | Ubuntu 22.04
 8.0.22-jammy-chiseled-extra-arm32v7, 8.0-jammy-chiseled-extra-arm32v7, 8.0.22-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime/8.0/jammy-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 22.04
@@ -196,6 +216,7 @@ Tags | Dockerfile | OS Version
 11.0.0-alpha.1-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-alpha.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-alpha.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 26.04
 11.0.0-alpha.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-alpha.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+11.0.0-alpha.1-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-alpha.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
 
 ### Nano Server 2025 amd64 Tags
 
diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
index 0bc2d2a428..0eb657b9c0 100644
--- a/eng/mcr-tags-metadata-templates/aspnet-tags.yml
+++ b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
@@ -5,7 +5,9 @@ $(McrTagsYmlTagGroup:11.0-preview-resolute-chiseled-extra|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-resolute-chiseled-composite|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-resolute-chiseled-composite-extra|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-extra|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23-composite|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-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)
@@ -19,9 +21,13 @@ $(McrTagsYmlTagGroup:10.0-noble-chiseled-extra)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled-composite)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled-composite-extra)
 $(McrTagsYmlTagGroup:10.0-alpine3.22)
+$(McrTagsYmlTagGroup:10.0-alpine3.22-extra)
 $(McrTagsYmlTagGroup:10.0-alpine3.22-composite)
+$(McrTagsYmlTagGroup:10.0-alpine3.22-composite-extra)
 $(McrTagsYmlTagGroup:10.0-alpine3.23)
+$(McrTagsYmlTagGroup:10.0-alpine3.23-extra)
 $(McrTagsYmlTagGroup:10.0-alpine3.23-composite)
+$(McrTagsYmlTagGroup:10.0-alpine3.23-composite-extra)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0-distroless)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0-distroless-extra)
@@ -29,9 +35,13 @@ $(McrTagsYmlTagGroup:10.0-azurelinux3.0-distroless-composite)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0-distroless-composite-extra)
 $(McrTagsYmlTagGroup:9.0-bookworm-slim)
 $(McrTagsYmlTagGroup:9.0-alpine3.22)
+$(McrTagsYmlTagGroup:9.0-alpine3.22-extra)
 $(McrTagsYmlTagGroup:9.0-alpine3.22-composite)
+$(McrTagsYmlTagGroup:9.0-alpine3.22-composite-extra)
 $(McrTagsYmlTagGroup:9.0-alpine3.23)
+$(McrTagsYmlTagGroup:9.0-alpine3.23-extra)
 $(McrTagsYmlTagGroup:9.0-alpine3.23-composite)
+$(McrTagsYmlTagGroup:9.0-alpine3.23-composite-extra)
 $(McrTagsYmlTagGroup:9.0-noble)
 $(McrTagsYmlTagGroup:9.0-noble-chiseled)
 $(McrTagsYmlTagGroup:9.0-noble-chiseled-extra)
@@ -44,9 +54,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.22)
+$(McrTagsYmlTagGroup:8.0-alpine3.22-extra)
 $(McrTagsYmlTagGroup:8.0-alpine3.22-composite)
+$(McrTagsYmlTagGroup:8.0-alpine3.22-composite-extra)
 $(McrTagsYmlTagGroup:8.0-alpine3.23)
+$(McrTagsYmlTagGroup:8.0-alpine3.23-extra)
 $(McrTagsYmlTagGroup:8.0-alpine3.23-composite)
+$(McrTagsYmlTagGroup:8.0-alpine3.23-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-tags.yml b/eng/mcr-tags-metadata-templates/runtime-tags.yml
index f2dd14c973..0a67123308 100644
--- a/eng/mcr-tags-metadata-templates/runtime-tags.yml
+++ b/eng/mcr-tags-metadata-templates/runtime-tags.yml
@@ -3,6 +3,7 @@ $(McrTagsYmlTagGroup:11.0-preview-resolute|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-resolute-chiseled|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-resolute-chiseled-extra|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-alpine3.23|.NET 11 Preview Tags)
+$(McrTagsYmlTagGroup:11.0-preview-alpine3.23-extra|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless|.NET 11 Preview Tags)
 $(McrTagsYmlTagGroup:11.0-preview-azurelinux3.0-distroless-extra|.NET 11 Preview Tags)
@@ -12,13 +13,17 @@ $(McrTagsYmlTagGroup:10.0-noble)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled)
 $(McrTagsYmlTagGroup:10.0-noble-chiseled-extra)
 $(McrTagsYmlTagGroup:10.0-alpine3.22)
+$(McrTagsYmlTagGroup:10.0-alpine3.22-extra)
 $(McrTagsYmlTagGroup:10.0-alpine3.23)
+$(McrTagsYmlTagGroup:10.0-alpine3.23-extra)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0-distroless)
 $(McrTagsYmlTagGroup:10.0-azurelinux3.0-distroless-extra)
 $(McrTagsYmlTagGroup:9.0-bookworm-slim)
 $(McrTagsYmlTagGroup:9.0-alpine3.22)
+$(McrTagsYmlTagGroup:9.0-alpine3.22-extra)
 $(McrTagsYmlTagGroup:9.0-alpine3.23)
+$(McrTagsYmlTagGroup:9.0-alpine3.23-extra)
 $(McrTagsYmlTagGroup:9.0-noble)
 $(McrTagsYmlTagGroup:9.0-noble-chiseled)
 $(McrTagsYmlTagGroup:9.0-noble-chiseled-extra)
@@ -27,7 +32,9 @@ $(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless)
 $(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-extra)
 $(McrTagsYmlTagGroup:8.0-bookworm-slim)
 $(McrTagsYmlTagGroup:8.0-alpine3.22)
+$(McrTagsYmlTagGroup:8.0-alpine3.22-extra)
 $(McrTagsYmlTagGroup:8.0-alpine3.23)
+$(McrTagsYmlTagGroup:8.0-alpine3.23-extra)
 $(McrTagsYmlTagGroup:8.0-noble)
 $(McrTagsYmlTagGroup:8.0-noble-chiseled)
 $(McrTagsYmlTagGroup:8.0-noble-chiseled-extra)
diff --git a/manifest.json b/manifest.json
index d6e7f89172..e6c0e891e2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2966,6 +2966,89 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.22-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.22-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/8.0/alpine3.22-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.22-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/8.0/alpine3.22-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.22-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/8.0/alpine3.22-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.22-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
@@ -3018,6 +3101,85 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.23-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.23-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/8.0/alpine3.23-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.23-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/8.0/alpine3.23-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.23-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/8.0/alpine3.23-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
@@ -3961,51 +4123,82 @@
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-alpine3.23": {},
-            "$(dotnet|9.0|minor-tag)-alpine3.23": {}
+            "$(dotnet|9.0|fixed-tag)-alpine3.22-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.22-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/alpine3.23/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime/9.0/alpine3.22-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-amd64": {}
-              }
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.22-amd64"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/alpine3.23/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime/9.0/alpine3.22-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine-extra-arm32v7": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.22-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
               "variant": "v7"
             },
             {
-              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/alpine3.23/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime/9.0/alpine3.22-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine-extra-arm64v8": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.22-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -4013,21 +4206,21 @@
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-noble": {},
-            "$(dotnet|9.0|minor-tag)-noble": {}
+            "$(dotnet|9.0|fixed-tag)-alpine3.23": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.23": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/noble/amd64",
+              "dockerfile": "src/runtime/9.0/alpine3.23/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-amd64": {},
-                "$(dotnet|9.0|minor-tag)-noble-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-amd64": {}
               }
             },
             {
@@ -4035,13 +4228,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/noble/arm32v7",
+              "dockerfile": "src/runtime/9.0/alpine3.23/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-noble-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -4050,13 +4243,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/noble/arm64v8",
+              "dockerfile": "src/runtime/9.0/alpine3.23/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "noble",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-noble-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -4065,22 +4258,153 @@
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-noble-chiseled": {},
-            "$(dotnet|9.0|minor-tag)-noble-chiseled": {}
+            "$(dotnet|9.0|fixed-tag)-alpine3.23-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.23-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/9.0/noble-chiseled/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime/9.0/alpine3.23-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "noble-chiseled",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-noble-chiseled-amd64": {},
-                "$(dotnet|9.0|minor-tag)-noble-chiseled-amd64": {}
-              },
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.23-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/alpine3.23-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.23-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/alpine3.23-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-noble": {},
+            "$(dotnet|9.0|minor-tag)-noble": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/noble/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-noble-amd64": {},
+                "$(dotnet|9.0|minor-tag)-noble-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/noble/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-noble-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-noble-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/noble/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-noble-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-noble-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-noble-chiseled": {},
+            "$(dotnet|9.0|minor-tag)-noble-chiseled": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/noble-chiseled/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "noble-chiseled",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-noble-chiseled-amd64": {},
+                "$(dotnet|9.0|minor-tag)-noble-chiseled-amd64": {}
+              },
               "customBuildLegGroups": [
                 {
                   "name": "pr-build",
@@ -4605,51 +4929,82 @@
         {
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-alpine3.23": {},
-            "$(dotnet|10.0|minor-tag)-alpine3.23": {}
+            "$(dotnet|10.0|fixed-tag)-alpine3.22-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.22-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/alpine3.23/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime/10.0/alpine3.22-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-amd64": {}
-              }
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-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.22-amd64"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/alpine3.23/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime/10.0/alpine3.22-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine-extra-arm32v7": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.22-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
               "variant": "v7"
             },
             {
-              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/alpine3.23/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime/10.0/alpine3.22-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.23",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-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.22-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -4657,35 +5012,50 @@
         {
           "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": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.23": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/azurelinux3.0/amd64",
+              "dockerfile": "src/runtime/10.0/alpine3.23/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-amd64": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-amd64": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-amd64": {}
               }
             },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/10.0/alpine3.23/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-arm32v7": {}
+              },
+              "variant": "v7"
+            },
             {
               "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/azurelinux3.0/arm64v8",
+              "dockerfile": "src/runtime/10.0/alpine3.23/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "azurelinux3.0",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -4694,41 +5064,157 @@
         {
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless": {},
-            "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless": {}
+            "$(dotnet|10.0|fixed-tag)-alpine3.23-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.23-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/azurelinux3.0-distroless/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime/10.0/alpine3.23-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
-                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
-                  "name": "pr-build",
-                  "type": "Supplemental",
+                  "name": "test-dependencies",
+                  "type": "Integral",
                   "dependencies": [
-                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-amd64"
                   ]
                 }
               ]
             },
             {
-              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/runtime/10.0/azurelinux3.0-distroless/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "dockerfile": "src/runtime/10.0/alpine3.23-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/10.0/alpine3.23-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.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": {}
+              },
+              "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)-azurelinux3.0": {},
+            "$(dotnet|10.0|minor-tag)-azurelinux3.0": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/10.0/azurelinux3.0/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-amd64": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/10.0/azurelinux3.0/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless": {},
+            "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/10.0/azurelinux3.0-distroless/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-amd64": {},
+                "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "pr-build",
+                  "type": "Supplemental",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-azurelinux3.0-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/10.0/azurelinux3.0-distroless/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "azurelinux3.0-distroless",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {},
                 "$(dotnet|10.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {}
@@ -5165,6 +5651,89 @@
             }
           ]
         },
+        {
+          "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": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
@@ -5669,60 +6238,226 @@
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
-            "$(dotnet|8.0|fixed-tag)-alpine3.22-composite": {},
-            "$(dotnet|8.0|minor-tag)-alpine3.22-composite": {},
-            "$(dotnet|8.0|minor-tag)-alpine-composite": {}
+            "$(dotnet|8.0|fixed-tag)-alpine3.22-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.22-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/8.0/alpine3.22-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/8.0/alpine3.22-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-composite-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine-composite-amd64": {}
-              }
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.22-amd64"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/8.0/alpine3.22-composite/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/8.0/alpine3.22-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-composite-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine-composite-arm32v7": {}
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine-extra-arm32v7": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.22-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
               "variant": "v7"
             },
             {
-              "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/8.0/alpine3.22-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/8.0/alpine3.22-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-composite-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine-composite-arm64v8": {}
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine-extra-arm64v8": {}
               },
-              "variant": "v8"
-            }
-          ]
-        },
-        {
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.22-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.22-composite": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.22-composite": {},
+            "$(dotnet|8.0|minor-tag)-alpine-composite": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.22-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-composite-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine-composite-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.22-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-composite-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine-composite-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.22-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-composite-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.22-composite-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine-composite-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.22-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-composite-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine-composite-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.22-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.22-composite-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-composite-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine-composite-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.22-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.22-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.22-composite-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-composite-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine-composite-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.22-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
+        {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
             "$(dotnet|8.0|fixed-tag)-alpine3.23": {},
@@ -5774,6 +6509,85 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.23-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.23-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.23-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.23-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.23-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.23-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.23-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
@@ -5826,6 +6640,85 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.23-composite-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.23-composite-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.23-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-composite-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-composite-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.23-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.23-composite-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-composite-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-composite-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.23-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.23-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-composite-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-composite-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
@@ -7152,18 +8045,157 @@
               "variant": "v7"
             },
             {
-              "architecture": "arm64",
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/bookworm-slim/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "bookworm-slim",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-bookworm-slim-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-bookworm-slim-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-alpine3.22": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.22": {},
+            "$(dotnet|9.0|minor-tag)-alpine": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.22/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.22/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.22/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-alpine3.22-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.22-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.22-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.22-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.22-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.22-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/bookworm-slim/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/aspnet/9.0/alpine3.22-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "bookworm-slim",
+              "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-bookworm-slim-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-bookworm-slim-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine-extra-arm64v8": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.22-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -7171,54 +8203,54 @@
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|9.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|9.0|minor-tag)-alpine": {}
+            "$(dotnet|9.0|fixed-tag)-alpine3.22-composite": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.22-composite": {},
+            "$(dotnet|9.0|minor-tag)-alpine-composite": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/aspnet/9.0/alpine3.22-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine-composite-amd64": {}
               }
             },
             {
               "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/aspnet/9.0/alpine3.22-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine-composite-arm32v7": {}
               },
               "variant": "v7"
             },
             {
               "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/aspnet/9.0/alpine3.22-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine-composite-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -7227,55 +8259,82 @@
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-alpine3.22-composite": {},
-            "$(dotnet|9.0|minor-tag)-alpine3.22-composite": {},
-            "$(dotnet|9.0|minor-tag)-alpine-composite": {}
+            "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.22-composite-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine-composite-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/9.0/alpine3.22-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine-composite-amd64": {}
-              }
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine-composite-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.22-amd64"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22-composite/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/9.0/alpine3.22-composite-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine-composite-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine-composite-extra-arm32v7": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.22-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
               "variant": "v7"
             },
             {
-              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/9.0/alpine3.22-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
               "osVersion": "alpine3.22",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine-composite-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-composite-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine-composite-extra-arm64v8": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.22-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -7332,6 +8391,85 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-alpine3.23-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.23-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.23-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.23-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.23-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.23-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.23-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
@@ -7384,6 +8522,85 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.23-composite-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.23-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.23-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.23-composite-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.23-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/9.0/alpine3.23-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
@@ -8250,6 +9467,89 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-alpine3.22-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.22-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.22-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-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.22-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.22-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.22-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.22-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-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.22-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
@@ -8289,19 +9589,233 @@
               "variant": "v7"
             },
             {
-              "architecture": "arm64",
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.22-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-composite-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-composite-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-alpine3.22-composite-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.22-composite-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine-composite-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.22-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-composite-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-composite-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine-composite-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.22-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.22-composite-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-composite-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-composite-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine-composite-extra-arm32v7": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.22-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.22-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-composite-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-composite-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine-composite-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.22-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-alpine3.23": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.23": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.23/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.23/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.23/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-alpine3.23-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.23-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.23-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.23-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.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": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
+              "variant": "v7"
+            },
+            {
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.22-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/10.0/alpine3.23-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.22-composite-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-composite-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine-composite-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-arm64v8": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -8309,50 +9823,50 @@
         {
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
-            "$(dotnet|10.0|fixed-tag)-alpine3.23": {},
-            "$(dotnet|10.0|minor-tag)-alpine3.23": {}
+            "$(dotnet|10.0|fixed-tag)-alpine3.23-composite": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.23-composite": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.23/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "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-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-amd64": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-amd64": {}
               }
             },
             {
               "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.23/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "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-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(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)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.23/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "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-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -8361,51 +9875,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.23-composite-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.23-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.23-composite-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-amd64": {}
-              }
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-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.23-composite-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-arm32v7": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-extra-arm32v7": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-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.23-composite-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.23-composite-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.23-composite-extra-arm64v8": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -9189,6 +10730,89 @@
             }
           ]
         },
+        {
+          "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)-alpine-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
@@ -9245,6 +10869,89 @@
             }
           ]
         },
+        {
+          "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)-alpine-composite-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|11.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|11.0|product-version)",
           "sharedTags": {
diff --git a/src/aspnet/10.0/alpine3.22-composite-extra/amd64/Dockerfile b/src/aspnet/10.0/alpine3.22-composite-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..b0d66d6d1c
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.22-composite-extra/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.22-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.1 \
+    && 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.1-alpine3.22-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.1
+
+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.22-composite-extra/arm32v7/Dockerfile b/src/aspnet/10.0/alpine3.22-composite-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..cd55bccf89
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.22-composite-extra/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.1 \
+    && 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.1-alpine3.22-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.1
+
+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.22-composite-extra/arm64v8/Dockerfile b/src/aspnet/10.0/alpine3.22-composite-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..6534ba9f16
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.22-composite-extra/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.1 \
+    && 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.1-alpine3.22-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.1
+
+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.22-extra/amd64/Dockerfile b/src/aspnet/10.0/alpine3.22-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..f0c49bb497
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.22-extra/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.22-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.1 \
+    && 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.1-alpine3.22-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.22-extra/arm32v7/Dockerfile b/src/aspnet/10.0/alpine3.22-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..b36c2b6681
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.22-extra/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.1 \
+    && 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.1-alpine3.22-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.22-extra/arm64v8/Dockerfile b/src/aspnet/10.0/alpine3.22-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..dcc1cf9a05
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.22-extra/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.1 \
+    && 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.1-alpine3.22-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.23-composite-extra/amd64/Dockerfile b/src/aspnet/10.0/alpine3.23-composite-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..4a5e00412f
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.23-composite-extra/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.23-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.1 \
+    && 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.1-alpine3.23-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.1
+
+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.23-composite-extra/arm32v7/Dockerfile b/src/aspnet/10.0/alpine3.23-composite-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..6064bc78b3
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.23-composite-extra/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.1 \
+    && 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.1-alpine3.23-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.1
+
+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.23-composite-extra/arm64v8/Dockerfile b/src/aspnet/10.0/alpine3.23-composite-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..6a4eaa4924
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.23-composite-extra/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.1 \
+    && 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.1-alpine3.23-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.1 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.1
+
+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.23-extra/amd64/Dockerfile b/src/aspnet/10.0/alpine3.23-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..89c777aada
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.23-extra/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.23-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.1 \
+    && 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.1-alpine3.23-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.23-extra/arm32v7/Dockerfile b/src/aspnet/10.0/alpine3.23-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..d12637675e
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.23-extra/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.1 \
+    && 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.1-alpine3.23-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.23-extra/arm64v8/Dockerfile b/src/aspnet/10.0/alpine3.23-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..4c3141764f
--- /dev/null
+++ b/src/aspnet/10.0/alpine3.23-extra/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.1 \
+    && 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.1-alpine3.23-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.23-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23-composite-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..9ad31e0fbb
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.23-composite-extra/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.23-composite-extra/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23-composite-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..7f0b87ce05
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.23-composite-extra/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.23-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23-composite-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..81295642c9
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.23-composite-extra/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Composite Image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
+    # ASP.NET Core version
+    ASPNET_VERSION=11.0.0-alpha.1.25609.108
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..ad85c6ae1c
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..9df3c6b310
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..b5f88ee870
--- /dev/null
+++ b/src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
+    && wget \
+        https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512)  aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
+    && rm \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
+        aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512
+
+
+# ASP.NET Core image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.22-composite-extra/amd64/Dockerfile b/src/aspnet/8.0/alpine3.22-composite-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..6b019c0d28
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.22-composite-extra/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.22-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.22 \
+    && 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.22-alpine3.22-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.22 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.22
+
+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.22-composite-extra/arm32v7/Dockerfile b/src/aspnet/8.0/alpine3.22-composite-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..aba2c72503
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.22-composite-extra/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.22 \
+    && 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.22-alpine3.22-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.22 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.22
+
+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.22-composite-extra/arm64v8/Dockerfile b/src/aspnet/8.0/alpine3.22-composite-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..7d65ac88fa
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.22-composite-extra/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.22 \
+    && 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.22-alpine3.22-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.22 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.22
+
+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.22-extra/amd64/Dockerfile b/src/aspnet/8.0/alpine3.22-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..639f83b95a
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.22-extra/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.22-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.22 \
+    && 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.22-alpine3.22-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.22
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.22-extra/arm32v7/Dockerfile b/src/aspnet/8.0/alpine3.22-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..ac39e229a2
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.22-extra/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.22 \
+    && 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.22-alpine3.22-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.22
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.22-extra/arm64v8/Dockerfile b/src/aspnet/8.0/alpine3.22-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..5aab75e9c7
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.22-extra/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.22 \
+    && 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.22-alpine3.22-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.22
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.23-composite-extra/amd64/Dockerfile b/src/aspnet/8.0/alpine3.23-composite-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..5a2608ebb0
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.23-composite-extra/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.23-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.22 \
+    && 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.22-alpine3.23-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.22 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.22
+
+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.23-composite-extra/arm32v7/Dockerfile b/src/aspnet/8.0/alpine3.23-composite-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..5cde8c8393
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.23-composite-extra/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.22 \
+    && 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.22-alpine3.23-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.22 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.22
+
+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.23-composite-extra/arm64v8/Dockerfile b/src/aspnet/8.0/alpine3.23-composite-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..bc0608b25e
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.23-composite-extra/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.22 \
+    && 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.22-alpine3.23-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.22 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.22
+
+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.23-extra/amd64/Dockerfile b/src/aspnet/8.0/alpine3.23-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..f44a20071c
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.23-extra/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.23-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.22 \
+    && 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.22-alpine3.23-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.22
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.23-extra/arm32v7/Dockerfile b/src/aspnet/8.0/alpine3.23-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..62cf4b2d81
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.23-extra/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.22 \
+    && 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.22-alpine3.23-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.22
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.23-extra/arm64v8/Dockerfile b/src/aspnet/8.0/alpine3.23-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..59b7dbcb11
--- /dev/null
+++ b/src/aspnet/8.0/alpine3.23-extra/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.22 \
+    && 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.22-alpine3.23-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.22
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.22-composite-extra/amd64/Dockerfile b/src/aspnet/9.0/alpine3.22-composite-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..47a89da7a0
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.22-composite-extra/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.22-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.11 \
+    && 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.11-alpine3.22-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.11 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.11
+
+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.22-composite-extra/arm32v7/Dockerfile b/src/aspnet/9.0/alpine3.22-composite-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..de18335bba
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.22-composite-extra/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.11 \
+    && 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.11-alpine3.22-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.11 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.11
+
+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.22-composite-extra/arm64v8/Dockerfile b/src/aspnet/9.0/alpine3.22-composite-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..dac5aef600
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.22-composite-extra/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.11 \
+    && 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.11-alpine3.22-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.11 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.11
+
+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.22-extra/amd64/Dockerfile b/src/aspnet/9.0/alpine3.22-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..10ee7ca6c7
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.22-extra/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.22-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.11 \
+    && 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.11-alpine3.22-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.11
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.22-extra/arm32v7/Dockerfile b/src/aspnet/9.0/alpine3.22-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..ac2895393d
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.22-extra/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.11 \
+    && 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.11-alpine3.22-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.11
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.22-extra/arm64v8/Dockerfile b/src/aspnet/9.0/alpine3.22-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..859a5c2812
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.22-extra/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.11 \
+    && 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.11-alpine3.22-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.11
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.23-composite-extra/amd64/Dockerfile b/src/aspnet/9.0/alpine3.23-composite-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..ad4954b6de
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.23-composite-extra/amd64/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.23-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.11 \
+    && 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.11-alpine3.23-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.11 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.11
+
+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.23-composite-extra/arm32v7/Dockerfile b/src/aspnet/9.0/alpine3.23-composite-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..32fa2fb53e
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.23-composite-extra/arm32v7/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.11 \
+    && 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.11-alpine3.23-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.11 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.11
+
+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.23-composite-extra/arm64v8/Dockerfile b/src/aspnet/9.0/alpine3.23-composite-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..df1d94c137
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.23-composite-extra/arm64v8/Dockerfile
@@ -0,0 +1,29 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.11 \
+    && 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.11-alpine3.23-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.11 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.11
+
+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.23-extra/amd64/Dockerfile b/src/aspnet/9.0/alpine3.23-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..2f7826f258
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.23-extra/amd64/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.23-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.11 \
+    && 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.11-alpine3.23-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.11
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.23-extra/arm32v7/Dockerfile b/src/aspnet/9.0/alpine3.23-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..3ba0579ee4
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.23-extra/arm32v7/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.11 \
+    && 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.11-alpine3.23-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.11
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.23-extra/arm64v8/Dockerfile b/src/aspnet/9.0/alpine3.23-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..dd696017ca
--- /dev/null
+++ b/src/aspnet/9.0/alpine3.23-extra/arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.11 \
+    && 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.11-alpine3.23-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.11
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/runtime/10.0/alpine3.22-extra/amd64/Dockerfile b/src/runtime/10.0/alpine3.22-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..fb965d2136
--- /dev/null
+++ b/src/runtime/10.0/alpine3.22-extra/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.22-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.1 \
+    && 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.1-alpine3.22-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.1
+
+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.22-extra/arm32v7/Dockerfile b/src/runtime/10.0/alpine3.22-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..1f9c393667
--- /dev/null
+++ b/src/runtime/10.0/alpine3.22-extra/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.1 \
+    && 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.1-alpine3.22-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.1
+
+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.22-extra/arm64v8/Dockerfile b/src/runtime/10.0/alpine3.22-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..a5d108b967
--- /dev/null
+++ b/src/runtime/10.0/alpine3.22-extra/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.1 \
+    && 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.1-alpine3.22-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.1
+
+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.23-extra/amd64/Dockerfile b/src/runtime/10.0/alpine3.23-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..270470452e
--- /dev/null
+++ b/src/runtime/10.0/alpine3.23-extra/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.23-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.1 \
+    && 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.1-alpine3.23-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.1
+
+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.23-extra/arm32v7/Dockerfile b/src/runtime/10.0/alpine3.23-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..283d82fa65
--- /dev/null
+++ b/src/runtime/10.0/alpine3.23-extra/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.1 \
+    && 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.1-alpine3.23-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.1
+
+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.23-extra/arm64v8/Dockerfile b/src/runtime/10.0/alpine3.23-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..b881b683ec
--- /dev/null
+++ b/src/runtime/10.0/alpine3.23-extra/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:10.0.1-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.1 \
+    && 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.1-alpine3.23-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.1
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile b/src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..f1909c8bf5
--- /dev/null
+++ b/src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
+    && wget \
+        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile b/src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..371ba85f12
--- /dev/null
+++ b/src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
+    && wget \
+        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile b/src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..b0d4fca8d0
--- /dev/null
+++ b/src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=11.0.0-alpha.1.25609.108 \
+    && wget \
+        https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \
+    && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512)  dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
+    && mkdir --parents /dotnet \
+    && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \
+    && rm \
+        dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \
+        dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512
+
+
+# .NET runtime image
+FROM $REPO:11.0.0-alpha.1-alpine3.23-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=11.0.0-alpha.1.25609.108
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/src/runtime/8.0/alpine3.22-extra/amd64/Dockerfile b/src/runtime/8.0/alpine3.22-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..7a2d699d04
--- /dev/null
+++ b/src/runtime/8.0/alpine3.22-extra/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.22-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.22 \
+    && 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.22-alpine3.22-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.22
+
+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.22-extra/arm32v7/Dockerfile b/src/runtime/8.0/alpine3.22-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..a46717fea0
--- /dev/null
+++ b/src/runtime/8.0/alpine3.22-extra/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.22 \
+    && 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.22-alpine3.22-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.22
+
+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.22-extra/arm64v8/Dockerfile b/src/runtime/8.0/alpine3.22-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..66b3259029
--- /dev/null
+++ b/src/runtime/8.0/alpine3.22-extra/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.22 \
+    && 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.22-alpine3.22-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.22
+
+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.23-extra/amd64/Dockerfile b/src/runtime/8.0/alpine3.23-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..c8198a80ad
--- /dev/null
+++ b/src/runtime/8.0/alpine3.23-extra/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.23-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.22 \
+    && 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.22-alpine3.23-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.22
+
+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.23-extra/arm32v7/Dockerfile b/src/runtime/8.0/alpine3.23-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..f65da42efe
--- /dev/null
+++ b/src/runtime/8.0/alpine3.23-extra/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.22 \
+    && 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.22-alpine3.23-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.22
+
+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.23-extra/arm64v8/Dockerfile b/src/runtime/8.0/alpine3.23-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..f19ef42dea
--- /dev/null
+++ b/src/runtime/8.0/alpine3.23-extra/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:8.0.22-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.22 \
+    && 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.22-alpine3.23-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.22
+
+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.22-extra/amd64/Dockerfile b/src/runtime/9.0/alpine3.22-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..ed1cbe22b3
--- /dev/null
+++ b/src/runtime/9.0/alpine3.22-extra/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.22-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.11 \
+    && 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.11-alpine3.22-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.11
+
+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.22-extra/arm32v7/Dockerfile b/src/runtime/9.0/alpine3.22-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..3be1ac6438
--- /dev/null
+++ b/src/runtime/9.0/alpine3.22-extra/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.11 \
+    && 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.11-alpine3.22-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.11
+
+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.22-extra/arm64v8/Dockerfile b/src/runtime/9.0/alpine3.22-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..99e8d2231f
--- /dev/null
+++ b/src/runtime/9.0/alpine3.22-extra/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.11 \
+    && 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.11-alpine3.22-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.11
+
+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.23-extra/amd64/Dockerfile b/src/runtime/9.0/alpine3.23-extra/amd64/Dockerfile
new file mode 100644
index 0000000000..a1c702d27d
--- /dev/null
+++ b/src/runtime/9.0/alpine3.23-extra/amd64/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.23-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.11 \
+    && 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.11-alpine3.23-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.11
+
+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.23-extra/arm32v7/Dockerfile b/src/runtime/9.0/alpine3.23-extra/arm32v7/Dockerfile
new file mode 100644
index 0000000000..8a71905a57
--- /dev/null
+++ b/src/runtime/9.0/alpine3.23-extra/arm32v7/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.11 \
+    && 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.11-alpine3.23-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.11
+
+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.23-extra/arm64v8/Dockerfile b/src/runtime/9.0/alpine3.23-extra/arm64v8/Dockerfile
new file mode 100644
index 0000000000..24a1c278d2
--- /dev/null
+++ b/src/runtime/9.0/alpine3.23-extra/arm64v8/Dockerfile
@@ -0,0 +1,27 @@
+ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
+
+# Installer image
+FROM $REPO:9.0.11-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.11 \
+    && 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.11-alpine3.23-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.11
+
+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.22-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-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.22-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.22-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-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.22-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.22-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-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.22-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.22-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-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.22-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.22-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-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.22-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.22-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-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.22-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-10.0-alpine3.23-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.23-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.23-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.23-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.23-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.23-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.23-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.23-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.23-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.23-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.23-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.23-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.23-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.23-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.23-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.23-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.23-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.23-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.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
new file mode 100644
index 0000000000..e0b5d64300
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-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.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
new file mode 100644
index 0000000000..a14ff3c1ee
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-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.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
new file mode 100644
index 0000000000..a0c2ff4a9d
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-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.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
new file mode 100644
index 0000000000..9ad16a77c0
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-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.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
new file mode 100644
index 0000000000..943c45a2c4
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-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.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
new file mode 100644
index 0000000000..3c5e0d5f4a
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-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.22-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.22-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.22-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.22-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.22-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.22-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.22-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.22-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.22-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.22-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.22-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.22-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.22-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.22-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.22-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.22-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.22-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.22-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-8.0-alpine3.23-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.23-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.23-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.23-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.23-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.23-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.23-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.23-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.23-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.23-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.23-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.23-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.23-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.23-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.23-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.23-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-alpine3.23-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.23-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.22-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.22-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.22-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.22-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.22-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.22-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.22-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.22-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.22-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.22-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.22-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.22-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.22-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.22-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.22-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.22-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.22-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.22-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.23-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.23-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.23-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.23-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.23-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.23-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.23-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.23-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.23-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.23-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.23-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.23-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.23-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.23-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.23-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.23-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-alpine3.23-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.23-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.22-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.22-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.22-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.22-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.22-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.22-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.22-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.22-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.22-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-10.0-alpine3.23-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.23-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.23-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.23-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.23-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.23-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.23-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.23-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.23-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.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
new file mode 100644
index 0000000000..970977d515
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-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.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
new file mode 100644
index 0000000000..319ebb6062
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-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.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
new file mode 100644
index 0000000000..aa51503f49
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-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.22-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.22-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.22-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.22-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.22-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.22-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.22-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.22-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.22-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-8.0-alpine3.23-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.23-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.23-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.23-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.23-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.23-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.23-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-alpine3.23-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.23-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.22-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.22-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.22-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.22-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.22-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.22-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.22-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.22-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.22-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.23-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.23-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.23-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.23-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.23-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.23-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.23-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-alpine3.23-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.23-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/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
index 60cb79f81d..8ccf6d0434 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
@@ -37,12 +37,16 @@ public static class TestData
             new ProductImageData { Version = V8_0, OS = OS.Alpine322,           Arch = Arch.Amd64,   SdkOS = OS.Alpine322,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.Alpine322,           Arch = Arch.Amd64,   SdkOS = OS.Alpine322,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V8_0, OS = OS.Alpine322,           Arch = Arch.Amd64,   SdkOS = OS.Alpine322,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.Alpine323,           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.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    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.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,
@@ -97,12 +101,16 @@ public static class TestData
             new ProductImageData { Version = V8_0, OS = OS.Alpine322,           Arch = Arch.Arm64,   SdkOS = OS.Alpine322,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.Alpine322,           Arch = Arch.Arm64,   SdkOS = OS.Alpine322,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V8_0, OS = OS.Alpine322,           Arch = Arch.Arm64,   SdkOS = OS.Alpine322,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.Alpine323,           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.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    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.BookwormSlim,        Arch = Arch.Arm },
             new ProductImageData { Version = V8_0, OS = OS.Jammy,               Arch = Arch.Arm },
@@ -117,12 +125,16 @@ public static class TestData
             new ProductImageData { Version = V8_0, OS = OS.Alpine322,           Arch = Arch.Arm,     SdkOS = OS.Alpine322,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.Alpine322,           Arch = Arch.Arm,     SdkOS = OS.Alpine322,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V8_0, OS = OS.Alpine322,           Arch = Arch.Arm,     SdkOS = OS.Alpine322,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V8_0, OS = OS.Alpine323,           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.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    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 = V9_0, OS = OS.BookwormSlim,        Arch = Arch.Amd64 },
@@ -139,12 +151,16 @@ public static class TestData
             new ProductImageData { Version = V9_0, OS = OS.Alpine322,           Arch = Arch.Amd64,   SdkOS = OS.Alpine322,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.Alpine322,           Arch = Arch.Amd64,   SdkOS = OS.Alpine322,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V9_0, OS = OS.Alpine322,           Arch = Arch.Amd64,   SdkOS = OS.Alpine322,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.Alpine323,           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.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    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.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,
@@ -175,24 +191,32 @@ public static class TestData
             new ProductImageData { Version = V9_0, OS = OS.Alpine322,           Arch = Arch.Arm64,   SdkOS = OS.Alpine322,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.Alpine322,           Arch = Arch.Arm64,   SdkOS = OS.Alpine322,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V9_0, OS = OS.Alpine322,           Arch = Arch.Arm64,   SdkOS = OS.Alpine322,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.Alpine323,           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.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    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.BookwormSlim,        Arch = Arch.Arm },
             new ProductImageData { Version = V9_0, OS = OS.Alpine322,           Arch = Arch.Arm },
             new ProductImageData { Version = V9_0, OS = OS.Alpine322,           Arch = Arch.Arm,     SdkOS = OS.Alpine322,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.Alpine322,           Arch = Arch.Arm,     SdkOS = OS.Alpine322,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V9_0, OS = OS.Alpine322,           Arch = Arch.Arm,     SdkOS = OS.Alpine322,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V9_0, OS = OS.Alpine323,           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.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    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.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,
@@ -215,12 +239,16 @@ public static class TestData
             new ProductImageData { Version = V10_0, OS = OS.Alpine322,           Arch = Arch.Amd64,   SdkOS = OS.Alpine322,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.Alpine322,           Arch = Arch.Amd64,   SdkOS = OS.Alpine322,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V10_0, OS = OS.Alpine322,           Arch = Arch.Amd64,   SdkOS = OS.Alpine322,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.Alpine323,           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.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    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.AzureLinux30,           Arch = Arch.Amd64 },
             new ProductImageData { Version = V10_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Amd64,   SdkOS = OS.AzureLinux30 },
             new ProductImageData { Version = V10_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Amd64,   SdkOS = OS.AzureLinux30,
@@ -255,12 +283,16 @@ public static class TestData
             new ProductImageData { Version = V10_0, OS = OS.Alpine322,           Arch = Arch.Arm64,   SdkOS = OS.Alpine322,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.Alpine322,           Arch = Arch.Arm64,   SdkOS = OS.Alpine322,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V10_0, OS = OS.Alpine322,           Arch = Arch.Arm64,   SdkOS = OS.Alpine322,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.Alpine323,           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.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    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() { Version = V10_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine322 },
             new() { Version = V10_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine323 },
@@ -271,12 +303,16 @@ public static class TestData
             new ProductImageData { Version = V10_0, OS = OS.Alpine322,           Arch = Arch.Arm,     SdkOS = OS.Alpine322,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.Alpine322,           Arch = Arch.Arm,     SdkOS = OS.Alpine322,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
+            new ProductImageData { Version = V10_0, OS = OS.Alpine322,           Arch = Arch.Arm,     SdkOS = OS.Alpine322,
+                    ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V10_0, OS = OS.Alpine323,           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.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    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.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,
@@ -299,12 +335,14 @@ public static class TestData
             new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Amd64,   SdkOS = OS.Alpine322,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Amd64,   SdkOS = OS.Alpine322,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    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.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Amd64,   SdkOS = OS.Alpine323,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    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.AzureLinux30,           Arch = Arch.Amd64 },
             new ProductImageData { Version = V11_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Amd64,   SdkOS = OS.AzureLinux30 },
             new ProductImageData { Version = V11_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Amd64,   SdkOS = OS.AzureLinux30,
@@ -339,12 +377,14 @@ public static class TestData
             new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Arm64,   SdkOS = OS.Alpine322,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Arm64,   SdkOS = OS.Alpine322,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    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.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm64,   SdkOS = OS.Alpine323,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    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() { Version = V11_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine322 },
             new() { Version = V11_0, Arch = Arch.Arm64, SdkImageVariant = DotNetImageVariant.AOT, SupportedImageRepos = DotNetImageRepo.Runtime_Deps, OS = OS.Alpine323 },
@@ -355,12 +395,14 @@ public static class TestData
             new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Arm,     SdkOS = OS.Alpine322,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine322,           Arch = Arch.Arm,     SdkOS = OS.Alpine322,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm },
             new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
                     ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet },
             new ProductImageData { Version = V11_0, OS = OS.Alpine323,           Arch = Arch.Arm,     SdkOS = OS.Alpine323,
-                    ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps },
+                    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.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,