diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c832b142a0..fcb436d4d3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -73,6 +73,12 @@ The [`build-and-test.ps1`](https://github.com/dotnet/dotnet-docker/blob/main/bui
     > ./build-and-test.ps1 -Version 9.0 -OS nanoserver-1809 -Mode Test
     ```
 
+- Build and test images on an arm64 device (e.g. Apple Silicon Mac or Linux ARM64 machine). Note: The architecture argument must be `arm64`, not `arm64v8`.
+
+    ``` console
+    > ./build-and-test.ps1 -Paths '*9.0*noble*' -Architecture arm64
+    ```
+
 ### Editing Dockerfiles
 
 The [Dockerfiles](https://github.com/search?q=repo%3Adotnet%2Fdotnet-docker+path%3Asrc%2F**%2FDockerfile&type=code&ref=advsearch) contained in this repo are generated from a set of [Cottle](https://cottle.readthedocs.io/en/stable/page/01-overview.html) based [templates](https://github.com/dotnet/dotnet-docker/tree/main/eng/dockerfile-templates). A single template generates the set of Dockerfiles that are similar (e.g. all Windows sdk Dockerfiles for a particular .NET version). This ensures consistency across the various Dockerfiles and eases the burden of making changes to the Dockerfiles. Instead of editing the Dockerfiles directly, the templates should be updated and then the Dockerfiles should get regenerated by running the [generate Dockerfiles script](https://github.com/dotnet/dotnet-docker/blob/main/eng/dockerfile-templates/Get-GeneratedDockerfiles.ps1).
@@ -105,6 +111,32 @@ There are several types of [tests](https://github.com/dotnet/dotnet-docker/tree/
 
 When editing Dockerfiles, please ensure the appropriate test changes are also made.
 
+#### Running Tests Without Building Images
+
+If you want to test images that have already been built and published to a registry (e.g. official images from `mcr.microsoft.com`), you can run tests without building first by using the `-PullImages` argument with the `run-tests.ps1` script:
+
+- Run tests against published images without building locally:
+
+    ``` console
+    > ./tests/run-tests.ps1 -PullImages -Paths '*9.0*noble*'
+    ```
+
+#### Running Specific Tests
+
+To run specific tests, use the `-CustomTestFilter` argument with either `run-tests.ps1` or `build-and-test.ps1`. This argument accepts [Xunit test filtering](https://learn.microsoft.com/dotnet/core/testing/selective-unit-tests?pivots=xunit) expressions:
+
+- Run a specific test by name:
+
+    ``` console
+    > ./tests/run-tests.ps1 -Paths '*9.0*noble*' -CustomTestFilter "FullyQualifiedName~VerifyEnvironmentVariables"
+    ```
+
+- Run tests using `build-and-test.ps1` with a custom filter:
+
+    ``` console
+    > ./build-and-test.ps1 -Paths '*9.0*noble*' -Mode Test -CustomTestFilter "FullyQualifiedName~VerifyPackageInstallation"
+    ```
+
 #### Debugging Tests Using VS Code
 
 This repo comes with VS Code Task and Launch Profiles to help you debug tests.
diff --git a/README.aspnet.md b/README.aspnet.md
index 281d165794..4dac1e92a5 100644
--- a/README.aspnet.md
+++ b/README.aspnet.md
@@ -82,189 +82,225 @@ For more information, see the [composite images section in the Image Variants do
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-amd64, 10.0-noble-amd64, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/aspnet/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
-10.0.1-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
-10.0.1-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
-10.0.1-noble-chiseled-composite-amd64, 10.0-noble-chiseled-composite-amd64, 10.0.1-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
-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-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.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-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-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
-10.0.1-azurelinux3.0-distroless-composite-amd64, 10.0-azurelinux3.0-distroless-composite-amd64, 10.0.1-azurelinux3.0-distroless-composite, 10.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0
-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-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.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-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-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
-9.0.11-noble-chiseled-composite-amd64, 9.0-noble-chiseled-composite-amd64, 9.0.11-noble-chiseled-composite, 9.0-noble-chiseled-composite | [Dockerfile](src/aspnet/9.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
-9.0.11-noble-chiseled-composite-extra-amd64, 9.0-noble-chiseled-composite-extra-amd64, 9.0.11-noble-chiseled-composite-extra, 9.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 24.04
-9.0.11-azurelinux3.0-amd64, 9.0-azurelinux3.0-amd64, 9.0.11-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/aspnet/9.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-9.0.11-azurelinux3.0-distroless-amd64, 9.0-azurelinux3.0-distroless-amd64, 9.0.11-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
-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/aspnet/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
-9.0.11-azurelinux3.0-distroless-composite-amd64, 9.0-azurelinux3.0-distroless-composite-amd64, 9.0.11-azurelinux3.0-distroless-composite, 9.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0
-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-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.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-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-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
-8.0.22-noble-chiseled-composite-amd64, 8.0-noble-chiseled-composite-amd64, 8.0.22-noble-chiseled-composite, 8.0-noble-chiseled-composite | [Dockerfile](src/aspnet/8.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
-8.0.22-noble-chiseled-composite-extra-amd64, 8.0-noble-chiseled-composite-extra-amd64, 8.0.22-noble-chiseled-composite-extra, 8.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/8.0/noble-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 24.04
-8.0.22-jammy-amd64, 8.0-jammy-amd64, 8.0.22-jammy, 8.0-jammy | [Dockerfile](src/aspnet/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-amd64, 8.0-jammy-chiseled-amd64, 8.0.22-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/aspnet/8.0/jammy-chiseled/amd64/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-extra-amd64, 8.0-jammy-chiseled-extra-amd64, 8.0.22-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/aspnet/8.0/jammy-chiseled-extra/amd64/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-composite-amd64, 8.0-jammy-chiseled-composite-amd64, 8.0.22-jammy-chiseled-composite, 8.0-jammy-chiseled-composite | [Dockerfile](src/aspnet/8.0/jammy-chiseled-composite/amd64/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-composite-extra-amd64, 8.0-jammy-chiseled-composite-extra-amd64, 8.0.22-jammy-chiseled-composite-extra, 8.0-jammy-chiseled-composite-extra | [Dockerfile](src/aspnet/8.0/jammy-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 22.04
-8.0.22-azurelinux3.0-amd64, 8.0-azurelinux3.0-amd64, 8.0.22-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/aspnet/8.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-amd64, 8.0-azurelinux3.0-distroless-amd64, 8.0.22-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-extra-amd64, 8.0-azurelinux3.0-distroless-extra-amd64, 8.0.22-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-composite-amd64, 8.0-azurelinux3.0-distroless-composite-amd64, 8.0.22-azurelinux3.0-distroless-composite, 8.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-composite-extra-amd64, 8.0-azurelinux3.0-distroless-composite-extra-amd64, 8.0.22-azurelinux3.0-distroless-composite-extra, 8.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0
+10.0.2-noble-amd64, 10.0-noble-amd64, 10.0.2-noble, 10.0-noble, 10.0.2, 10.0, latest | [Dockerfile](src/aspnet/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-composite-amd64, 10.0-noble-chiseled-composite-amd64, 10.0.2-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-composite-extra-amd64, 10.0-noble-chiseled-composite-extra-amd64, 10.0.2-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.2-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0.2-alpine3.22, 10.0-alpine3.22 | [Dockerfile](src/aspnet/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.22-extra-amd64, 10.0-alpine3.22-extra-amd64, 10.0.2-alpine3.22-extra, 10.0-alpine3.22-extra | [Dockerfile](src/aspnet/10.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.22-composite-amd64, 10.0-alpine3.22-composite-amd64, 10.0-alpine-composite-amd64, 10.0.2-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.2-alpine3.22-composite-extra-amd64, 10.0-alpine3.22-composite-extra-amd64, 10.0-alpine-composite-extra-amd64, 10.0.2-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.2-alpine3.23-amd64, 10.0-alpine3.23-amd64, 10.0-alpine-amd64, 10.0.2-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/aspnet/10.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+10.0.2-alpine3.23-extra-amd64, 10.0-alpine3.23-extra-amd64, 10.0-alpine-extra-amd64, 10.0.2-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/aspnet/10.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+10.0.2-alpine3.23-composite-amd64, 10.0-alpine3.23-composite-amd64, 10.0.2-alpine3.23-composite, 10.0-alpine3.23-composite | [Dockerfile](src/aspnet/10.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
+10.0.2-alpine3.23-composite-extra-amd64, 10.0-alpine3.23-composite-extra-amd64, 10.0.2-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.2-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.2-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/aspnet/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+10.0.2-azurelinux3.0-distroless-amd64, 10.0-azurelinux3.0-distroless-amd64, 10.0.2-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+10.0.2-azurelinux3.0-distroless-extra-amd64, 10.0-azurelinux3.0-distroless-extra-amd64, 10.0.2-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
+10.0.2-azurelinux3.0-distroless-composite-amd64, 10.0-azurelinux3.0-distroless-composite-amd64, 10.0.2-azurelinux3.0-distroless-composite, 10.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0
+10.0.2-azurelinux3.0-distroless-composite-extra-amd64, 10.0-azurelinux3.0-distroless-composite-extra-amd64, 10.0.2-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.12-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.12-bookworm-slim, 9.0-bookworm-slim, 9.0.12, 9.0 | [Dockerfile](src/aspnet/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12
+9.0.12-alpine3.22-amd64, 9.0-alpine3.22-amd64, 9.0.12-alpine3.22, 9.0-alpine3.22 | [Dockerfile](src/aspnet/9.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.22-extra-amd64, 9.0-alpine3.22-extra-amd64, 9.0.12-alpine3.22-extra, 9.0-alpine3.22-extra | [Dockerfile](src/aspnet/9.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.22-composite-amd64, 9.0-alpine3.22-composite-amd64, 9.0-alpine-composite-amd64, 9.0.12-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.12-alpine3.22-composite-extra-amd64, 9.0-alpine3.22-composite-extra-amd64, 9.0-alpine-composite-extra-amd64, 9.0.12-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.12-alpine3.23-amd64, 9.0-alpine3.23-amd64, 9.0-alpine-amd64, 9.0.12-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/aspnet/9.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+9.0.12-alpine3.23-extra-amd64, 9.0-alpine3.23-extra-amd64, 9.0-alpine-extra-amd64, 9.0.12-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/aspnet/9.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+9.0.12-alpine3.23-composite-amd64, 9.0-alpine3.23-composite-amd64, 9.0.12-alpine3.23-composite, 9.0-alpine3.23-composite | [Dockerfile](src/aspnet/9.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
+9.0.12-alpine3.23-composite-extra-amd64, 9.0-alpine3.23-composite-extra-amd64, 9.0.12-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.12-noble-amd64, 9.0-noble-amd64, 9.0.12-noble, 9.0-noble | [Dockerfile](src/aspnet/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-amd64, 9.0-noble-chiseled-amd64, 9.0.12-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/aspnet/9.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-extra-amd64, 9.0-noble-chiseled-extra-amd64, 9.0.12-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-composite-amd64, 9.0-noble-chiseled-composite-amd64, 9.0.12-noble-chiseled-composite, 9.0-noble-chiseled-composite | [Dockerfile](src/aspnet/9.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-composite-extra-amd64, 9.0-noble-chiseled-composite-extra-amd64, 9.0.12-noble-chiseled-composite-extra, 9.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 24.04
+9.0.12-azurelinux3.0-amd64, 9.0-azurelinux3.0-amd64, 9.0.12-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/aspnet/9.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-amd64, 9.0-azurelinux3.0-distroless-amd64, 9.0.12-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-extra-amd64, 9.0-azurelinux3.0-distroless-extra-amd64, 9.0.12-azurelinux3.0-distroless-extra, 9.0-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-composite-amd64, 9.0-azurelinux3.0-distroless-composite-amd64, 9.0.12-azurelinux3.0-distroless-composite, 9.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-composite-extra-amd64, 9.0-azurelinux3.0-distroless-composite-extra-amd64, 9.0.12-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.23-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.23-bookworm-slim, 8.0-bookworm-slim, 8.0.23, 8.0 | [Dockerfile](src/aspnet/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12
+8.0.23-alpine3.22-amd64, 8.0-alpine3.22-amd64, 8.0.23-alpine3.22, 8.0-alpine3.22 | [Dockerfile](src/aspnet/8.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.22-extra-amd64, 8.0-alpine3.22-extra-amd64, 8.0.23-alpine3.22-extra, 8.0-alpine3.22-extra | [Dockerfile](src/aspnet/8.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.22-composite-amd64, 8.0-alpine3.22-composite-amd64, 8.0-alpine-composite-amd64, 8.0.23-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.23-alpine3.22-composite-extra-amd64, 8.0-alpine3.22-composite-extra-amd64, 8.0-alpine-composite-extra-amd64, 8.0.23-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.23-alpine3.23-amd64, 8.0-alpine3.23-amd64, 8.0-alpine-amd64, 8.0.23-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/aspnet/8.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+8.0.23-alpine3.23-extra-amd64, 8.0-alpine3.23-extra-amd64, 8.0-alpine-extra-amd64, 8.0.23-alpine3.23-extra, 8.0-alpine3.23-extra, 8.0-alpine-extra | [Dockerfile](src/aspnet/8.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+8.0.23-alpine3.23-composite-amd64, 8.0-alpine3.23-composite-amd64, 8.0.23-alpine3.23-composite, 8.0-alpine3.23-composite | [Dockerfile](src/aspnet/8.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23
+8.0.23-alpine3.23-composite-extra-amd64, 8.0-alpine3.23-composite-extra-amd64, 8.0.23-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.23-noble-amd64, 8.0-noble-amd64, 8.0.23-noble, 8.0-noble | [Dockerfile](src/aspnet/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-amd64, 8.0-noble-chiseled-amd64, 8.0.23-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/aspnet/8.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-extra-amd64, 8.0-noble-chiseled-extra-amd64, 8.0.23-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/aspnet/8.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-composite-amd64, 8.0-noble-chiseled-composite-amd64, 8.0.23-noble-chiseled-composite, 8.0-noble-chiseled-composite | [Dockerfile](src/aspnet/8.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-composite-extra-amd64, 8.0-noble-chiseled-composite-extra-amd64, 8.0.23-noble-chiseled-composite-extra, 8.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/8.0/noble-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 24.04
+8.0.23-jammy-amd64, 8.0-jammy-amd64, 8.0.23-jammy, 8.0-jammy | [Dockerfile](src/aspnet/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-amd64, 8.0-jammy-chiseled-amd64, 8.0.23-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/aspnet/8.0/jammy-chiseled/amd64/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-extra-amd64, 8.0-jammy-chiseled-extra-amd64, 8.0.23-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/aspnet/8.0/jammy-chiseled-extra/amd64/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-composite-amd64, 8.0-jammy-chiseled-composite-amd64, 8.0.23-jammy-chiseled-composite, 8.0-jammy-chiseled-composite | [Dockerfile](src/aspnet/8.0/jammy-chiseled-composite/amd64/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-composite-extra-amd64, 8.0-jammy-chiseled-composite-extra-amd64, 8.0.23-jammy-chiseled-composite-extra, 8.0-jammy-chiseled-composite-extra | [Dockerfile](src/aspnet/8.0/jammy-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 22.04
+8.0.23-azurelinux3.0-amd64, 8.0-azurelinux3.0-amd64, 8.0.23-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/aspnet/8.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-amd64, 8.0-azurelinux3.0-distroless-amd64, 8.0.23-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-extra-amd64, 8.0-azurelinux3.0-distroless-extra-amd64, 8.0.23-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-composite-amd64, 8.0-azurelinux3.0-distroless-composite-amd64, 8.0.23-azurelinux3.0-distroless-composite, 8.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-composite-extra-amd64, 8.0-azurelinux3.0-distroless-composite-extra-amd64, 8.0.23-azurelinux3.0-distroless-composite-extra, 8.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-arm64v8, 10.0-noble-arm64v8, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/aspnet/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
-10.0.1-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
-10.0.1-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-10.0.1-noble-chiseled-composite-arm64v8, 10.0-noble-chiseled-composite-arm64v8, 10.0.1-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
-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-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.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-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-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
-10.0.1-azurelinux3.0-distroless-composite-arm64v8, 10.0-azurelinux3.0-distroless-composite-arm64v8, 10.0.1-azurelinux3.0-distroless-composite, 10.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0
-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-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.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-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-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
-9.0.11-noble-chiseled-composite-arm64v8, 9.0-noble-chiseled-composite-arm64v8, 9.0.11-noble-chiseled-composite, 9.0-noble-chiseled-composite | [Dockerfile](src/aspnet/9.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
-9.0.11-noble-chiseled-composite-extra-arm64v8, 9.0-noble-chiseled-composite-extra-arm64v8, 9.0.11-noble-chiseled-composite-extra, 9.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-9.0.11-azurelinux3.0-arm64v8, 9.0-azurelinux3.0-arm64v8, 9.0.11-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/aspnet/9.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-9.0.11-azurelinux3.0-distroless-arm64v8, 9.0-azurelinux3.0-distroless-arm64v8, 9.0.11-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
-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/aspnet/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
-9.0.11-azurelinux3.0-distroless-composite-arm64v8, 9.0-azurelinux3.0-distroless-composite-arm64v8, 9.0.11-azurelinux3.0-distroless-composite, 9.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0
-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-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.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-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-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
-8.0.22-noble-chiseled-composite-arm64v8, 8.0-noble-chiseled-composite-arm64v8, 8.0.22-noble-chiseled-composite, 8.0-noble-chiseled-composite | [Dockerfile](src/aspnet/8.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
-8.0.22-noble-chiseled-composite-extra-arm64v8, 8.0-noble-chiseled-composite-extra-arm64v8, 8.0.22-noble-chiseled-composite-extra, 8.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/8.0/noble-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-8.0.22-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.22-jammy, 8.0-jammy | [Dockerfile](src/aspnet/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-arm64v8, 8.0-jammy-chiseled-arm64v8, 8.0.22-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/aspnet/8.0/jammy-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-extra-arm64v8, 8.0-jammy-chiseled-extra-arm64v8, 8.0.22-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/aspnet/8.0/jammy-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-composite-arm64v8, 8.0-jammy-chiseled-composite-arm64v8, 8.0.22-jammy-chiseled-composite, 8.0-jammy-chiseled-composite | [Dockerfile](src/aspnet/8.0/jammy-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-composite-extra-arm64v8, 8.0-jammy-chiseled-composite-extra-arm64v8, 8.0.22-jammy-chiseled-composite-extra, 8.0-jammy-chiseled-composite-extra | [Dockerfile](src/aspnet/8.0/jammy-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 22.04
-8.0.22-azurelinux3.0-arm64v8, 8.0-azurelinux3.0-arm64v8, 8.0.22-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/aspnet/8.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-arm64v8, 8.0-azurelinux3.0-distroless-arm64v8, 8.0.22-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-extra-arm64v8, 8.0-azurelinux3.0-distroless-extra-arm64v8, 8.0.22-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-composite-arm64v8, 8.0-azurelinux3.0-distroless-composite-arm64v8, 8.0.22-azurelinux3.0-distroless-composite, 8.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-composite-extra-arm64v8, 8.0-azurelinux3.0-distroless-composite-extra-arm64v8, 8.0.22-azurelinux3.0-distroless-composite-extra, 8.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.2-noble-arm64v8, 10.0-noble-arm64v8, 10.0.2-noble, 10.0-noble, 10.0.2, 10.0, latest | [Dockerfile](src/aspnet/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-composite-arm64v8, 10.0-noble-chiseled-composite-arm64v8, 10.0.2-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-composite-extra-arm64v8, 10.0-noble-chiseled-composite-extra-arm64v8, 10.0.2-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.2-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0.2-alpine3.22, 10.0-alpine3.22 | [Dockerfile](src/aspnet/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.22-extra-arm64v8, 10.0-alpine3.22-extra-arm64v8, 10.0.2-alpine3.22-extra, 10.0-alpine3.22-extra | [Dockerfile](src/aspnet/10.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.22-composite-arm64v8, 10.0-alpine3.22-composite-arm64v8, 10.0-alpine-composite-arm64v8, 10.0.2-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.2-alpine3.22-composite-extra-arm64v8, 10.0-alpine3.22-composite-extra-arm64v8, 10.0-alpine-composite-extra-arm64v8, 10.0.2-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.2-alpine3.23-arm64v8, 10.0-alpine3.23-arm64v8, 10.0-alpine-arm64v8, 10.0.2-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/aspnet/10.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+10.0.2-alpine3.23-extra-arm64v8, 10.0-alpine3.23-extra-arm64v8, 10.0-alpine-extra-arm64v8, 10.0.2-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/aspnet/10.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+10.0.2-alpine3.23-composite-arm64v8, 10.0-alpine3.23-composite-arm64v8, 10.0.2-alpine3.23-composite, 10.0-alpine3.23-composite | [Dockerfile](src/aspnet/10.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
+10.0.2-alpine3.23-composite-extra-arm64v8, 10.0-alpine3.23-composite-extra-arm64v8, 10.0.2-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.2-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.2-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/aspnet/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.2-azurelinux3.0-distroless-arm64v8, 10.0-azurelinux3.0-distroless-arm64v8, 10.0.2-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.2-azurelinux3.0-distroless-extra-arm64v8, 10.0-azurelinux3.0-distroless-extra-arm64v8, 10.0.2-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
+10.0.2-azurelinux3.0-distroless-composite-arm64v8, 10.0-azurelinux3.0-distroless-composite-arm64v8, 10.0.2-azurelinux3.0-distroless-composite, 10.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.2-azurelinux3.0-distroless-composite-extra-arm64v8, 10.0-azurelinux3.0-distroless-composite-extra-arm64v8, 10.0.2-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.12-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.12-bookworm-slim, 9.0-bookworm-slim, 9.0.12, 9.0 | [Dockerfile](src/aspnet/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
+9.0.12-alpine3.22-arm64v8, 9.0-alpine3.22-arm64v8, 9.0.12-alpine3.22, 9.0-alpine3.22 | [Dockerfile](src/aspnet/9.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.22-extra-arm64v8, 9.0-alpine3.22-extra-arm64v8, 9.0.12-alpine3.22-extra, 9.0-alpine3.22-extra | [Dockerfile](src/aspnet/9.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.22-composite-arm64v8, 9.0-alpine3.22-composite-arm64v8, 9.0-alpine-composite-arm64v8, 9.0.12-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.12-alpine3.22-composite-extra-arm64v8, 9.0-alpine3.22-composite-extra-arm64v8, 9.0-alpine-composite-extra-arm64v8, 9.0.12-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.12-alpine3.23-arm64v8, 9.0-alpine3.23-arm64v8, 9.0-alpine-arm64v8, 9.0.12-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/aspnet/9.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+9.0.12-alpine3.23-extra-arm64v8, 9.0-alpine3.23-extra-arm64v8, 9.0-alpine-extra-arm64v8, 9.0.12-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/aspnet/9.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+9.0.12-alpine3.23-composite-arm64v8, 9.0-alpine3.23-composite-arm64v8, 9.0.12-alpine3.23-composite, 9.0-alpine3.23-composite | [Dockerfile](src/aspnet/9.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
+9.0.12-alpine3.23-composite-extra-arm64v8, 9.0-alpine3.23-composite-extra-arm64v8, 9.0.12-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.12-noble-arm64v8, 9.0-noble-arm64v8, 9.0.12-noble, 9.0-noble | [Dockerfile](src/aspnet/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-arm64v8, 9.0-noble-chiseled-arm64v8, 9.0.12-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/aspnet/9.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-extra-arm64v8, 9.0-noble-chiseled-extra-arm64v8, 9.0.12-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-composite-arm64v8, 9.0-noble-chiseled-composite-arm64v8, 9.0.12-noble-chiseled-composite, 9.0-noble-chiseled-composite | [Dockerfile](src/aspnet/9.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-composite-extra-arm64v8, 9.0-noble-chiseled-composite-extra-arm64v8, 9.0.12-noble-chiseled-composite-extra, 9.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+9.0.12-azurelinux3.0-arm64v8, 9.0-azurelinux3.0-arm64v8, 9.0.12-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/aspnet/9.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-arm64v8, 9.0-azurelinux3.0-distroless-arm64v8, 9.0.12-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-extra-arm64v8, 9.0-azurelinux3.0-distroless-extra-arm64v8, 9.0.12-azurelinux3.0-distroless-extra, 9.0-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-composite-arm64v8, 9.0-azurelinux3.0-distroless-composite-arm64v8, 9.0.12-azurelinux3.0-distroless-composite, 9.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-composite-extra-arm64v8, 9.0-azurelinux3.0-distroless-composite-extra-arm64v8, 9.0.12-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.23-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.23-bookworm-slim, 8.0-bookworm-slim, 8.0.23, 8.0 | [Dockerfile](src/aspnet/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
+8.0.23-alpine3.22-arm64v8, 8.0-alpine3.22-arm64v8, 8.0.23-alpine3.22, 8.0-alpine3.22 | [Dockerfile](src/aspnet/8.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.22-extra-arm64v8, 8.0-alpine3.22-extra-arm64v8, 8.0.23-alpine3.22-extra, 8.0-alpine3.22-extra | [Dockerfile](src/aspnet/8.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.22-composite-arm64v8, 8.0-alpine3.22-composite-arm64v8, 8.0-alpine-composite-arm64v8, 8.0.23-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.23-alpine3.22-composite-extra-arm64v8, 8.0-alpine3.22-composite-extra-arm64v8, 8.0-alpine-composite-extra-arm64v8, 8.0.23-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.23-alpine3.23-arm64v8, 8.0-alpine3.23-arm64v8, 8.0-alpine-arm64v8, 8.0.23-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/aspnet/8.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+8.0.23-alpine3.23-extra-arm64v8, 8.0-alpine3.23-extra-arm64v8, 8.0-alpine-extra-arm64v8, 8.0.23-alpine3.23-extra, 8.0-alpine3.23-extra, 8.0-alpine-extra | [Dockerfile](src/aspnet/8.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+8.0.23-alpine3.23-composite-arm64v8, 8.0-alpine3.23-composite-arm64v8, 8.0.23-alpine3.23-composite, 8.0-alpine3.23-composite | [Dockerfile](src/aspnet/8.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23
+8.0.23-alpine3.23-composite-extra-arm64v8, 8.0-alpine3.23-composite-extra-arm64v8, 8.0.23-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.23-noble-arm64v8, 8.0-noble-arm64v8, 8.0.23-noble, 8.0-noble | [Dockerfile](src/aspnet/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-arm64v8, 8.0-noble-chiseled-arm64v8, 8.0.23-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/aspnet/8.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-extra-arm64v8, 8.0-noble-chiseled-extra-arm64v8, 8.0.23-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/aspnet/8.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-composite-arm64v8, 8.0-noble-chiseled-composite-arm64v8, 8.0.23-noble-chiseled-composite, 8.0-noble-chiseled-composite | [Dockerfile](src/aspnet/8.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-composite-extra-arm64v8, 8.0-noble-chiseled-composite-extra-arm64v8, 8.0.23-noble-chiseled-composite-extra, 8.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/8.0/noble-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+8.0.23-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.23-jammy, 8.0-jammy | [Dockerfile](src/aspnet/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-arm64v8, 8.0-jammy-chiseled-arm64v8, 8.0.23-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/aspnet/8.0/jammy-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-extra-arm64v8, 8.0-jammy-chiseled-extra-arm64v8, 8.0.23-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/aspnet/8.0/jammy-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-composite-arm64v8, 8.0-jammy-chiseled-composite-arm64v8, 8.0.23-jammy-chiseled-composite, 8.0-jammy-chiseled-composite | [Dockerfile](src/aspnet/8.0/jammy-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-composite-extra-arm64v8, 8.0-jammy-chiseled-composite-extra-arm64v8, 8.0.23-jammy-chiseled-composite-extra, 8.0-jammy-chiseled-composite-extra | [Dockerfile](src/aspnet/8.0/jammy-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 22.04
+8.0.23-azurelinux3.0-arm64v8, 8.0-azurelinux3.0-arm64v8, 8.0.23-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/aspnet/8.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-arm64v8, 8.0-azurelinux3.0-distroless-arm64v8, 8.0.23-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-extra-arm64v8, 8.0-azurelinux3.0-distroless-extra-arm64v8, 8.0.23-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-composite-arm64v8, 8.0-azurelinux3.0-distroless-composite-arm64v8, 8.0.23-azurelinux3.0-distroless-composite, 8.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-composite-extra-arm64v8, 8.0-azurelinux3.0-distroless-composite-extra-arm64v8, 8.0.23-azurelinux3.0-distroless-composite-extra, 8.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-arm32v7, 10.0-noble-arm32v7, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/aspnet/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
-10.0.1-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
-10.0.1-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
-10.0.1-noble-chiseled-composite-arm32v7, 10.0-noble-chiseled-composite-arm32v7, 10.0.1-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04
-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-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.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-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
-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-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.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-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-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
-9.0.11-noble-chiseled-composite-arm32v7, 9.0-noble-chiseled-composite-arm32v7, 9.0.11-noble-chiseled-composite, 9.0-noble-chiseled-composite | [Dockerfile](src/aspnet/9.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04
-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-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.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-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-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
-8.0.22-jammy-chiseled-composite-arm32v7, 8.0-jammy-chiseled-composite-arm32v7, 8.0.22-jammy-chiseled-composite, 8.0-jammy-chiseled-composite | [Dockerfile](src/aspnet/8.0/jammy-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-composite-extra-arm32v7, 8.0-jammy-chiseled-composite-extra-arm32v7, 8.0.22-jammy-chiseled-composite-extra, 8.0-jammy-chiseled-composite-extra | [Dockerfile](src/aspnet/8.0/jammy-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 22.04
+10.0.2-noble-arm32v7, 10.0-noble-arm32v7, 10.0.2-noble, 10.0-noble, 10.0.2, 10.0, latest | [Dockerfile](src/aspnet/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-composite-arm32v7, 10.0-noble-chiseled-composite-arm32v7, 10.0.2-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-composite-extra-arm32v7, 10.0-noble-chiseled-composite-extra-arm32v7, 10.0.2-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.2-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0.2-alpine3.22, 10.0-alpine3.22 | [Dockerfile](src/aspnet/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.22-extra-arm32v7, 10.0-alpine3.22-extra-arm32v7, 10.0.2-alpine3.22-extra, 10.0-alpine3.22-extra | [Dockerfile](src/aspnet/10.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.22-composite-arm32v7, 10.0-alpine3.22-composite-arm32v7, 10.0-alpine-composite-arm32v7, 10.0.2-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.2-alpine3.22-composite-extra-arm32v7, 10.0-alpine3.22-composite-extra-arm32v7, 10.0-alpine-composite-extra-arm32v7, 10.0.2-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.2-alpine3.23-arm32v7, 10.0-alpine3.23-arm32v7, 10.0-alpine-arm32v7, 10.0.2-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/aspnet/10.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+10.0.2-alpine3.23-extra-arm32v7, 10.0-alpine3.23-extra-arm32v7, 10.0-alpine-extra-arm32v7, 10.0.2-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/aspnet/10.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+10.0.2-alpine3.23-composite-arm32v7, 10.0-alpine3.23-composite-arm32v7, 10.0.2-alpine3.23-composite, 10.0-alpine3.23-composite | [Dockerfile](src/aspnet/10.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
+10.0.2-alpine3.23-composite-extra-arm32v7, 10.0-alpine3.23-composite-extra-arm32v7, 10.0.2-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.12-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.12-bookworm-slim, 9.0-bookworm-slim, 9.0.12, 9.0 | [Dockerfile](src/aspnet/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
+9.0.12-alpine3.22-arm32v7, 9.0-alpine3.22-arm32v7, 9.0.12-alpine3.22, 9.0-alpine3.22 | [Dockerfile](src/aspnet/9.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.22-extra-arm32v7, 9.0-alpine3.22-extra-arm32v7, 9.0.12-alpine3.22-extra, 9.0-alpine3.22-extra | [Dockerfile](src/aspnet/9.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.22-composite-arm32v7, 9.0-alpine3.22-composite-arm32v7, 9.0-alpine-composite-arm32v7, 9.0.12-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.12-alpine3.22-composite-extra-arm32v7, 9.0-alpine3.22-composite-extra-arm32v7, 9.0-alpine-composite-extra-arm32v7, 9.0.12-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.12-alpine3.23-arm32v7, 9.0-alpine3.23-arm32v7, 9.0-alpine-arm32v7, 9.0.12-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/aspnet/9.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+9.0.12-alpine3.23-extra-arm32v7, 9.0-alpine3.23-extra-arm32v7, 9.0-alpine-extra-arm32v7, 9.0.12-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/aspnet/9.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+9.0.12-alpine3.23-composite-arm32v7, 9.0-alpine3.23-composite-arm32v7, 9.0.12-alpine3.23-composite, 9.0-alpine3.23-composite | [Dockerfile](src/aspnet/9.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
+9.0.12-alpine3.23-composite-extra-arm32v7, 9.0-alpine3.23-composite-extra-arm32v7, 9.0.12-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.12-noble-arm32v7, 9.0-noble-arm32v7, 9.0.12-noble, 9.0-noble | [Dockerfile](src/aspnet/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-arm32v7, 9.0-noble-chiseled-arm32v7, 9.0.12-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/aspnet/9.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-extra-arm32v7, 9.0-noble-chiseled-extra-arm32v7, 9.0.12-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-composite-arm32v7, 9.0-noble-chiseled-composite-arm32v7, 9.0.12-noble-chiseled-composite, 9.0-noble-chiseled-composite | [Dockerfile](src/aspnet/9.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-composite-extra-arm32v7, 9.0-noble-chiseled-composite-extra-arm32v7, 9.0.12-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.23-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.23-bookworm-slim, 8.0-bookworm-slim, 8.0.23, 8.0 | [Dockerfile](src/aspnet/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
+8.0.23-alpine3.22-arm32v7, 8.0-alpine3.22-arm32v7, 8.0.23-alpine3.22, 8.0-alpine3.22 | [Dockerfile](src/aspnet/8.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.22-extra-arm32v7, 8.0-alpine3.22-extra-arm32v7, 8.0.23-alpine3.22-extra, 8.0-alpine3.22-extra | [Dockerfile](src/aspnet/8.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.22-composite-arm32v7, 8.0-alpine3.22-composite-arm32v7, 8.0-alpine-composite-arm32v7, 8.0.23-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.23-alpine3.22-composite-extra-arm32v7, 8.0-alpine3.22-composite-extra-arm32v7, 8.0-alpine-composite-extra-arm32v7, 8.0.23-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.23-alpine3.23-arm32v7, 8.0-alpine3.23-arm32v7, 8.0-alpine-arm32v7, 8.0.23-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/aspnet/8.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+8.0.23-alpine3.23-extra-arm32v7, 8.0-alpine3.23-extra-arm32v7, 8.0-alpine-extra-arm32v7, 8.0.23-alpine3.23-extra, 8.0-alpine3.23-extra, 8.0-alpine-extra | [Dockerfile](src/aspnet/8.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+8.0.23-alpine3.23-composite-arm32v7, 8.0-alpine3.23-composite-arm32v7, 8.0.23-alpine3.23-composite, 8.0-alpine3.23-composite | [Dockerfile](src/aspnet/8.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23
+8.0.23-alpine3.23-composite-extra-arm32v7, 8.0-alpine3.23-composite-extra-arm32v7, 8.0.23-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.23-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.23-jammy, 8.0-jammy | [Dockerfile](src/aspnet/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-arm32v7, 8.0-jammy-chiseled-arm32v7, 8.0.23-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/aspnet/8.0/jammy-chiseled/arm32v7/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-extra-arm32v7, 8.0-jammy-chiseled-extra-arm32v7, 8.0.23-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/aspnet/8.0/jammy-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-composite-arm32v7, 8.0-jammy-chiseled-composite-arm32v7, 8.0.23-jammy-chiseled-composite, 8.0-jammy-chiseled-composite | [Dockerfile](src/aspnet/8.0/jammy-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-composite-extra-arm32v7, 8.0-jammy-chiseled-composite-extra-arm32v7, 8.0.23-jammy-chiseled-composite-extra, 8.0-jammy-chiseled-composite-extra | [Dockerfile](src/aspnet/8.0/jammy-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 22.04
 
 ### Nano Server 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-10.0.1-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile)
-9.0.11-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
-8.0.22-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
+10.0.2-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile)
+9.0.12-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
+8.0.23-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
 
 ### Windows Server Core 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-10.0.1-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile)
-9.0.11-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
-8.0.22-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+10.0.2-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+9.0.12-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+8.0.23-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 
 ### Nano Server 2022 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-10.0.1-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile)
-9.0.11-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
-8.0.22-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/8.0/nanoserver-ltsc2022/amd64/Dockerfile)
+10.0.2-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile)
+9.0.12-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
+8.0.23-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/8.0/nanoserver-ltsc2022/amd64/Dockerfile)
 
 ### Windows Server Core 2022 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-10.0.1-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile)
-9.0.11-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
-8.0.22-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)
+10.0.2-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile)
+9.0.12-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
+8.0.23-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 
 ### Nano Server, version 1809 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-9.0.11-nanoserver-1809, 9.0-nanoserver-1809 | [Dockerfile](src/aspnet/9.0/nanoserver-1809/amd64/Dockerfile)
-8.0.22-nanoserver-1809, 8.0-nanoserver-1809 | [Dockerfile](src/aspnet/8.0/nanoserver-1809/amd64/Dockerfile)
+9.0.12-nanoserver-1809, 9.0-nanoserver-1809 | [Dockerfile](src/aspnet/9.0/nanoserver-1809/amd64/Dockerfile)
+8.0.23-nanoserver-1809, 8.0-nanoserver-1809 | [Dockerfile](src/aspnet/8.0/nanoserver-1809/amd64/Dockerfile)
 
 ### Windows Server Core 2019 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-9.0.11-windowsservercore-ltsc2019, 9.0-windowsservercore-ltsc2019 | [Dockerfile](src/aspnet/9.0/windowsservercore-ltsc2019/amd64/Dockerfile)
-8.0.22-windowsservercore-ltsc2019, 8.0-windowsservercore-ltsc2019 | [Dockerfile](src/aspnet/8.0/windowsservercore-ltsc2019/amd64/Dockerfile)
+9.0.12-windowsservercore-ltsc2019, 9.0-windowsservercore-ltsc2019 | [Dockerfile](src/aspnet/9.0/windowsservercore-ltsc2019/amd64/Dockerfile)
+8.0.23-windowsservercore-ltsc2019, 8.0-windowsservercore-ltsc2019 | [Dockerfile](src/aspnet/8.0/windowsservercore-ltsc2019/amd64/Dockerfile)
 <!--End of generated tags-->
 
 *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/aspnet/tags/list) for all supported and unsupported tags.*
diff --git a/README.runtime-deps.md b/README.runtime-deps.md
index 4d905e6d7c..cfe5815198 100644
--- a/README.runtime-deps.md
+++ b/README.runtime-deps.md
@@ -64,109 +64,109 @@ They contain the following features:
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-amd64, 10.0-noble-amd64, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/runtime-deps/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
-10.0.1-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
-10.0.1-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
-10.0.1-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.1-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
-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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/9.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
-9.0.11-azurelinux3.0-amd64, 9.0-azurelinux3.0-amd64, 9.0.11-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-9.0.11-azurelinux3.0-distroless-amd64, 9.0-azurelinux3.0-distroless-amd64, 9.0.11-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
-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-deps/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-deps/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-deps/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 | [Dockerfile](src/runtime-deps/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-deps/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-deps/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-deps/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-deps/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-deps/8.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
-8.0.22-jammy-amd64, 8.0-jammy-amd64, 8.0.22-jammy, 8.0-jammy | [Dockerfile](src/runtime-deps/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-amd64, 8.0-jammy-chiseled-amd64, 8.0.22-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled/amd64/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-extra-amd64, 8.0-jammy-chiseled-extra-amd64, 8.0.22-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled-extra/amd64/Dockerfile) | Ubuntu 22.04
-8.0.22-azurelinux3.0-amd64, 8.0-azurelinux3.0-amd64, 8.0.22-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-amd64, 8.0-azurelinux3.0-distroless-amd64, 8.0.22-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-extra-amd64, 8.0-azurelinux3.0-distroless-extra-amd64, 8.0.22-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
+10.0.2-noble-amd64, 10.0-noble-amd64, 10.0.2-noble, 10.0-noble, 10.0.2, 10.0, latest | [Dockerfile](src/runtime-deps/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+10.0.2-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0.2-alpine3.22, 10.0-alpine3.22 | [Dockerfile](src/runtime-deps/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.22-extra-amd64, 10.0-alpine3.22-extra-amd64, 10.0.2-alpine3.22-extra, 10.0-alpine3.22-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.23-amd64, 10.0-alpine3.23-amd64, 10.0-alpine-amd64, 10.0.2-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+10.0.2-alpine3.23-extra-amd64, 10.0-alpine3.23-extra-amd64, 10.0-alpine-extra-amd64, 10.0.2-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+10.0.2-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.2-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+10.0.2-azurelinux3.0-distroless-amd64, 10.0-azurelinux3.0-distroless-amd64, 10.0.2-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+10.0.2-azurelinux3.0-distroless-extra-amd64, 10.0-azurelinux3.0-distroless-extra-amd64, 10.0.2-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
+9.0.12-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.12-bookworm-slim, 9.0-bookworm-slim, 9.0.12, 9.0 | [Dockerfile](src/runtime-deps/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12
+9.0.12-alpine3.22-amd64, 9.0-alpine3.22-amd64, 9.0.12-alpine3.22, 9.0-alpine3.22 | [Dockerfile](src/runtime-deps/9.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.22-extra-amd64, 9.0-alpine3.22-extra-amd64, 9.0.12-alpine3.22-extra, 9.0-alpine3.22-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.23-amd64, 9.0-alpine3.23-amd64, 9.0-alpine-amd64, 9.0.12-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/runtime-deps/9.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+9.0.12-alpine3.23-extra-amd64, 9.0-alpine3.23-extra-amd64, 9.0-alpine-extra-amd64, 9.0.12-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+9.0.12-noble-amd64, 9.0-noble-amd64, 9.0.12-noble, 9.0-noble | [Dockerfile](src/runtime-deps/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-amd64, 9.0-noble-chiseled-amd64, 9.0.12-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime-deps/9.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-extra-amd64, 9.0-noble-chiseled-extra-amd64, 9.0.12-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+9.0.12-azurelinux3.0-amd64, 9.0-azurelinux3.0-amd64, 9.0.12-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-amd64, 9.0-azurelinux3.0-distroless-amd64, 9.0.12-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-extra-amd64, 9.0-azurelinux3.0-distroless-extra-amd64, 9.0.12-azurelinux3.0-distroless-extra, 9.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
+8.0.23-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.23-bookworm-slim, 8.0-bookworm-slim, 8.0.23, 8.0 | [Dockerfile](src/runtime-deps/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12
+8.0.23-alpine3.22-amd64, 8.0-alpine3.22-amd64, 8.0.23-alpine3.22, 8.0-alpine3.22 | [Dockerfile](src/runtime-deps/8.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.22-extra-amd64, 8.0-alpine3.22-extra-amd64, 8.0.23-alpine3.22-extra, 8.0-alpine3.22-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.23-amd64, 8.0-alpine3.23-amd64, 8.0-alpine-amd64, 8.0.23-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/runtime-deps/8.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+8.0.23-alpine3.23-extra-amd64, 8.0-alpine3.23-extra-amd64, 8.0-alpine-extra-amd64, 8.0.23-alpine3.23-extra, 8.0-alpine3.23-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+8.0.23-noble-amd64, 8.0-noble-amd64, 8.0.23-noble, 8.0-noble | [Dockerfile](src/runtime-deps/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-amd64, 8.0-noble-chiseled-amd64, 8.0.23-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/runtime-deps/8.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-extra-amd64, 8.0-noble-chiseled-extra-amd64, 8.0.23-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+8.0.23-jammy-amd64, 8.0-jammy-amd64, 8.0.23-jammy, 8.0-jammy | [Dockerfile](src/runtime-deps/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-amd64, 8.0-jammy-chiseled-amd64, 8.0.23-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled/amd64/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-extra-amd64, 8.0-jammy-chiseled-extra-amd64, 8.0.23-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled-extra/amd64/Dockerfile) | Ubuntu 22.04
+8.0.23-azurelinux3.0-amd64, 8.0-azurelinux3.0-amd64, 8.0.23-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-amd64, 8.0-azurelinux3.0-distroless-amd64, 8.0.23-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-extra-amd64, 8.0-azurelinux3.0-distroless-extra-amd64, 8.0.23-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-arm64v8, 10.0-noble-arm64v8, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/runtime-deps/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
-10.0.1-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
-10.0.1-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-10.0.1-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.1-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
-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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-9.0.11-azurelinux3.0-arm64v8, 9.0-azurelinux3.0-arm64v8, 9.0.11-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-9.0.11-azurelinux3.0-distroless-arm64v8, 9.0-azurelinux3.0-distroless-arm64v8, 9.0.11-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
-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-deps/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-deps/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-deps/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 | [Dockerfile](src/runtime-deps/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-deps/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-deps/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-deps/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-deps/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-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
-8.0.22-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.22-jammy, 8.0-jammy | [Dockerfile](src/runtime-deps/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-arm64v8, 8.0-jammy-chiseled-arm64v8, 8.0.22-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-extra-arm64v8, 8.0-jammy-chiseled-extra-arm64v8, 8.0.22-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 22.04
-8.0.22-azurelinux3.0-arm64v8, 8.0-azurelinux3.0-arm64v8, 8.0.22-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-arm64v8, 8.0-azurelinux3.0-distroless-arm64v8, 8.0.22-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-extra-arm64v8, 8.0-azurelinux3.0-distroless-extra-arm64v8, 8.0.22-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.2-noble-arm64v8, 10.0-noble-arm64v8, 10.0.2-noble, 10.0-noble, 10.0.2, 10.0, latest | [Dockerfile](src/runtime-deps/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+10.0.2-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0.2-alpine3.22, 10.0-alpine3.22 | [Dockerfile](src/runtime-deps/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.22-extra-arm64v8, 10.0-alpine3.22-extra-arm64v8, 10.0.2-alpine3.22-extra, 10.0-alpine3.22-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.23-arm64v8, 10.0-alpine3.23-arm64v8, 10.0-alpine-arm64v8, 10.0.2-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+10.0.2-alpine3.23-extra-arm64v8, 10.0-alpine3.23-extra-arm64v8, 10.0-alpine-extra-arm64v8, 10.0.2-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+10.0.2-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.2-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.2-azurelinux3.0-distroless-arm64v8, 10.0-azurelinux3.0-distroless-arm64v8, 10.0.2-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.2-azurelinux3.0-distroless-extra-arm64v8, 10.0-azurelinux3.0-distroless-extra-arm64v8, 10.0.2-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+9.0.12-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.12-bookworm-slim, 9.0-bookworm-slim, 9.0.12, 9.0 | [Dockerfile](src/runtime-deps/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
+9.0.12-alpine3.22-arm64v8, 9.0-alpine3.22-arm64v8, 9.0.12-alpine3.22, 9.0-alpine3.22 | [Dockerfile](src/runtime-deps/9.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.22-extra-arm64v8, 9.0-alpine3.22-extra-arm64v8, 9.0.12-alpine3.22-extra, 9.0-alpine3.22-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.23-arm64v8, 9.0-alpine3.23-arm64v8, 9.0-alpine-arm64v8, 9.0.12-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/runtime-deps/9.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+9.0.12-alpine3.23-extra-arm64v8, 9.0-alpine3.23-extra-arm64v8, 9.0-alpine-extra-arm64v8, 9.0.12-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+9.0.12-noble-arm64v8, 9.0-noble-arm64v8, 9.0.12-noble, 9.0-noble | [Dockerfile](src/runtime-deps/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-arm64v8, 9.0-noble-chiseled-arm64v8, 9.0.12-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime-deps/9.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-extra-arm64v8, 9.0-noble-chiseled-extra-arm64v8, 9.0.12-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+9.0.12-azurelinux3.0-arm64v8, 9.0-azurelinux3.0-arm64v8, 9.0.12-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-arm64v8, 9.0-azurelinux3.0-distroless-arm64v8, 9.0.12-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-extra-arm64v8, 9.0-azurelinux3.0-distroless-extra-arm64v8, 9.0.12-azurelinux3.0-distroless-extra, 9.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+8.0.23-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.23-bookworm-slim, 8.0-bookworm-slim, 8.0.23, 8.0 | [Dockerfile](src/runtime-deps/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
+8.0.23-alpine3.22-arm64v8, 8.0-alpine3.22-arm64v8, 8.0.23-alpine3.22, 8.0-alpine3.22 | [Dockerfile](src/runtime-deps/8.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.22-extra-arm64v8, 8.0-alpine3.22-extra-arm64v8, 8.0.23-alpine3.22-extra, 8.0-alpine3.22-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.23-arm64v8, 8.0-alpine3.23-arm64v8, 8.0-alpine-arm64v8, 8.0.23-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/runtime-deps/8.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+8.0.23-alpine3.23-extra-arm64v8, 8.0-alpine3.23-extra-arm64v8, 8.0-alpine-extra-arm64v8, 8.0.23-alpine3.23-extra, 8.0-alpine3.23-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+8.0.23-noble-arm64v8, 8.0-noble-arm64v8, 8.0.23-noble, 8.0-noble | [Dockerfile](src/runtime-deps/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-arm64v8, 8.0-noble-chiseled-arm64v8, 8.0.23-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/runtime-deps/8.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-extra-arm64v8, 8.0-noble-chiseled-extra-arm64v8, 8.0.23-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+8.0.23-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.23-jammy, 8.0-jammy | [Dockerfile](src/runtime-deps/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-arm64v8, 8.0-jammy-chiseled-arm64v8, 8.0.23-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-extra-arm64v8, 8.0-jammy-chiseled-extra-arm64v8, 8.0.23-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 22.04
+8.0.23-azurelinux3.0-arm64v8, 8.0-azurelinux3.0-arm64v8, 8.0.23-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-arm64v8, 8.0-azurelinux3.0-distroless-arm64v8, 8.0.23-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-extra-arm64v8, 8.0-azurelinux3.0-distroless-extra-arm64v8, 8.0.23-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-arm32v7, 10.0-noble-arm32v7, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/runtime-deps/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
-10.0.1-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.1-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
-10.0.1-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.1-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
-10.0.1-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.1-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
-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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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-deps/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 | [Dockerfile](src/runtime-deps/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-deps/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-deps/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-deps/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-arm32v7, 8.0-jammy-chiseled-arm32v7, 8.0.22-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-extra-arm32v7, 8.0-jammy-chiseled-extra-arm32v7, 8.0.22-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 22.04
+10.0.2-noble-arm32v7, 10.0-noble-arm32v7, 10.0.2-noble, 10.0-noble, 10.0.2, 10.0, latest | [Dockerfile](src/runtime-deps/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+10.0.2-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0.2-alpine3.22, 10.0-alpine3.22 | [Dockerfile](src/runtime-deps/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.22-extra-arm32v7, 10.0-alpine3.22-extra-arm32v7, 10.0.2-alpine3.22-extra, 10.0-alpine3.22-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.23-arm32v7, 10.0-alpine3.23-arm32v7, 10.0-alpine-arm32v7, 10.0.2-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+10.0.2-alpine3.23-extra-arm32v7, 10.0-alpine3.23-extra-arm32v7, 10.0-alpine-extra-arm32v7, 10.0.2-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+9.0.12-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.12-bookworm-slim, 9.0-bookworm-slim, 9.0.12, 9.0 | [Dockerfile](src/runtime-deps/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
+9.0.12-alpine3.22-arm32v7, 9.0-alpine3.22-arm32v7, 9.0.12-alpine3.22, 9.0-alpine3.22 | [Dockerfile](src/runtime-deps/9.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.22-extra-arm32v7, 9.0-alpine3.22-extra-arm32v7, 9.0.12-alpine3.22-extra, 9.0-alpine3.22-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.23-arm32v7, 9.0-alpine3.23-arm32v7, 9.0-alpine-arm32v7, 9.0.12-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/runtime-deps/9.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+9.0.12-alpine3.23-extra-arm32v7, 9.0-alpine3.23-extra-arm32v7, 9.0-alpine-extra-arm32v7, 9.0.12-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+9.0.12-noble-arm32v7, 9.0-noble-arm32v7, 9.0.12-noble, 9.0-noble | [Dockerfile](src/runtime-deps/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-arm32v7, 9.0-noble-chiseled-arm32v7, 9.0.12-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-extra-arm32v7, 9.0-noble-chiseled-extra-arm32v7, 9.0.12-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+8.0.23-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.23-bookworm-slim, 8.0-bookworm-slim, 8.0.23, 8.0 | [Dockerfile](src/runtime-deps/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
+8.0.23-alpine3.22-arm32v7, 8.0-alpine3.22-arm32v7, 8.0.23-alpine3.22, 8.0-alpine3.22 | [Dockerfile](src/runtime-deps/8.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.22-extra-arm32v7, 8.0-alpine3.22-extra-arm32v7, 8.0.23-alpine3.22-extra, 8.0-alpine3.22-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.23-arm32v7, 8.0-alpine3.23-arm32v7, 8.0-alpine-arm32v7, 8.0.23-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/runtime-deps/8.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+8.0.23-alpine3.23-extra-arm32v7, 8.0-alpine3.23-extra-arm32v7, 8.0-alpine-extra-arm32v7, 8.0.23-alpine3.23-extra, 8.0-alpine3.23-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+8.0.23-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.23-jammy, 8.0-jammy | [Dockerfile](src/runtime-deps/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-arm32v7, 8.0-jammy-chiseled-arm32v7, 8.0.23-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-extra-arm32v7, 8.0-jammy-chiseled-extra-arm32v7, 8.0.23-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime-deps/8.0/jammy-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 22.04
 <!--End of generated tags-->
 
 *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/runtime-deps/tags/list) for all supported and unsupported tags.*
diff --git a/README.runtime.md b/README.runtime.md
index f9da2b2e0e..b4d365304d 100644
--- a/README.runtime.md
+++ b/README.runtime.md
@@ -71,137 +71,155 @@ They contain the following features:
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-amd64, 10.0-noble-amd64, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/runtime/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
-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.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-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.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-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
-9.0.11-azurelinux3.0-amd64, 9.0-azurelinux3.0-amd64, 9.0.11-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/runtime/9.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-9.0.11-azurelinux3.0-distroless-amd64, 9.0-azurelinux3.0-distroless-amd64, 9.0.11-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/9.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
-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.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-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
-8.0.22-jammy-amd64, 8.0-jammy-amd64, 8.0.22-jammy, 8.0-jammy | [Dockerfile](src/runtime/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-amd64, 8.0-jammy-chiseled-amd64, 8.0.22-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime/8.0/jammy-chiseled/amd64/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-extra-amd64, 8.0-jammy-chiseled-extra-amd64, 8.0.22-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime/8.0/jammy-chiseled-extra/amd64/Dockerfile) | Ubuntu 22.04
-8.0.22-azurelinux3.0-amd64, 8.0-azurelinux3.0-amd64, 8.0.22-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/runtime/8.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-amd64, 8.0-azurelinux3.0-distroless-amd64, 8.0.22-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-extra-amd64, 8.0-azurelinux3.0-distroless-extra-amd64, 8.0.22-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
+10.0.2-noble-amd64, 10.0-noble-amd64, 10.0.2-noble, 10.0-noble, 10.0.2, 10.0, latest | [Dockerfile](src/runtime/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+10.0.2-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0.2-alpine3.22, 10.0-alpine3.22 | [Dockerfile](src/runtime/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.22-extra-amd64, 10.0-alpine3.22-extra-amd64, 10.0.2-alpine3.22-extra, 10.0-alpine3.22-extra | [Dockerfile](src/runtime/10.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.23-amd64, 10.0-alpine3.23-amd64, 10.0-alpine-amd64, 10.0.2-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+10.0.2-alpine3.23-extra-amd64, 10.0-alpine3.23-extra-amd64, 10.0-alpine-extra-amd64, 10.0.2-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/runtime/10.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+10.0.2-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.2-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+10.0.2-azurelinux3.0-distroless-amd64, 10.0-azurelinux3.0-distroless-amd64, 10.0.2-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+10.0.2-azurelinux3.0-distroless-extra-amd64, 10.0-azurelinux3.0-distroless-extra-amd64, 10.0.2-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.12-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.12-bookworm-slim, 9.0-bookworm-slim, 9.0.12, 9.0 | [Dockerfile](src/runtime/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12
+9.0.12-alpine3.22-amd64, 9.0-alpine3.22-amd64, 9.0.12-alpine3.22, 9.0-alpine3.22 | [Dockerfile](src/runtime/9.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.22-extra-amd64, 9.0-alpine3.22-extra-amd64, 9.0.12-alpine3.22-extra, 9.0-alpine3.22-extra | [Dockerfile](src/runtime/9.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.23-amd64, 9.0-alpine3.23-amd64, 9.0-alpine-amd64, 9.0.12-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/runtime/9.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+9.0.12-alpine3.23-extra-amd64, 9.0-alpine3.23-extra-amd64, 9.0-alpine-extra-amd64, 9.0.12-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/runtime/9.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+9.0.12-noble-amd64, 9.0-noble-amd64, 9.0.12-noble, 9.0-noble | [Dockerfile](src/runtime/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-amd64, 9.0-noble-chiseled-amd64, 9.0.12-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime/9.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-extra-amd64, 9.0-noble-chiseled-extra-amd64, 9.0.12-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime/9.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+9.0.12-azurelinux3.0-amd64, 9.0-azurelinux3.0-amd64, 9.0.12-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/runtime/9.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-amd64, 9.0-azurelinux3.0-distroless-amd64, 9.0.12-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/9.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-extra-amd64, 9.0-azurelinux3.0-distroless-extra-amd64, 9.0.12-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.23-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.23-bookworm-slim, 8.0-bookworm-slim, 8.0.23, 8.0 | [Dockerfile](src/runtime/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12
+8.0.23-alpine3.22-amd64, 8.0-alpine3.22-amd64, 8.0.23-alpine3.22, 8.0-alpine3.22 | [Dockerfile](src/runtime/8.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.22-extra-amd64, 8.0-alpine3.22-extra-amd64, 8.0.23-alpine3.22-extra, 8.0-alpine3.22-extra | [Dockerfile](src/runtime/8.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.23-amd64, 8.0-alpine3.23-amd64, 8.0-alpine-amd64, 8.0.23-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/runtime/8.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+8.0.23-alpine3.23-extra-amd64, 8.0-alpine3.23-extra-amd64, 8.0-alpine-extra-amd64, 8.0.23-alpine3.23-extra, 8.0-alpine3.23-extra, 8.0-alpine-extra | [Dockerfile](src/runtime/8.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23
+8.0.23-noble-amd64, 8.0-noble-amd64, 8.0.23-noble, 8.0-noble | [Dockerfile](src/runtime/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-amd64, 8.0-noble-chiseled-amd64, 8.0.23-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/runtime/8.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-extra-amd64, 8.0-noble-chiseled-extra-amd64, 8.0.23-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/runtime/8.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04
+8.0.23-jammy-amd64, 8.0-jammy-amd64, 8.0.23-jammy, 8.0-jammy | [Dockerfile](src/runtime/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-amd64, 8.0-jammy-chiseled-amd64, 8.0.23-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime/8.0/jammy-chiseled/amd64/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-extra-amd64, 8.0-jammy-chiseled-extra-amd64, 8.0.23-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime/8.0/jammy-chiseled-extra/amd64/Dockerfile) | Ubuntu 22.04
+8.0.23-azurelinux3.0-amd64, 8.0-azurelinux3.0-amd64, 8.0.23-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/runtime/8.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-amd64, 8.0-azurelinux3.0-distroless-amd64, 8.0.23-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-extra-amd64, 8.0-azurelinux3.0-distroless-extra-amd64, 8.0.23-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-arm64v8, 10.0-noble-arm64v8, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/runtime/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
-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.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-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.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-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
-9.0.11-azurelinux3.0-arm64v8, 9.0-azurelinux3.0-arm64v8, 9.0.11-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/runtime/9.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-9.0.11-azurelinux3.0-distroless-arm64v8, 9.0-azurelinux3.0-distroless-arm64v8, 9.0.11-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
-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.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-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
-8.0.22-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.22-jammy, 8.0-jammy | [Dockerfile](src/runtime/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-arm64v8, 8.0-jammy-chiseled-arm64v8, 8.0.22-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime/8.0/jammy-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
-8.0.22-jammy-chiseled-extra-arm64v8, 8.0-jammy-chiseled-extra-arm64v8, 8.0.22-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime/8.0/jammy-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 22.04
-8.0.22-azurelinux3.0-arm64v8, 8.0-azurelinux3.0-arm64v8, 8.0.22-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/runtime/8.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-arm64v8, 8.0-azurelinux3.0-distroless-arm64v8, 8.0.22-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
-8.0.22-azurelinux3.0-distroless-extra-arm64v8, 8.0-azurelinux3.0-distroless-extra-arm64v8, 8.0.22-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.2-noble-arm64v8, 10.0-noble-arm64v8, 10.0.2-noble, 10.0-noble, 10.0.2, 10.0, latest | [Dockerfile](src/runtime/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+10.0.2-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0.2-alpine3.22, 10.0-alpine3.22 | [Dockerfile](src/runtime/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.22-extra-arm64v8, 10.0-alpine3.22-extra-arm64v8, 10.0.2-alpine3.22-extra, 10.0-alpine3.22-extra | [Dockerfile](src/runtime/10.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.23-arm64v8, 10.0-alpine3.23-arm64v8, 10.0-alpine-arm64v8, 10.0.2-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+10.0.2-alpine3.23-extra-arm64v8, 10.0-alpine3.23-extra-arm64v8, 10.0-alpine-extra-arm64v8, 10.0.2-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/runtime/10.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+10.0.2-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.2-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.2-azurelinux3.0-distroless-arm64v8, 10.0-azurelinux3.0-distroless-arm64v8, 10.0.2-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.2-azurelinux3.0-distroless-extra-arm64v8, 10.0-azurelinux3.0-distroless-extra-arm64v8, 10.0.2-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.12-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.12-bookworm-slim, 9.0-bookworm-slim, 9.0.12, 9.0 | [Dockerfile](src/runtime/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
+9.0.12-alpine3.22-arm64v8, 9.0-alpine3.22-arm64v8, 9.0.12-alpine3.22, 9.0-alpine3.22 | [Dockerfile](src/runtime/9.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.22-extra-arm64v8, 9.0-alpine3.22-extra-arm64v8, 9.0.12-alpine3.22-extra, 9.0-alpine3.22-extra | [Dockerfile](src/runtime/9.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.23-arm64v8, 9.0-alpine3.23-arm64v8, 9.0-alpine-arm64v8, 9.0.12-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/runtime/9.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+9.0.12-alpine3.23-extra-arm64v8, 9.0-alpine3.23-extra-arm64v8, 9.0-alpine-extra-arm64v8, 9.0.12-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/runtime/9.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+9.0.12-noble-arm64v8, 9.0-noble-arm64v8, 9.0.12-noble, 9.0-noble | [Dockerfile](src/runtime/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-arm64v8, 9.0-noble-chiseled-arm64v8, 9.0.12-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime/9.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-extra-arm64v8, 9.0-noble-chiseled-extra-arm64v8, 9.0.12-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime/9.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+9.0.12-azurelinux3.0-arm64v8, 9.0-azurelinux3.0-arm64v8, 9.0.12-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/runtime/9.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-arm64v8, 9.0-azurelinux3.0-distroless-arm64v8, 9.0.12-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+9.0.12-azurelinux3.0-distroless-extra-arm64v8, 9.0-azurelinux3.0-distroless-extra-arm64v8, 9.0.12-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.23-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.23-bookworm-slim, 8.0-bookworm-slim, 8.0.23, 8.0 | [Dockerfile](src/runtime/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
+8.0.23-alpine3.22-arm64v8, 8.0-alpine3.22-arm64v8, 8.0.23-alpine3.22, 8.0-alpine3.22 | [Dockerfile](src/runtime/8.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.22-extra-arm64v8, 8.0-alpine3.22-extra-arm64v8, 8.0.23-alpine3.22-extra, 8.0-alpine3.22-extra | [Dockerfile](src/runtime/8.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.23-arm64v8, 8.0-alpine3.23-arm64v8, 8.0-alpine-arm64v8, 8.0.23-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/runtime/8.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+8.0.23-alpine3.23-extra-arm64v8, 8.0-alpine3.23-extra-arm64v8, 8.0-alpine-extra-arm64v8, 8.0.23-alpine3.23-extra, 8.0-alpine3.23-extra, 8.0-alpine-extra | [Dockerfile](src/runtime/8.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23
+8.0.23-noble-arm64v8, 8.0-noble-arm64v8, 8.0.23-noble, 8.0-noble | [Dockerfile](src/runtime/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-arm64v8, 8.0-noble-chiseled-arm64v8, 8.0.23-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/runtime/8.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04
+8.0.23-noble-chiseled-extra-arm64v8, 8.0-noble-chiseled-extra-arm64v8, 8.0.23-noble-chiseled-extra, 8.0-noble-chiseled-extra | [Dockerfile](src/runtime/8.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04
+8.0.23-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.23-jammy, 8.0-jammy | [Dockerfile](src/runtime/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-arm64v8, 8.0-jammy-chiseled-arm64v8, 8.0.23-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime/8.0/jammy-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-extra-arm64v8, 8.0-jammy-chiseled-extra-arm64v8, 8.0.23-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime/8.0/jammy-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 22.04
+8.0.23-azurelinux3.0-arm64v8, 8.0-azurelinux3.0-arm64v8, 8.0.23-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/runtime/8.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-arm64v8, 8.0-azurelinux3.0-distroless-arm64v8, 8.0.23-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
+8.0.23-azurelinux3.0-distroless-extra-arm64v8, 8.0-azurelinux3.0-distroless-extra-arm64v8, 8.0.23-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.1-noble-arm32v7, 10.0-noble-arm32v7, 10.0.1-noble, 10.0-noble, 10.0.1, 10.0, latest | [Dockerfile](src/runtime/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
-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.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
-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.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-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.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-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
+10.0.2-noble-arm32v7, 10.0-noble-arm32v7, 10.0.2-noble, 10.0-noble, 10.0.2, 10.0, latest | [Dockerfile](src/runtime/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+10.0.2-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+10.0.2-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0.2-alpine3.22, 10.0-alpine3.22 | [Dockerfile](src/runtime/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.22-extra-arm32v7, 10.0-alpine3.22-extra-arm32v7, 10.0.2-alpine3.22-extra, 10.0-alpine3.22-extra | [Dockerfile](src/runtime/10.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
+10.0.2-alpine3.23-arm32v7, 10.0-alpine3.23-arm32v7, 10.0-alpine-arm32v7, 10.0.2-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+10.0.2-alpine3.23-extra-arm32v7, 10.0-alpine3.23-extra-arm32v7, 10.0-alpine-extra-arm32v7, 10.0.2-alpine3.23-extra, 10.0-alpine3.23-extra, 10.0-alpine-extra | [Dockerfile](src/runtime/10.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+9.0.12-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.12-bookworm-slim, 9.0-bookworm-slim, 9.0.12, 9.0 | [Dockerfile](src/runtime/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
+9.0.12-alpine3.22-arm32v7, 9.0-alpine3.22-arm32v7, 9.0.12-alpine3.22, 9.0-alpine3.22 | [Dockerfile](src/runtime/9.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.22-extra-arm32v7, 9.0-alpine3.22-extra-arm32v7, 9.0.12-alpine3.22-extra, 9.0-alpine3.22-extra | [Dockerfile](src/runtime/9.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
+9.0.12-alpine3.23-arm32v7, 9.0-alpine3.23-arm32v7, 9.0-alpine-arm32v7, 9.0.12-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/runtime/9.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+9.0.12-alpine3.23-extra-arm32v7, 9.0-alpine3.23-extra-arm32v7, 9.0-alpine-extra-arm32v7, 9.0.12-alpine3.23-extra, 9.0-alpine3.23-extra, 9.0-alpine-extra | [Dockerfile](src/runtime/9.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+9.0.12-noble-arm32v7, 9.0-noble-arm32v7, 9.0.12-noble, 9.0-noble | [Dockerfile](src/runtime/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-arm32v7, 9.0-noble-chiseled-arm32v7, 9.0.12-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime/9.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
+9.0.12-noble-chiseled-extra-arm32v7, 9.0-noble-chiseled-extra-arm32v7, 9.0.12-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime/9.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
+8.0.23-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.23-bookworm-slim, 8.0-bookworm-slim, 8.0.23, 8.0 | [Dockerfile](src/runtime/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
+8.0.23-alpine3.22-arm32v7, 8.0-alpine3.22-arm32v7, 8.0.23-alpine3.22, 8.0-alpine3.22 | [Dockerfile](src/runtime/8.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.22-extra-arm32v7, 8.0-alpine3.22-extra-arm32v7, 8.0.23-alpine3.22-extra, 8.0-alpine3.22-extra | [Dockerfile](src/runtime/8.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22
+8.0.23-alpine3.23-arm32v7, 8.0-alpine3.23-arm32v7, 8.0-alpine-arm32v7, 8.0.23-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/runtime/8.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+8.0.23-alpine3.23-extra-arm32v7, 8.0-alpine3.23-extra-arm32v7, 8.0-alpine-extra-arm32v7, 8.0.23-alpine3.23-extra, 8.0-alpine3.23-extra, 8.0-alpine-extra | [Dockerfile](src/runtime/8.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23
+8.0.23-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.23-jammy, 8.0-jammy | [Dockerfile](src/runtime/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-arm32v7, 8.0-jammy-chiseled-arm32v7, 8.0.23-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime/8.0/jammy-chiseled/arm32v7/Dockerfile) | Ubuntu 22.04
+8.0.23-jammy-chiseled-extra-arm32v7, 8.0-jammy-chiseled-extra-arm32v7, 8.0.23-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](src/runtime/8.0/jammy-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 22.04
 
 ### Nano Server 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-10.0.1-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile)
-9.0.11-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
-8.0.22-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
+10.0.2-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile)
+9.0.12-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
+8.0.23-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
 
 ### Windows Server Core 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-10.0.1-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile)
-9.0.11-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
-8.0.22-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+10.0.2-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+9.0.12-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+8.0.23-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 
 ### Nano Server 2022 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-10.0.1-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile)
-9.0.11-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
-8.0.22-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/8.0/nanoserver-ltsc2022/amd64/Dockerfile)
+10.0.2-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile)
+9.0.12-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
+8.0.23-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/8.0/nanoserver-ltsc2022/amd64/Dockerfile)
 
 ### Windows Server Core 2022 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-10.0.1-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile)
-9.0.11-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
-8.0.22-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)
+10.0.2-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile)
+9.0.12-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
+8.0.23-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 
 ### Nano Server, version 1809 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-9.0.11-nanoserver-1809, 9.0-nanoserver-1809 | [Dockerfile](src/runtime/9.0/nanoserver-1809/amd64/Dockerfile)
-8.0.22-nanoserver-1809, 8.0-nanoserver-1809 | [Dockerfile](src/runtime/8.0/nanoserver-1809/amd64/Dockerfile)
+9.0.12-nanoserver-1809, 9.0-nanoserver-1809 | [Dockerfile](src/runtime/9.0/nanoserver-1809/amd64/Dockerfile)
+8.0.23-nanoserver-1809, 8.0-nanoserver-1809 | [Dockerfile](src/runtime/8.0/nanoserver-1809/amd64/Dockerfile)
 
 ### Windows Server Core 2019 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-9.0.11-windowsservercore-ltsc2019, 9.0-windowsservercore-ltsc2019 | [Dockerfile](src/runtime/9.0/windowsservercore-ltsc2019/amd64/Dockerfile)
-8.0.22-windowsservercore-ltsc2019, 8.0-windowsservercore-ltsc2019 | [Dockerfile](src/runtime/8.0/windowsservercore-ltsc2019/amd64/Dockerfile)
+9.0.12-windowsservercore-ltsc2019, 9.0-windowsservercore-ltsc2019 | [Dockerfile](src/runtime/9.0/windowsservercore-ltsc2019/amd64/Dockerfile)
+8.0.23-windowsservercore-ltsc2019, 8.0-windowsservercore-ltsc2019 | [Dockerfile](src/runtime/8.0/windowsservercore-ltsc2019/amd64/Dockerfile)
 <!--End of generated tags-->
 
 *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/runtime/tags/list) for all supported and unsupported tags.*
diff --git a/README.sdk.md b/README.sdk.md
index c3ebc5d7db..43c923c3a8 100644
--- a/README.sdk.md
+++ b/README.sdk.md
@@ -67,111 +67,111 @@ The [Image Variants documentation](https://github.com/dotnet/dotnet-docker/blob/
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.101-noble-amd64, 10.0-noble-amd64, 10.0.101-noble, 10.0-noble, 10.0.101, 10.0, latest | [Dockerfile](src/sdk/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
-10.0.101-noble-aot-amd64, 10.0-noble-aot-amd64, 10.0.101-noble-aot, 10.0-noble-aot, 10.0.101-aot, 10.0-aot | [Dockerfile](src/sdk/10.0/noble-aot/amd64/Dockerfile) | Ubuntu 24.04
-10.0.101-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.101-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
-10.0.101-alpine3.22-aot-amd64, 10.0-alpine3.22-aot-amd64, 10.0-alpine-aot-amd64, 10.0.101-alpine3.22-aot, 10.0-alpine3.22-aot, 10.0-alpine-aot | [Dockerfile](src/sdk/10.0/alpine3.22-aot/amd64/Dockerfile) | Alpine 3.22
-10.0.101-alpine3.23-amd64, 10.0-alpine3.23-amd64, 10.0.101-alpine3.23, 10.0-alpine3.23 | [Dockerfile](src/sdk/10.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
-10.0.101-alpine3.23-aot-amd64, 10.0-alpine3.23-aot-amd64, 10.0.101-alpine3.23-aot, 10.0-alpine3.23-aot | [Dockerfile](src/sdk/10.0/alpine3.23-aot/amd64/Dockerfile) | Alpine 3.23
-10.0.101-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.101-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/sdk/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-10.0.101-azurelinux3.0-aot-amd64, 10.0-azurelinux3.0-aot-amd64, 10.0.101-azurelinux3.0-aot, 10.0-azurelinux3.0-aot | [Dockerfile](src/sdk/10.0/azurelinux3.0-aot/amd64/Dockerfile) | Azure Linux 3.0
-9.0.308-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.308-bookworm-slim, 9.0-bookworm-slim, 9.0.308, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12
-9.0.308-alpine3.22-amd64, 9.0-alpine3.22-amd64, 9.0-alpine-amd64, 9.0.308-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
-9.0.308-alpine3.23-amd64, 9.0-alpine3.23-amd64, 9.0.308-alpine3.23, 9.0-alpine3.23 | [Dockerfile](src/sdk/9.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
-9.0.308-noble-amd64, 9.0-noble-amd64, 9.0.308-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04
-9.0.308-azurelinux3.0-amd64, 9.0-azurelinux3.0-amd64, 9.0.308-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/sdk/9.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
-8.0.416-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.416-bookworm-slim, 8.0-bookworm-slim, 8.0.416, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12
-8.0.416-alpine3.22-amd64, 8.0-alpine3.22-amd64, 8.0-alpine-amd64, 8.0.416-alpine3.22, 8.0-alpine3.22, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
-8.0.416-alpine3.23-amd64, 8.0-alpine3.23-amd64, 8.0.416-alpine3.23, 8.0-alpine3.23 | [Dockerfile](src/sdk/8.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
-8.0.416-noble-amd64, 8.0-noble-amd64, 8.0.416-noble, 8.0-noble | [Dockerfile](src/sdk/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04
-8.0.416-jammy-amd64, 8.0-jammy-amd64, 8.0.416-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04
-8.0.416-azurelinux3.0-amd64, 8.0-azurelinux3.0-amd64, 8.0.416-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/sdk/8.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+10.0.102-noble-amd64, 10.0-noble-amd64, 10.0.102-noble, 10.0-noble, 10.0.102, 10.0, latest | [Dockerfile](src/sdk/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+10.0.102-noble-aot-amd64, 10.0-noble-aot-amd64, 10.0.102-noble-aot, 10.0-noble-aot, 10.0.102-aot, 10.0-aot | [Dockerfile](src/sdk/10.0/noble-aot/amd64/Dockerfile) | Ubuntu 24.04
+10.0.102-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0.102-alpine3.22, 10.0-alpine3.22 | [Dockerfile](src/sdk/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+10.0.102-alpine3.22-aot-amd64, 10.0-alpine3.22-aot-amd64, 10.0.102-alpine3.22-aot, 10.0-alpine3.22-aot | [Dockerfile](src/sdk/10.0/alpine3.22-aot/amd64/Dockerfile) | Alpine 3.22
+10.0.102-alpine3.23-amd64, 10.0-alpine3.23-amd64, 10.0-alpine-amd64, 10.0.102-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+10.0.102-alpine3.23-aot-amd64, 10.0-alpine3.23-aot-amd64, 10.0-alpine-aot-amd64, 10.0.102-alpine3.23-aot, 10.0-alpine3.23-aot, 10.0-alpine-aot | [Dockerfile](src/sdk/10.0/alpine3.23-aot/amd64/Dockerfile) | Alpine 3.23
+10.0.102-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.102-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/sdk/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+10.0.102-azurelinux3.0-aot-amd64, 10.0-azurelinux3.0-aot-amd64, 10.0.102-azurelinux3.0-aot, 10.0-azurelinux3.0-aot | [Dockerfile](src/sdk/10.0/azurelinux3.0-aot/amd64/Dockerfile) | Azure Linux 3.0
+9.0.309-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.309-bookworm-slim, 9.0-bookworm-slim, 9.0.309, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12
+9.0.309-alpine3.22-amd64, 9.0-alpine3.22-amd64, 9.0.309-alpine3.22, 9.0-alpine3.22 | [Dockerfile](src/sdk/9.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+9.0.309-alpine3.23-amd64, 9.0-alpine3.23-amd64, 9.0-alpine-amd64, 9.0.309-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+9.0.309-noble-amd64, 9.0-noble-amd64, 9.0.309-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+9.0.309-azurelinux3.0-amd64, 9.0-azurelinux3.0-amd64, 9.0.309-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/sdk/9.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
+8.0.417-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.417-bookworm-slim, 8.0-bookworm-slim, 8.0.417, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12
+8.0.417-alpine3.22-amd64, 8.0-alpine3.22-amd64, 8.0.417-alpine3.22, 8.0-alpine3.22 | [Dockerfile](src/sdk/8.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22
+8.0.417-alpine3.23-amd64, 8.0-alpine3.23-amd64, 8.0-alpine-amd64, 8.0.417-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23
+8.0.417-noble-amd64, 8.0-noble-amd64, 8.0.417-noble, 8.0-noble | [Dockerfile](src/sdk/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04
+8.0.417-jammy-amd64, 8.0-jammy-amd64, 8.0.417-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04
+8.0.417-azurelinux3.0-amd64, 8.0-azurelinux3.0-amd64, 8.0.417-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/sdk/8.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.101-noble-arm64v8, 10.0-noble-arm64v8, 10.0.101-noble, 10.0-noble, 10.0.101, 10.0, latest | [Dockerfile](src/sdk/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
-10.0.101-noble-aot-arm64v8, 10.0-noble-aot-arm64v8, 10.0.101-noble-aot, 10.0-noble-aot, 10.0.101-aot, 10.0-aot | [Dockerfile](src/sdk/10.0/noble-aot/arm64v8/Dockerfile) | Ubuntu 24.04
-10.0.101-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.101-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
-10.0.101-alpine3.22-aot-arm64v8, 10.0-alpine3.22-aot-arm64v8, 10.0-alpine-aot-arm64v8, 10.0.101-alpine3.22-aot, 10.0-alpine3.22-aot, 10.0-alpine-aot | [Dockerfile](src/sdk/10.0/alpine3.22-aot/arm64v8/Dockerfile) | Alpine 3.22
-10.0.101-alpine3.23-arm64v8, 10.0-alpine3.23-arm64v8, 10.0.101-alpine3.23, 10.0-alpine3.23 | [Dockerfile](src/sdk/10.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
-10.0.101-alpine3.23-aot-arm64v8, 10.0-alpine3.23-aot-arm64v8, 10.0.101-alpine3.23-aot, 10.0-alpine3.23-aot | [Dockerfile](src/sdk/10.0/alpine3.23-aot/arm64v8/Dockerfile) | Alpine 3.23
-10.0.101-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.101-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-10.0.101-azurelinux3.0-aot-arm64v8, 10.0-azurelinux3.0-aot-arm64v8, 10.0.101-azurelinux3.0-aot, 10.0-azurelinux3.0-aot | [Dockerfile](src/sdk/10.0/azurelinux3.0-aot/arm64v8/Dockerfile) | Azure Linux 3.0
-9.0.308-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.308-bookworm-slim, 9.0-bookworm-slim, 9.0.308, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
-9.0.308-alpine3.22-arm64v8, 9.0-alpine3.22-arm64v8, 9.0-alpine-arm64v8, 9.0.308-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
-9.0.308-alpine3.23-arm64v8, 9.0-alpine3.23-arm64v8, 9.0.308-alpine3.23, 9.0-alpine3.23 | [Dockerfile](src/sdk/9.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
-9.0.308-noble-arm64v8, 9.0-noble-arm64v8, 9.0.308-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
-9.0.308-azurelinux3.0-arm64v8, 9.0-azurelinux3.0-arm64v8, 9.0.308-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/sdk/9.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
-8.0.416-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.416-bookworm-slim, 8.0-bookworm-slim, 8.0.416, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
-8.0.416-alpine3.22-arm64v8, 8.0-alpine3.22-arm64v8, 8.0-alpine-arm64v8, 8.0.416-alpine3.22, 8.0-alpine3.22, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
-8.0.416-alpine3.23-arm64v8, 8.0-alpine3.23-arm64v8, 8.0.416-alpine3.23, 8.0-alpine3.23 | [Dockerfile](src/sdk/8.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
-8.0.416-noble-arm64v8, 8.0-noble-arm64v8, 8.0.416-noble, 8.0-noble | [Dockerfile](src/sdk/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
-8.0.416-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.416-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04
-8.0.416-azurelinux3.0-arm64v8, 8.0-azurelinux3.0-arm64v8, 8.0.416-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/sdk/8.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.102-noble-arm64v8, 10.0-noble-arm64v8, 10.0.102-noble, 10.0-noble, 10.0.102, 10.0, latest | [Dockerfile](src/sdk/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+10.0.102-noble-aot-arm64v8, 10.0-noble-aot-arm64v8, 10.0.102-noble-aot, 10.0-noble-aot, 10.0.102-aot, 10.0-aot | [Dockerfile](src/sdk/10.0/noble-aot/arm64v8/Dockerfile) | Ubuntu 24.04
+10.0.102-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0.102-alpine3.22, 10.0-alpine3.22 | [Dockerfile](src/sdk/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+10.0.102-alpine3.22-aot-arm64v8, 10.0-alpine3.22-aot-arm64v8, 10.0.102-alpine3.22-aot, 10.0-alpine3.22-aot | [Dockerfile](src/sdk/10.0/alpine3.22-aot/arm64v8/Dockerfile) | Alpine 3.22
+10.0.102-alpine3.23-arm64v8, 10.0-alpine3.23-arm64v8, 10.0-alpine-arm64v8, 10.0.102-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+10.0.102-alpine3.23-aot-arm64v8, 10.0-alpine3.23-aot-arm64v8, 10.0-alpine-aot-arm64v8, 10.0.102-alpine3.23-aot, 10.0-alpine3.23-aot, 10.0-alpine-aot | [Dockerfile](src/sdk/10.0/alpine3.23-aot/arm64v8/Dockerfile) | Alpine 3.23
+10.0.102-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.102-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+10.0.102-azurelinux3.0-aot-arm64v8, 10.0-azurelinux3.0-aot-arm64v8, 10.0.102-azurelinux3.0-aot, 10.0-azurelinux3.0-aot | [Dockerfile](src/sdk/10.0/azurelinux3.0-aot/arm64v8/Dockerfile) | Azure Linux 3.0
+9.0.309-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.309-bookworm-slim, 9.0-bookworm-slim, 9.0.309, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
+9.0.309-alpine3.22-arm64v8, 9.0-alpine3.22-arm64v8, 9.0.309-alpine3.22, 9.0-alpine3.22 | [Dockerfile](src/sdk/9.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+9.0.309-alpine3.23-arm64v8, 9.0-alpine3.23-arm64v8, 9.0-alpine-arm64v8, 9.0.309-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+9.0.309-noble-arm64v8, 9.0-noble-arm64v8, 9.0.309-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+9.0.309-azurelinux3.0-arm64v8, 9.0-azurelinux3.0-arm64v8, 9.0.309-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/sdk/9.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
+8.0.417-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.417-bookworm-slim, 8.0-bookworm-slim, 8.0.417, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
+8.0.417-alpine3.22-arm64v8, 8.0-alpine3.22-arm64v8, 8.0.417-alpine3.22, 8.0-alpine3.22 | [Dockerfile](src/sdk/8.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22
+8.0.417-alpine3.23-arm64v8, 8.0-alpine3.23-arm64v8, 8.0-alpine-arm64v8, 8.0.417-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23
+8.0.417-noble-arm64v8, 8.0-noble-arm64v8, 8.0.417-noble, 8.0-noble | [Dockerfile](src/sdk/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
+8.0.417-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.417-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04
+8.0.417-azurelinux3.0-arm64v8, 8.0-azurelinux3.0-arm64v8, 8.0.417-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](src/sdk/8.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm32 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-10.0.101-noble-arm32v7, 10.0-noble-arm32v7, 10.0.101-noble, 10.0-noble, 10.0.101, 10.0, latest | [Dockerfile](src/sdk/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
-10.0.101-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.101-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
-10.0.101-alpine3.23-arm32v7, 10.0-alpine3.23-arm32v7, 10.0.101-alpine3.23, 10.0-alpine3.23 | [Dockerfile](src/sdk/10.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
-9.0.308-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.308-bookworm-slim, 9.0-bookworm-slim, 9.0.308, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
-9.0.308-alpine3.22-arm32v7, 9.0-alpine3.22-arm32v7, 9.0-alpine-arm32v7, 9.0.308-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
-9.0.308-alpine3.23-arm32v7, 9.0-alpine3.23-arm32v7, 9.0.308-alpine3.23, 9.0-alpine3.23 | [Dockerfile](src/sdk/9.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
-9.0.308-noble-arm32v7, 9.0-noble-arm32v7, 9.0.308-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
-8.0.416-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.416-bookworm-slim, 8.0-bookworm-slim, 8.0.416, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
-8.0.416-alpine3.22-arm32v7, 8.0-alpine3.22-arm32v7, 8.0-alpine-arm32v7, 8.0.416-alpine3.22, 8.0-alpine3.22, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
-8.0.416-alpine3.23-arm32v7, 8.0-alpine3.23-arm32v7, 8.0.416-alpine3.23, 8.0-alpine3.23 | [Dockerfile](src/sdk/8.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
-8.0.416-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.416-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
+10.0.102-noble-arm32v7, 10.0-noble-arm32v7, 10.0.102-noble, 10.0-noble, 10.0.102, 10.0, latest | [Dockerfile](src/sdk/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+10.0.102-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0.102-alpine3.22, 10.0-alpine3.22 | [Dockerfile](src/sdk/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+10.0.102-alpine3.23-arm32v7, 10.0-alpine3.23-arm32v7, 10.0-alpine-arm32v7, 10.0.102-alpine3.23, 10.0-alpine3.23, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+9.0.309-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.309-bookworm-slim, 9.0-bookworm-slim, 9.0.309, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
+9.0.309-alpine3.22-arm32v7, 9.0-alpine3.22-arm32v7, 9.0.309-alpine3.22, 9.0-alpine3.22 | [Dockerfile](src/sdk/9.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+9.0.309-alpine3.23-arm32v7, 9.0-alpine3.23-arm32v7, 9.0-alpine-arm32v7, 9.0.309-alpine3.23, 9.0-alpine3.23, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+9.0.309-noble-arm32v7, 9.0-noble-arm32v7, 9.0.309-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
+8.0.417-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.417-bookworm-slim, 8.0-bookworm-slim, 8.0.417, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
+8.0.417-alpine3.22-arm32v7, 8.0-alpine3.22-arm32v7, 8.0.417-alpine3.22, 8.0-alpine3.22 | [Dockerfile](src/sdk/8.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22
+8.0.417-alpine3.23-arm32v7, 8.0-alpine3.23-arm32v7, 8.0-alpine-arm32v7, 8.0.417-alpine3.23, 8.0-alpine3.23, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23
+8.0.417-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.417-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
 
 ### Nano Server 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-10.0.101-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile)
-9.0.308-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
-8.0.416-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
+10.0.102-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile)
+9.0.309-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
+8.0.417-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
 
 ### Windows Server Core 2025 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-10.0.101-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile)
-9.0.308-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
-8.0.416-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+10.0.102-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+9.0.309-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+8.0.417-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
 
 ### Nano Server 2022 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-10.0.101-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile)
-9.0.308-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
-8.0.416-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/8.0/nanoserver-ltsc2022/amd64/Dockerfile)
+10.0.102-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile)
+9.0.309-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
+8.0.417-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/8.0/nanoserver-ltsc2022/amd64/Dockerfile)
 
 ### Windows Server Core 2022 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-10.0.101-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile)
-9.0.308-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
-8.0.416-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)
+10.0.102-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile)
+9.0.309-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
+8.0.417-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)
 
 ### Nano Server, version 1809 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-9.0.308-nanoserver-1809, 9.0-nanoserver-1809 | [Dockerfile](src/sdk/9.0/nanoserver-1809/amd64/Dockerfile)
-8.0.416-nanoserver-1809, 8.0-nanoserver-1809 | [Dockerfile](src/sdk/8.0/nanoserver-1809/amd64/Dockerfile)
+9.0.309-nanoserver-1809, 9.0-nanoserver-1809 | [Dockerfile](src/sdk/9.0/nanoserver-1809/amd64/Dockerfile)
+8.0.417-nanoserver-1809, 8.0-nanoserver-1809 | [Dockerfile](src/sdk/8.0/nanoserver-1809/amd64/Dockerfile)
 
 ### Windows Server Core 2019 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-9.0.308-windowsservercore-ltsc2019, 9.0-windowsservercore-ltsc2019 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2019/amd64/Dockerfile)
-8.0.416-windowsservercore-ltsc2019, 8.0-windowsservercore-ltsc2019 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2019/amd64/Dockerfile)
+9.0.309-windowsservercore-ltsc2019, 9.0-windowsservercore-ltsc2019 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2019/amd64/Dockerfile)
+8.0.417-windowsservercore-ltsc2019, 8.0-windowsservercore-ltsc2019 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2019/amd64/Dockerfile)
 <!--End of generated tags-->
 
 *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/sdk/tags/list) for all supported and unsupported tags.*
diff --git a/build-and-test.ps1 b/build-and-test.ps1
index e5673ad96d..a94921bcd1 100644
--- a/build-and-test.ps1
+++ b/build-and-test.ps1
@@ -22,6 +22,9 @@ param(
     # Categories of tests to run
     [ValidateSet("runtime", "runtime-deps", "aspnet", "sdk", "pre-build", "sample", "monitor", "aspire-dashboard")]
     [string[]]$TestCategories = @("runtime", "runtime-deps", "aspnet", "sdk", "monitor", "aspire-dashboard")
+
+    # Custom test filter expression
+    [string]$CustomTestFilter
 )
 
 [System.Collections.ArrayList]$TestCategories = $TestCategories
@@ -42,7 +45,7 @@ if (($Mode -eq "BuildAndTest" -or $Mode -eq "Test")) {
 
     if ($TestCategories.Contains("pre-build"))
     {
-        & ./tests/run-tests.ps1 -TestCategories "pre-build" -Version "*"
+        & ./tests/run-tests.ps1 -TestCategories "pre-build" -Version "*" -CustomTestFilter $CustomTestFilter
         $TestCategories.Remove("pre-build")
     }
     else
@@ -103,12 +106,14 @@ if ($Mode -eq "BuildAndTest" -or $Mode -eq "Test") {
         & ./tests/run-tests.ps1 `
             -Architecture $Architecture `
             -Paths $Paths `
-            -TestCategories $localTestCategories
+            -TestCategories $localTestCategories `
+            -CustomTestFilter $CustomTestFilter
     } else {
         & ./tests/run-tests.ps1 `
             -Version $TestVersion `
             -OSVersions @($OS) `
             -Architecture $Architecture `
-            -TestCategories @localTestCategories
+            -TestCategories @localTestCategories `
+            -CustomTestFilter $CustomTestFilter
     }
 }
diff --git a/eng/docker-tools/DEV-GUIDE.md b/eng/docker-tools/DEV-GUIDE.md
new file mode 100644
index 0000000000..ea0301f2d3
--- /dev/null
+++ b/eng/docker-tools/DEV-GUIDE.md
@@ -0,0 +1,387 @@
+# Developer Guide: Using the docker-tools Infrastructure
+
+This guide walks you through the practical scenarios and workflows for using the docker-tools infrastructure. The `eng/docker-tools` directory is a **shared infrastructure layer** used across all .NET Docker repositories (dotnet-docker, dotnet-buildtools-prereqs-docker, dotnet-framework-docker). It solves a fundamental challenge: building, testing, and publishing Docker images across multiple operating systems (Alpine, Ubuntu, Azure Linux, Windows Server variants), multiple CPU architectures (amd64, arm64, arm32), and multiple .NET versions—all while maintaining consistency and reliability.
+
+At its core, the infrastructure provides:
+
+- **PowerShell scripts** for local image building and Docker operations—so you can test Dockerfile changes on your machine before committing
+- **Azure Pipelines templates** for CI/CD (build, test, publish)—a composable template system that orchestrates builds across dozens of OS/architecture combinations in parallel
+- **ImageBuilder orchestration**—a specialized .NET tool that understands manifest files, manages image dependencies, handles multi-arch manifest creation, and coordinates the entire build process
+- **Caching and optimization**—intelligent systems that skip unchanged images and minimize redundant work
+- **SBOM generation**—automatic Software Bill of Materials creation for supply chain security
+
+The infrastructure handles complexity that would otherwise be overwhelming: a single commit to a repo can trigger builds of hundreds of image variants across Linux and Windows agents, each requiring proper build sequencing, testing, and eventual publication to Microsoft Artifact Registry (MAR).
+
+**Important:** Files in `eng/docker-tools/` are synchronized across repositories by automation in the [dotnet/docker-tools](https://github.com/dotnet/docker-tools) repository. If you need to make changes to this infrastructure, submit them there—changes made directly in consuming repos will be overwritten.
+
+---
+
+## Local Development Scenarios
+
+### Scenario: Building Docker Images Locally
+
+The most common local task is building images to test Dockerfile changes before pushing.
+
+**Quick Build - All Images:**
+```powershell
+./eng/docker-tools/build.ps1
+```
+
+**Filter by OS:**
+```powershell
+# Build only Alpine images
+./eng/docker-tools/build.ps1 -OS "alpine"
+
+# Build Ubuntu 24.04 images
+./eng/docker-tools/build.ps1 -OS "noble"
+```
+
+**Filter by Architecture:**
+```powershell
+# Build arm64 images only
+./eng/docker-tools/build.ps1 -Architecture "arm64"
+```
+
+**Filter by Path:**
+```powershell
+# Build images from a specific directory
+./eng/docker-tools/build.ps1 -Paths "src/runtime/8.0/alpine3.20"
+
+# Build all 8.0 runtime images using glob pattern
+./eng/docker-tools/build.ps1 -Paths "*runtime*8.0*"
+```
+
+**Combine Filters:**
+```powershell
+# Build .NET 8.0 Alpine arm64 images
+./eng/docker-tools/build.ps1 -Version "8.0" -OS "alpine" -Architecture "arm64"
+```
+
+**Filter by Product Version (if applicable):**
+```powershell
+# Build only .NET 8.0 images
+./eng/docker-tools/build.ps1 -Version "8.0"
+
+# Build .NET 6.0 and 8.0 images
+./eng/docker-tools/build.ps1 -Version "6.0","8.0"
+```
+
+### Understanding What Happens Under the Hood
+
+When you run [`build.ps1`](build.ps1), here's the chain of execution:
+
+```
+build.ps1
+    │
+    ├── Translates your filter parameters into ImageBuilder CLI args
+    │
+    └── Calls Invoke-ImageBuilder.ps1 "build --version X --os-version Y ..."
+            │
+            ├── On Linux: Runs ImageBuilder in a Docker container
+            │   └── Builds image: microsoft-dotnet-imagebuilder-withrepo
+            │   └── Mounts Docker socket and repo contents
+            │
+            └── On Windows: Extracts ImageBuilder locally (due to Docker-in-Docker limitations)
+                └── Runs Microsoft.DotNet.ImageBuilder.exe directly
+```
+
+### Scenario: Running ImageBuilder Directly
+
+For advanced scenarios, you may want to invoke ImageBuilder with specific commands:
+
+```powershell
+# Run any ImageBuilder command
+./eng/docker-tools/Invoke-ImageBuilder.ps1 "build --help"
+
+# Generate the build matrix (useful for debugging pipeline behavior)
+./eng/docker-tools/Invoke-ImageBuilder.ps1 "generateBuildMatrix --manifest manifest.json --type platformDependencyGraph"
+
+# Validate manifest syntax
+./eng/docker-tools/Invoke-ImageBuilder.ps1 "validateManifest --manifest manifest.json"
+```
+
+---
+
+## Understanding the Pipeline Architecture
+
+### The Build Flow
+
+The pipeline behaves differently depending on the build context:
+
+**Public PR Builds**:
+```
+Build Stage
+  ├── PreBuildValidation
+  ├── GenerateBuildMatrix
+  └── Build Jobs (dry-run, no push)
+        └── Inline tests after each build
+              │
+              ▼
+          Post_Build Stage
+            └── Merge artifacts
+                    │
+                    ▼
+              Publish Stage (dry-run)
+                └── All publish operations run but skip actual pushes
+                        │
+                        ▼
+                      (end)
+```
+- Images are built but **not pushed** to any registry
+- Tests run inline within each build job
+- Publish stage runs in dry-run mode (validates publish logic without pushing)
+- Validates that Dockerfiles build successfully
+
+**Internal Official Builds**:
+```
+Build Stage
+  ├── PreBuildValidation
+  ├── CopyBaseImages → staging ACR
+  ├── GenerateBuildMatrix
+  └── Build Jobs (push to staging ACR)
+              │
+              ▼
+          Post_Build Stage
+            ├── Merge image info files
+            └── Consolidate SBOMs
+                    │
+                    ▼
+              Test Stage
+                ├── GenerateTestMatrix
+                └── Test Jobs
+                        │
+                        ▼
+                  Publish Stage
+                    ├── Copy images to production ACR
+                    ├── Create multi-arch manifests
+                    ├── Wait for MAR ingestion
+                    ├── Update READMEs
+                    ├── Publish image info to versions repo
+                    └── Apply EOL annotations
+```
+- Full pipeline with all stages
+- Images flow: `BuildRegistry` → `PublishRegistry` → MAR (see [`publish-config-prod.yml`](templates/stages/dotnet/publish-config-prod.yml) for ACR definitions)
+- Tests run against staged images
+- Only successful builds get published
+
+### Build Matrix Generation
+
+The `generateBuildMatrix` command is key to understanding how builds are parallelized. It:
+
+1. **Reads the manifest.json** - Understands which images exist
+2. **Builds a dependency graph** - Knows that `runtime-deps` must build before `runtime`
+3. **Groups by platform** - Creates jobs for each OS/Architecture combo
+4. **Optimizes with caching** - Can detect and exclude unchanged images
+
+### Controlling Which Build Stages Run
+
+The `stages` variable is a comma-separated string that controls which pipeline stages execute:
+
+```yaml
+variables:
+- name: stages
+  value: "build,test,publish"    # Run all stages
+```
+
+Common patterns:
+- `"build"` - Build only, no tests or publishing
+- `"build,test"` - Build and test, but don't publish
+- `"publish"` - Publish only (when re-running a failed publish from a previous build)
+- `"build,test,publish"` - Full pipeline
+
+**Note:** The `Post_Build` stage is implicitly included whenever `build` is in the stages list. You don't need to specify it separately—it automatically runs after Build to merge image info files and consolidate SBOMs.
+
+The stages variable is useful for:
+- Re-running just the publish stage after fixing a transient failure
+- Skipping tests during initial development
+- Running isolated stages for debugging
+
+### Image Info Files: The Build's Memory
+
+Image info files (defined by [`ImageArtifactDetails`](https://github.com/dotnet/docker-tools/blob/main/src/ImageBuilder/Models/Image/ImageArtifactDetails.cs)) are the mechanism that tracks what was built:
+
+```json
+{
+  "repos": [{
+    "repo": "dotnet/runtime",
+    "images": [{
+      "platforms": [{
+        "dockerfile": "src/runtime/8.0/alpine3.20/amd64/Dockerfile",
+        "digest": "sha256:abc123...",
+        "created": "2024-01-15T10:30:00Z",
+        "commitUrl": "https://github.com/dotnet/dotnet-docker/commit/..."
+      }]
+    }]
+  }]
+}
+```
+
+**How they flow through the pipeline:**
+1. **Build stage**: Each build job produces an image-info fragment
+2. **Post_Build stage**: Fragments are merged into a single `image-info.json`
+3. **Test stage**: Uses merged info to know which images to test
+4. **Publish stage**: Uses info to know which images to copy/publish
+5. **Versions repo**: Final info is committed to the versions repo
+
+The [versions repo](https://github.com/dotnet/versions) stores the "source of truth" image info. Future builds compare against this to determine what's changed and skip unchanged images.
+
+**Using Image Info for Investigations**
+
+Image info files are invaluable when you need to track down information about a specific image, particularly when starting from a digest reported by a customer or security scan.
+
+*Scenario: "Which commit produced this image?"*
+
+Given a digest like `sha256:abc123...`, you can trace it back to its source:
+
+1. **Check the versions repo history** - The `dotnet/versions` repo contains historical image info committed after each publish. Use `git log -p --all -S 'sha256:abc123'` to find the commit that introduced this digest.
+
+2. **From the image info entry**, you'll find:
+   - `commitUrl` - The exact source commit that built this image
+   - `dockerfile` - Which Dockerfile produced it
+   - `created` - When it was built
+   - `simpleTags` - The tags applied to this image
+
+*Scenario: "What was in the last successful build?"*
+
+Download the `image-info` artifact from a pipeline run in Azure DevOps:
+1. Navigate to the pipeline run
+2. Go to the "Published" artifacts section
+3. Download `image-info` (merged) or individual `*-image-info-*` fragments
+
+*Scenario: "When did we last publish updates to a specific image?"*
+
+Use the versions repo git history:
+```bash
+# In the dotnet/versions repo
+git log --oneline -- build-info/docker/image-info.dotnet-dotnet-docker-main.json
+```
+
+Each commit corresponds to a publish operation and includes the full image info at that point in time.
+
+*Scenario: "Compare what changed between two publishes"*
+
+```bash
+git diff <commit1> <commit2> -- build-info/docker/image-info.dotnet-dotnet-docker-main.json
+```
+
+This shows which images were added, removed, or rebuilt (new digests) between the two publishes.
+
+### The Publish Flow in Detail
+
+The publish stage does more than just push images. Here's the sequence:
+
+1. **Copy Images** — `copyAcrImages` copies from build ACR to publish ACR
+2. **Publish Manifest** — `publishManifest` creates multi-arch manifest lists
+3. **Wait for MAR Ingestion** — Polls MAR until images are available (timeout configurable)
+4. **Publish READMEs** — Updates documentation in the registry
+5. **Wait for Doc Ingestion** — Ensures README changes are live
+6. **Merge & Publish Image Info** — Updates the versions repo with new image metadata
+7. **Ingest Kusto Image Info** — Sends telemetry to Kusto for analytics
+8. **Generate & Apply EOL Annotations** — Marks images with end-of-life dates
+9. **Post Publish Notification** — Creates GitHub issues/notifications about the publish
+
+### Dry-Run Mode
+
+For testing pipeline changes without actually publishing:
+
+```yaml
+# In pipeline variables or at runtime
+variables:
+- name: dryRunArg
+  value: "--dry-run"
+```
+
+Or the infrastructure automatically enables dry-run for:
+- Pull request builds
+- Builds from non-official branches
+- Public project builds
+
+The [`set-dry-run.yml`](templates/steps/set-dry-run.yml) step template determines this automatically based on context.
+
+---
+
+## Automatic Image Rebuilds
+
+The infrastructure includes automation that monitors for base image updates and triggers rebuilds when dependencies change.
+
+### How It Works
+
+A scheduled pipeline ([`check-base-image-updates.yml`](https://github.com/dotnet/docker-tools/blob/main/eng/pipelines/check-base-image-updates.yml)) runs every 4 hours and:
+
+1. **Checks for stale images** — Compares the base image digests used in our published images against the current digests in upstream registries
+2. **Identifies affected images** — Determines which of our images need rebuilding because their base image changed
+3. **Queues targeted builds** — Automatically triggers builds for only the affected images, not the entire repo
+
+This ensures that security patches and updates in base images (like `alpine`, `ubuntu`, `mcr.microsoft.com/windows/nanoserver`) flow through to images without manual intervention.
+
+### Failure Handling and Recovery
+
+The system has built-in retry logic but requires manual intervention after repeated failures:
+
+**Automatic retry behavior:**
+- If a triggered build fails, the system will attempt to rebuild every 4 hours
+- After **3 unsuccessful attempts**, the system stops queuing new builds for that image
+- This prevents endless rebuild loops when there's a genuine issue requiring human attention
+
+**After fixing the issue:**
+
+Once you've fixed the underlying problem (Dockerfile change, test fix, etc.) and have a successful build:
+
+1. Navigate to the successful pipeline run in Azure DevOps
+2. Add the `autobuilder` label to that run
+3. This signals to the infrastructure that a successful build has occurred
+4. The system will resume automatic rebuilds for that image as needed
+
+The `autobuilder` label is how the infrastructure tracks that the failure cycle has been broken and normal operations can resume.
+
+---
+
+## Common Customization Patterns
+
+### Pattern: Adding Build Arguments
+
+Pass additional arguments to Docker builds via ImageBuilder:
+
+```yaml
+customBuildInitSteps:
+- powershell: |
+    $args = "--build-arg MY_VAR=value"
+    echo "##vso[task.setvariable variable=imageBuilderBuildArgs]$args"
+```
+
+### Pattern: Re-running Stages with `stages` and `sourceBuildPipelineRunId`
+
+A powerful pattern is combining the `stages` variable with the `sourceBuildPipelineRunId` pipeline parameter to run specific stages using artifacts from a previous build. This is useful for:
+1. Skipping stages you don't need to run
+2. Avoiding unnecessary re-builds after test/publishing infrastructure fixes
+
+Note: For simple retries of failed jobs, use the Azure Pipelines UI "Re-run failed jobs" feature instead.
+
+**Scenario: Test failed, need to run publish anyway**
+
+* Set `sourceBuildPipelineRunId` to the build which built the images
+* Set `stages` to `publish`
+
+**How it works:**
+
+1. `sourceBuildPipelineRunId` tells the pipeline which previous run to pull artifacts from
+2. The [`download-build-artifact.yml`](templates/steps/download-build-artifact.yml) step uses this ID to fetch `image-info.json` from that run
+3. Specified stage(s) use the downloaded image info to know which images exist
+
+**Common recovery patterns:**
+
+| Scenario | stages | sourceBuildPipelineRunId |
+|----------|--------|--------------------------|
+| Normal full build | `"build,test,publish"` | `$(Build.BuildId)` (default) |
+| Re-run publish after infra fix | `"publish"` | ID of the successful build run |
+| Re-test after infra fix | `"test"` | ID of the build run to test |
+| Build only (no publish) | `"build"` | `$(Build.BuildId)` (default) |
+| Test + publish (skip build) | `"test,publish"` | ID of the build run |
+
+**In the Azure DevOps UI:**
+
+When you queue a new run, you can override these as runtime parameters:
+1. Set `stages` to the stage(s) you want to run
+2. Set `sourceBuildPipelineRunId` to the run ID containing the artifacts you need (find the build ID in the URL when viewing a pipeline run, e.g., `buildId=123456`)
+
+This avoids the multi-hour rebuild cycle when you just need to retry a failed operation.
diff --git a/eng/docker-tools/readme.md b/eng/docker-tools/readme.md
index c0fe1f2eb8..11d6717eca 100644
--- a/eng/docker-tools/readme.md
+++ b/eng/docker-tools/readme.md
@@ -25,4 +25,6 @@
 
 !!! Changes made in this directory are subject to being overwritten by automation !!!
 
-The files in this directory are shared by all .NET Docker repos. If you need to make changes to these files, open an issue or submit a pull request in https://github.com/dotnet/docker-tools.
\ No newline at end of file
+The files in this directory are shared by all .NET Docker repos. If you need to make changes to these files, open an issue or submit a pull request in https://github.com/dotnet/docker-tools.
+
+For guidance on using this infrastructure, see the [Developer Guide](DEV-GUIDE.md).
\ No newline at end of file
diff --git a/eng/docker-tools/templates/1es.yml b/eng/docker-tools/templates/1es.yml
index 5fde4a73d3..4056610e46 100644
--- a/eng/docker-tools/templates/1es.yml
+++ b/eng/docker-tools/templates/1es.yml
@@ -39,6 +39,15 @@ parameters:
 - name: enableSbom
   type: boolean
   default: false
+# Network isolation policy that will be enabled for jobs. The default policy
+# allows all outbound connections except for public package feeds and known
+# malicious endpoints. If this policy breaks the build, then it can be set to
+# "Permissive" temporarily until external dependencies are resolved.
+# See the network isolation documentation for more details:
+# https://eng.ms/docs/coreai/devdiv/one-engineering-system-1es/1es-build/cloudbuild/security/1espt-network-isolation
+- name: networkIsolationPolicy
+  type: string
+  default: Permissive,CFSClean
 
 resources:
   repositories:
@@ -53,6 +62,8 @@ extends:
     baseTemplate: v1/1ES.${{ iif(contains(variables['Build.DefinitionName'], '-official'), 'Official', 'Unofficial') }}.PipelineTemplate.yml@1ESPipelineTemplates
     templateParameters:
       pool: ${{ parameters.pool }}
+      settings:
+        networkIsolationPolicy: ${{ parameters.networkIsolationPolicy }}
       sdl:
         sbom:
           enabled: ${{ parameters.enableSbom }}
diff --git a/eng/docker-tools/templates/jobs/build-images.yml b/eng/docker-tools/templates/jobs/build-images.yml
index 1f7f9b566e..b820d2f4b1 100644
--- a/eng/docker-tools/templates/jobs/build-images.yml
+++ b/eng/docker-tools/templates/jobs/build-images.yml
@@ -32,6 +32,7 @@ jobs:
   - ${{ parameters.commonInitStepsForMatrixAndBuild }}
   - template: /eng/docker-tools/templates/jobs/${{ format('../steps/init-docker-{0}.yml', parameters.dockerClientOS) }}@self
     parameters:
+      publishConfig: ${{ parameters.publishConfig }}
       cleanupDocker: true
   - ${{ parameters.customInitSteps }}
   - template: /eng/docker-tools/templates/steps/set-image-info-path-var.yml@self
@@ -51,7 +52,7 @@ jobs:
       # the environment variable for us.
       $imageBuilderBuildArgs = "$env:IMAGEBUILDERBUILDARGS $env:IMAGEBUILDER_QUEUEARGS --image-info-output-path $(imageInfoContainerDir)/$(legName)-image-info.json $(commonMatrixAndBuildOptions)"
       if ($env:SYSTEM_TEAMPROJECT -eq "${{ parameters.internalProjectName }}" -and $env:BUILD_REASON -ne "PullRequest") {
-        $imageBuilderBuildArgs = "$imageBuilderBuildArgs --repo-prefix ${{ parameters.publishConfig.buildAcr.repoPrefix }} --push"
+        $imageBuilderBuildArgs = "$imageBuilderBuildArgs --repo-prefix ${{ parameters.publishConfig.BuildRegistry.repoPrefix }} --push"
       }
 
       # If the pipeline isn't configured to disable the cache and a build variable hasn't been set to disable the cache
@@ -66,14 +67,8 @@ jobs:
     parameters:
       name: BuildImages
       displayName: Build Images
-      serviceConnections:
-      # "name" here refers to the argument name, not the service connection name.
-      # It should probably be changed to "argName".
-      - name: acr
-        id: ${{ parameters.publishConfig.buildAcr.serviceConnection.id }}
-        tenantId: ${{ parameters.publishConfig.buildAcr.serviceConnection.tenantId }}
-        clientId: ${{ parameters.publishConfig.buildAcr.serviceConnection.clientId }}
-      - ${{ if parameters.storageAccountServiceConnection }}:
+      ${{ if parameters.storageAccountServiceConnection }}:
+        serviceConnections:
         - name: storage
           id: ${{ parameters.storageAccountServiceConnection.id }}
           tenantId: ${{ parameters.storageAccountServiceConnection.tenantId }}
@@ -89,8 +84,8 @@ jobs:
         --architecture $(architecture)
         --retry
         --digests-out-var 'builtImages'
-        --acr-subscription '${{ parameters.publishConfig.buildAcr.subscription }}'
-        --acr-resource-group '${{ parameters.publishConfig.buildAcr.resourceGroup }}'
+        --acr-subscription '${{ parameters.publishConfig.BuildRegistry.subscription }}'
+        --acr-resource-group '${{ parameters.publishConfig.BuildRegistry.resourceGroup }}'
         $(manifestVariables)
         $(imageBuilderBuildArgs)
   - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self
@@ -104,12 +99,12 @@ jobs:
     - powershell: |
         $images = "$(BuildImages.builtImages)"
         if (-not $images) { return 0 }
-        $syftImageName = "${{ parameters.publishConfig.publicMirrorAcr.server }}/$(imageNames.syft)"
+        $syftImageName = "${{ parameters.publishConfig.PublicMirrorRegistry.server }}/$(imageNames.syft)"
         & $(engDockerToolsPath)/Pull-Image.ps1 $syftImageName
         $images -Split ',' | ForEach-Object {
           echo "Generating SBOM for $_";
           $targetImageName = "$_";
-          $formattedImageName = $targetImageName.Replace('${{ parameters.publishConfig.buildAcr.server }}/${{ parameters.publishConfig.buildAcr.repoPrefix }}', "").Replace('/', '_').Replace(':', '_');
+          $formattedImageName = $targetImageName.Replace('${{ parameters.publishConfig.BuildRegistry.server }}/${{ parameters.publishConfig.BuildRegistry.repoPrefix }}', "").Replace('/', '_').Replace(':', '_');
           $sbomChildDir = "$(sbomDirectory)/$formattedImageName";
           New-Item -Type Directory -Path $sbomChildDir > $null;
           docker build --output=$sbomChildDir -f $(engDockerToolsPath)/Dockerfile.syft --build-arg SYFT_IMAGE_NAME=$syftImageName --build-arg TARGET_IMAGE_NAME=$targetImageName -t syft-sbom $(engDockerToolsPath);
diff --git a/eng/docker-tools/templates/jobs/cg-build-projects.yml b/eng/docker-tools/templates/jobs/cg-build-projects.yml
index 845a6719c3..af8b29106f 100644
--- a/eng/docker-tools/templates/jobs/cg-build-projects.yml
+++ b/eng/docker-tools/templates/jobs/cg-build-projects.yml
@@ -22,10 +22,10 @@ jobs:
     os: linux
   steps:
   - powershell: >
-      ./eng/docker-tools/Install-DotNetSdk.ps1 -Channel ${{ parameters.dotnetVersionChannel }} -InstallPath "/usr/share/.dotnet"
+      ./eng/docker-tools/Install-DotNetSdk.ps1 -Channel ${{ parameters.dotnetVersionChannel }} -InstallPath "$(Build.SourcesDirectory)/.dotnet"
     displayName: Run Dotnet Install Script
   - script: >
-      find . -name '*.csproj' | grep $(cgBuildGrepArgs) | xargs -n 1 /usr/share/.dotnet/dotnet build
+      find . -name '*.csproj' | grep $(cgBuildGrepArgs) | xargs -n 1 $(Build.SourcesDirectory)/.dotnet/dotnet build
     displayName: Build Projects
 
     # Component Detection is only automatically run on production branches.
diff --git a/eng/docker-tools/templates/jobs/copy-base-images-staging.yml b/eng/docker-tools/templates/jobs/copy-base-images-staging.yml
index 20ce1f4dac..9cc23fce7a 100644
--- a/eng/docker-tools/templates/jobs/copy-base-images-staging.yml
+++ b/eng/docker-tools/templates/jobs/copy-base-images-staging.yml
@@ -23,7 +23,7 @@ jobs:
   parameters:
     name: ${{ parameters.name }}
     pool: ${{ parameters.pool }}
+    publishConfig: ${{ parameters.publishConfig }}
     customInitSteps: ${{ parameters.customInitSteps }}
     additionalOptions: ${{ parameters.additionalOptions }}
-    acr: ${{ parameters.publishConfig.internalMirrorAcr }}
-    repoPrefix: ${{ parameters.publishConfig.internalMirrorAcr.repoPrefix }}
+    acr: ${{ parameters.publishConfig.InternalMirrorRegistry }}
diff --git a/eng/docker-tools/templates/jobs/copy-base-images.yml b/eng/docker-tools/templates/jobs/copy-base-images.yml
index ffc5aee155..58b48243be 100644
--- a/eng/docker-tools/templates/jobs/copy-base-images.yml
+++ b/eng/docker-tools/templates/jobs/copy-base-images.yml
@@ -5,11 +5,11 @@ parameters:
 - name: pool
   type: object
   default: {}
-- name: acr
+- name: publishConfig
   type: object
   default: null
-- name: repoPrefix
-  type: string
+- name: acr
+  type: object
   default: null
 - name: customInitSteps
   type: stepList
@@ -29,11 +29,12 @@ jobs:
   pool: ${{ parameters.pool }}
   steps:
   - template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self
+    parameters:
+      publishConfig: ${{ parameters.publishConfig }}
   - ${{ parameters.customInitSteps }}
   - template: /eng/docker-tools/templates/steps/copy-base-images.yml@self
     parameters:
       acr: ${{ parameters.acr }}
-      repoPrefix: ${{ parameters.repoPrefix }}
       additionalOptions: ${{ parameters.additionalOptions }}
       continueOnError: ${{ parameters.continueOnError }}
       forceDryRun: ${{ parameters.forceDryRun }}
diff --git a/eng/docker-tools/templates/jobs/generate-matrix.yml b/eng/docker-tools/templates/jobs/generate-matrix.yml
index 606dec57fe..81017bbb27 100644
--- a/eng/docker-tools/templates/jobs/generate-matrix.yml
+++ b/eng/docker-tools/templates/jobs/generate-matrix.yml
@@ -63,10 +63,5 @@ jobs:
     parameters:
       name: matrix
       displayName: Generate ${{ parameters.matrixType }} Matrix
-      serviceConnections:
-      - name: acr
-        tenantId: $(build.serviceConnection.tenantId)
-        clientId: $(build.serviceConnection.clientId)
-        id: $(build.serviceConnection.id)
       internalProjectName: internal
       args: $(generateBuildMatrixCommand)
diff --git a/eng/docker-tools/templates/jobs/publish.yml b/eng/docker-tools/templates/jobs/publish.yml
index cb9b454aca..9682b4d0ed 100644
--- a/eng/docker-tools/templates/jobs/publish.yml
+++ b/eng/docker-tools/templates/jobs/publish.yml
@@ -21,7 +21,7 @@ jobs:
   - name: imageBuilder.commonCmdArgs
     value: >-
       --manifest '$(manifest)'
-      --registry-override '${{ parameters.publishConfig.publishAcr.server }}'
+      --registry-override '${{ parameters.publishConfig.PublishRegistry.server }}'
       $(manifestVariables)
       $(imageBuilder.queueArgs)
   - name: publishNotificationRepoName
@@ -53,6 +53,8 @@ jobs:
   - template: /eng/docker-tools/templates/steps/retain-build.yml@self
 
   - template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self
+    parameters:
+      publishConfig: ${{ parameters.publishConfig }}
 
   - pwsh: |
       $azdoOrgName = Split-Path -Leaf $Env:SYSTEM_COLLECTIONURI
@@ -95,21 +97,16 @@ jobs:
   - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self
     parameters:
       displayName: Copy Images
-      serviceConnections:
-      - name: acr
-        id: ${{ parameters.publishConfig.publishAcr.serviceConnection.id }}
-        tenantId: ${{ parameters.publishConfig.publishAcr.serviceConnection.tenantId }}
-        clientId: ${{ parameters.publishConfig.publishAcr.serviceConnection.clientId }}
       internalProjectName: ${{ parameters.internalProjectName }}
       args: >-
         copyAcrImages
-        '${{ parameters.publishConfig.buildAcr.subscription }}'
-        '${{ parameters.publishConfig.buildAcr.resourceGroup }}'
-        '${{ parameters.publishConfig.buildAcr.repoPrefix }}'
-        '${{ parameters.publishConfig.buildAcr.server }}'
+        '${{ parameters.publishConfig.BuildRegistry.subscription }}'
+        '${{ parameters.publishConfig.BuildRegistry.resourceGroup }}'
+        '${{ parameters.publishConfig.BuildRegistry.repoPrefix }}'
+        '${{ parameters.publishConfig.BuildRegistry.server }}'
         --os-type '*'
         --architecture '*'
-        --repo-prefix '${{ parameters.publishConfig.publishAcr.repoPrefix }}'
+        --repo-prefix '${{ parameters.publishConfig.PublishRegistry.repoPrefix }}'
         --image-info '$(imageInfoContainerDir)/image-info.json'
         $(dryRunArg)
         $(imageBuilder.pathArgs)
@@ -118,17 +115,12 @@ jobs:
   - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self
     parameters:
       displayName: Publish Manifest
-      serviceConnections:
-      - name: acr
-        id: ${{ parameters.publishConfig.publishAcr.serviceConnection.id }}
-        tenantId: ${{ parameters.publishConfig.publishAcr.serviceConnection.tenantId }}
-        clientId: ${{ parameters.publishConfig.publishAcr.serviceConnection.clientId }}
       internalProjectName: ${{ parameters.internalProjectName }}
       dockerClientOS: ${{ parameters.dockerClientOS }}
       args: >-
         publishManifest
         '$(imageInfoContainerDir)/image-info.json'
-        --repo-prefix '${{ parameters.publishConfig.publishAcr.repoPrefix }}'
+        --repo-prefix '${{ parameters.publishConfig.PublishRegistry.repoPrefix }}'
         --os-type '*'
         --architecture '*'
         $(dryRunArg)
@@ -208,17 +200,12 @@ jobs:
   - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self
     parameters:
       displayName: Generate EOL Annotation Data
-      serviceConnections:
-      - name: acr
-        id: ${{ parameters.publishConfig.publishAcr.serviceConnection.id }}
-        tenantId: ${{ parameters.publishConfig.publishAcr.serviceConnection.tenantId }}
-        clientId: ${{ parameters.publishConfig.publishAcr.serviceConnection.clientId }}
       internalProjectName: internal
       condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true'))
       args: >-
         generateEolAnnotationDataForPublish
-        '${{ parameters.publishConfig.publishAcr.server }}'
-        '${{ parameters.publishConfig.publishAcr.repoPrefix }}'
+        '${{ parameters.publishConfig.PublishRegistry.server }}'
+        '${{ parameters.publishConfig.PublishRegistry.repoPrefix }}'
         '$(artifactsPath)/eol-annotation-data/eol-annotation-data.json'
         '$(imageInfoContainerDir)/full-image-info-orig.json'
         '$(imageInfoContainerDir)/full-image-info-new.json'
@@ -236,7 +223,7 @@ jobs:
 
   - template: /eng/docker-tools/templates/steps/annotate-eol-digests.yml@self
     parameters:
-      acr: ${{ parameters.publishConfig.publishAcr }}
+      acr: ${{ parameters.publishConfig.PublishRegistry }}
       dataFile: $(artifactsPath)/eol-annotation-data/eol-annotation-data.json
 
   - script: >
@@ -275,7 +262,7 @@ jobs:
       $(gitHubNotificationsRepoInfo.authArgs)
       '$(gitHubNotificationsRepoInfo.org)'
       '$(gitHubNotificationsRepoInfo.repo)'
-      --repo-prefix '${{ parameters.publishConfig.publishAcr.repoPrefix }}'
+      --repo-prefix '${{ parameters.publishConfig.PublishRegistry.repoPrefix }}'
       --task "🟪 Copy Images"
       --task "🟪 Publish Manifest"
       --task "🟪 Wait for Image Ingestion"
@@ -284,8 +271,8 @@ jobs:
       --task "🟪 Publish Image Info"
       --task "🟪 Ingest Kusto Image Info"
       --task "🟪 Generate EOL Annotation Data"
-      --task "🟪 Annotate EOL Images (${{ parameters.publishConfig.publishAcr.server }})"
-      --task "🟪 Wait for Annotation Ingestion (${{ parameters.publishConfig.publishAcr.server }})"
+      --task "🟪 Annotate EOL Images (${{ parameters.publishConfig.PublishRegistry.server }})"
+      --task "🟪 Wait for Annotation Ingestion (${{ parameters.publishConfig.PublishRegistry.server }})"
       $(dryRunArg)
       $(imageBuilder.commonCmdArgs)
     displayName: Post Publish Notification
diff --git a/eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml b/eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml
index eddd785931..424f3aaf5d 100644
--- a/eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml
+++ b/eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml
@@ -47,10 +47,12 @@ stages:
     internalProjectName: "internal"
     publicProjectName: "public"
 
+    # publishConfig schema is defined in src/ImageBuilder/Configuration/PublishConfiguration.cs.
+    # This will get converted to JSON and placed in appsettings.json to be loaded by ImageBuilder at runtime.
     publishConfig:
-      internalMirrorAcr:
+      InternalMirrorRegistry:
         server: $(acr-staging-test.server)
-        repoPrefix: $(mirrorRepoPrefix)
+        repoPrefix: $(internalMirrorRepoPrefix)
         resourceGroup: $(testResourceGroup)
         subscription: $(testSubscription)
         serviceConnection:
@@ -59,8 +61,9 @@ stages:
           clientId: $(internal-mirror-test.serviceConnection.clientId)
           tenantId: $(testTenant)
 
-      publicMirrorAcr:
+      PublicMirrorRegistry:
         server: $(public-mirror.server)
+        repoPrefix: $(publicMirrorRepoPrefix)
         resourceGroup: $(public-mirror.resourceGroup)
         subscription: $(public-mirror.subscription)
         serviceConnection:
@@ -69,7 +72,7 @@ stages:
           tenantId: $(public-mirror.serviceConnection.tenantId)
           clientId: $(public-mirror.serviceConnection.clientId)
 
-      buildAcr:
+      BuildRegistry:
         server: $(acr-staging-test.server)
         resourceGroup: $(testResourceGroup)
         subscription: $(testSubscription)
@@ -92,7 +95,7 @@ stages:
         clientId: $(test-nonprod.serviceConnection.clientId)
         tenantId: $(testTenant)
 
-      publishAcr:
+      PublishRegistry:
         server: $(acr-test.server)
         resourceGroup: $(testResourceGroup)
         subscription: $(testSubscription)
diff --git a/eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml b/eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml
index d45807ddbf..7f9a4e0071 100644
--- a/eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml
+++ b/eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml
@@ -47,10 +47,12 @@ stages:
     internalProjectName: "internal"
     publicProjectName: "public"
 
+    # publishConfig schema is defined in src/ImageBuilder/Configuration/PublishConfiguration.cs.
+    # This will get converted to JSON and placed in appsettings.json to be loaded by ImageBuilder at runtime.
     publishConfig:
-      internalMirrorAcr:
+      InternalMirrorRegistry:
         server: $(acr-staging.server)
-        repoPrefix: $(mirrorRepoPrefix)
+        repoPrefix: $(internalMirrorRepoPrefix)
         resourceGroup: $(acr-staging.resourceGroup)
         subscription: $(acr-staging.subscription)
         serviceConnection:
@@ -59,8 +61,9 @@ stages:
           clientId: $(internal-mirror.serviceConnection.clientId)
           tenantId: $(internal-mirror.serviceConnection.tenantId)
 
-      publicMirrorAcr:
+      PublicMirrorRegistry:
         server: $(public-mirror.server)
+        repoPrefix: $(publicMirrorRepoPrefix)
         resourceGroup: $(public-mirror.resourceGroup)
         subscription: $(public-mirror.subscription)
         serviceConnection:
@@ -69,7 +72,7 @@ stages:
           tenantId: $(public-mirror.serviceConnection.tenantId)
           clientId: $(public-mirror.serviceConnection.clientId)
 
-      buildAcr:
+      BuildRegistry:
         server: $(acr-staging.server)
         resourceGroup: $(acr-staging.resourceGroup)
         subscription: $(acr-staging.subscription)
@@ -92,7 +95,7 @@ stages:
         clientId: $(test.serviceConnection.clientId)
         tenantId: $(test.serviceConnection.tenantId)
 
-      publishAcr:
+      PublishRegistry:
         server: $(acr.server)
         resourceGroup: $(acr.resourceGroup)
         subscription: $(acr.subscription)
diff --git a/eng/docker-tools/templates/steps/annotate-eol-digests.yml b/eng/docker-tools/templates/steps/annotate-eol-digests.yml
index 0cb090c1c1..8e2f7571be 100644
--- a/eng/docker-tools/templates/steps/annotate-eol-digests.yml
+++ b/eng/docker-tools/templates/steps/annotate-eol-digests.yml
@@ -11,11 +11,6 @@ steps:
   - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self
     parameters:
       displayName: Annotate EOL Images (${{ parameters.acr.server }})
-      serviceConnections:
-      - name: acr
-        id: ${{ parameters.acr.serviceConnection.id }}
-        tenantId: ${{ parameters.acr.serviceConnection.tenantId }}
-        clientId: ${{ parameters.acr.serviceConnection.clientId }}
       internalProjectName: internal
       condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true'))
       args: >-
diff --git a/eng/docker-tools/templates/steps/clean-acr-images.yml b/eng/docker-tools/templates/steps/clean-acr-images.yml
index b791de3054..65b8ceffac 100644
--- a/eng/docker-tools/templates/steps/clean-acr-images.yml
+++ b/eng/docker-tools/templates/steps/clean-acr-images.yml
@@ -16,11 +16,6 @@ steps:
         displayName: "Clean ${{ parameters.repo }} (${{ parameters.action }} > ${{ parameters.age }}d)"
       ${{ else }}:
         displayName: "Clean ${{ parameters.repo }} (${{ parameters.action }})"
-      serviceConnections:
-      - name: acr
-        id: ${{ parameters.publishConfig.cleanServiceConnection.id }}
-        tenantId: ${{ parameters.publishConfig.cleanServiceConnection.tenantId }}
-        clientId: ${{ parameters.publishConfig.cleanServiceConnection.clientId }}
       internalProjectName: ${{ parameters.internalProjectName }}
       args: >-
         cleanAcrImages
diff --git a/eng/docker-tools/templates/steps/copy-base-images.yml b/eng/docker-tools/templates/steps/copy-base-images.yml
index d547370832..0e9e09f688 100644
--- a/eng/docker-tools/templates/steps/copy-base-images.yml
+++ b/eng/docker-tools/templates/steps/copy-base-images.yml
@@ -3,15 +3,9 @@ parameters:
   type: object
   default:
     server: ""
-    serviceConnection:
-      tenantId: ""
-      clientId: ""
-      id: ""
     subscription: ""
     resourceGroup: ""
-- name: repoPrefix
-  type: string
-  default: null
+    repoPrefix: ""
 - name: additionalOptions
   type: string
   default: ""
@@ -28,11 +22,6 @@ steps:
 - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self
   parameters:
     displayName: Copy Base Images
-    serviceConnections:
-    - name: "acr"
-      tenantId: ${{ parameters.acr.serviceConnection.tenantId }}
-      clientId: ${{ parameters.acr.serviceConnection.clientId }}
-      id: ${{ parameters.acr.serviceConnection.id }}
     continueOnError: ${{ parameters.continueOnError }}
     internalProjectName: 'internal'
     # Use environment variable to reference $(dryRunArg). Since $(dryRunArg) might be undefined,
@@ -44,7 +33,7 @@ steps:
       '${{ parameters.acr.resourceGroup }}'
       $(dockerHubRegistryCreds)
       $(customCopyBaseImagesArgs)
-      --repo-prefix '${{ parameters.repoPrefix }}'
+      --repo-prefix '${{ parameters.acr.repoPrefix }}'
       --registry-override '${{ parameters.acr.server }}'
       --os-type 'linux'
       --architecture '*'
diff --git a/eng/docker-tools/templates/steps/generate-appsettings.yml b/eng/docker-tools/templates/steps/generate-appsettings.yml
new file mode 100644
index 0000000000..5eaa5a1429
--- /dev/null
+++ b/eng/docker-tools/templates/steps/generate-appsettings.yml
@@ -0,0 +1,20 @@
+# .NET Microsoft.Extensions.Configuration reads appsettings.json from the working directory
+# where ImageBuilder is run. Place it in the repo root so it will be available at runtime.
+parameters:
+- name: publishConfig
+  type: object
+- name: condition
+  type: string
+  default: "true"
+
+steps:
+- powershell: |-
+    $appsettingsJsonContent = @"
+    {
+      "PublishConfiguration": ${{ convertToJson(parameters.publishConfig) }}
+    }
+    "@
+    Set-Content -Path "appsettings.json" -Value $appsettingsJsonContent
+    Get-Content -Path "appsettings.json"
+  displayName: Output publish configuration
+  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), ${{ parameters.condition }})
diff --git a/eng/docker-tools/templates/steps/init-docker-linux.yml b/eng/docker-tools/templates/steps/init-docker-linux.yml
index c8669e19ba..3216afdb8e 100644
--- a/eng/docker-tools/templates/steps/init-docker-linux.yml
+++ b/eng/docker-tools/templates/steps/init-docker-linux.yml
@@ -1,8 +1,21 @@
 parameters:
-  setupImageBuilder: true
-  setupTestRunner: false
-  cleanupDocker: false
-  condition: true
+- name: setupImageBuilder
+  type: boolean
+  default: true
+- name: setupTestRunner
+  type: boolean
+  default: false
+# Whether existing Docker images will be deleted
+- name: cleanupDocker
+  type: boolean
+  default: false
+# Whether or not to run the steps in this template
+- name: condition
+  type: string
+  default: "true"
+- name: publishConfig
+  type: object
+  default: null
 
 steps:
 - template: /eng/docker-tools/templates/steps/init-common.yml@self
@@ -29,6 +42,11 @@ steps:
     displayName: Pull Image Builder
     condition: and(succeeded(), ${{ parameters.condition }})
 
+  - template: /eng/docker-tools/templates/steps/generate-appsettings.yml@self
+    parameters:
+      publishConfig: ${{ parameters.publishConfig }}
+      condition: ${{ parameters.condition }}
+
   - script: >-
       docker build
       -t $(imageNames.imageBuilder.withrepo)
diff --git a/eng/docker-tools/templates/steps/init-docker-windows.yml b/eng/docker-tools/templates/steps/init-docker-windows.yml
index e8593b5eb8..36bd8e6df5 100644
--- a/eng/docker-tools/templates/steps/init-docker-windows.yml
+++ b/eng/docker-tools/templates/steps/init-docker-windows.yml
@@ -1,6 +1,7 @@
 parameters:
   setupImageBuilder: true
-  condition: true
+  condition: "true"
+  publishConfig: null
 
 steps:
 - template: /eng/docker-tools/templates/steps/init-common.yml@self
@@ -37,6 +38,12 @@ steps:
     displayName: Cleanup Setup Container
     condition: and(always(), ${{ parameters.condition }})
     continueOnError: true
+
+  - template: /eng/docker-tools/templates/steps/generate-appsettings.yml@self
+    parameters:
+      publishConfig: ${{ parameters.publishConfig }}
+      condition: ${{ parameters.condition }}
+
   - task: PowerShell@2
     displayName: Define runImageBuilderCmd Variables
     condition: and(succeeded(), ${{ parameters.condition }})
diff --git a/eng/docker-tools/templates/steps/init-matrix-build-publish.yml b/eng/docker-tools/templates/steps/init-matrix-build-publish.yml
index 8a555eccd6..e5e6bf19ce 100644
--- a/eng/docker-tools/templates/steps/init-matrix-build-publish.yml
+++ b/eng/docker-tools/templates/steps/init-matrix-build-publish.yml
@@ -20,7 +20,7 @@ steps:
 - powershell: |
     $commonMatrixAndBuildOptions = "--source-repo $(publicGitRepoUri)"
     if ("$(System.TeamProject)" -eq "internal" -and "$(Build.Reason)" -ne "PullRequest") {
-      $commonMatrixAndBuildOptions = "$commonMatrixAndBuildOptions --source-repo-prefix ${{ parameters.publishConfig.internalMirrorAcr.repoPrefix }} --registry-override ${{ parameters.publishConfig.buildAcr.server }}"
+      $commonMatrixAndBuildOptions = "$commonMatrixAndBuildOptions --source-repo-prefix ${{ parameters.publishConfig.InternalMirrorRegistry.repoPrefix }} --registry-override ${{ parameters.publishConfig.BuildRegistry.server }}"
     }
 
     if ("$(System.TeamProject)" -eq "public" -and "$(public-mirror.server)" -ne "") {
diff --git a/eng/docker-tools/templates/steps/publish-readmes.yml b/eng/docker-tools/templates/steps/publish-readmes.yml
index 2708980501..c0daaf52f6 100644
--- a/eng/docker-tools/templates/steps/publish-readmes.yml
+++ b/eng/docker-tools/templates/steps/publish-readmes.yml
@@ -6,7 +6,7 @@ steps:
 - script: >
     $(runImageBuilderCmd) publishMcrDocs
     --manifest '$(manifest)'
-    --registry-override '${{ parameters.publishConfig.publishAcr.server }}'
+    --registry-override '${{ parameters.publishConfig.PublishRegistry.server }}'
     '$(mcrDocsRepoInfo.userName)'
     '$(mcrDocsRepoInfo.email)'
     $(mcrDocsRepoInfo.authArgs)
diff --git a/eng/docker-tools/templates/steps/run-imagebuilder.yml b/eng/docker-tools/templates/steps/run-imagebuilder.yml
index 3613d809bf..ab7415387e 100644
--- a/eng/docker-tools/templates/steps/run-imagebuilder.yml
+++ b/eng/docker-tools/templates/steps/run-imagebuilder.yml
@@ -7,16 +7,12 @@ parameters:
   default: "Run ImageBuilder"
 - name: serviceConnections
   type: object
-  default:
-  # name: the name of the service connection argument that will be passed to the ImageBuilder command.
-  #   For example, if the argument is --acr-service-connection, the name would be "acr".
-  - name: ""
-    # The service connection's ID (GUID).
-    id: ""
-    # The client ID of the Managed Idendity backing the service connection (GUID).
-    clientId: ""
-    # The ID of the tenant that the Managed Identity is in (GUID).
-    tenantId: ""
+  default: []
+  # - name: The name of the service connection argument that will be passed to the ImageBuilder command.
+  #         For example, if the argument is --acr-service-connection, the name would be "acr".
+    # id: The service connection's ID (GUID).
+    # clientId: The client ID of the Managed Idendity backing the service connection (GUID).
+    # tenantId: The ID of the tenant that the Managed Identity is in (GUID).
 - name: internalProjectName
   type: string
   default: null
diff --git a/eng/docker-tools/templates/steps/set-dry-run.yml b/eng/docker-tools/templates/steps/set-dry-run.yml
index 44e3062b0f..4879f7459e 100644
--- a/eng/docker-tools/templates/steps/set-dry-run.yml
+++ b/eng/docker-tools/templates/steps/set-dry-run.yml
@@ -15,7 +15,7 @@ steps:
       # Public builds need to use dry-run mode since they don't publish anywhere.
       $dryRunArg="--dry-run"
     }
-    elseif (-not "$(officialRepoPrefixes)".Split(',').Contains("${{ parameters.publishConfig.publishAcr.repoPrefix }}"))
+    elseif (-not "$(officialRepoPrefixes)".Split(',').Contains("${{ parameters.publishConfig.PublishRegistry.repoPrefix }}"))
     {
       # If we're running an internal build on an official pipeline but not
       # publishing to an official repo prefix, then use dry run mode.
diff --git a/eng/docker-tools/templates/steps/test-images-linux-client.yml b/eng/docker-tools/templates/steps/test-images-linux-client.yml
index 38426ab2ae..add2b32070 100644
--- a/eng/docker-tools/templates/steps/test-images-linux-client.yml
+++ b/eng/docker-tools/templates/steps/test-images-linux-client.yml
@@ -24,7 +24,7 @@ steps:
       additionalTestArgs="$additionalTestArgs -TestCategories pre-build"
     else
       if [ "${{ variables['System.TeamProject'] }}" == "${{ parameters.internalProjectName }}" ] && [ "${{ variables['Build.Reason'] }}" != "PullRequest" ]; then
-        additionalTestArgs="$additionalTestArgs -PullImages -Registry ${{ parameters.publishConfig.buildAcr.server }} -RepoPrefix ${{ parameters.publishConfig.buildAcr.repoPrefix }} -ImageInfoPath $(artifactsPath)/image-info.json"
+        additionalTestArgs="$additionalTestArgs -PullImages -Registry ${{ parameters.publishConfig.BuildRegistry.server }} -RepoPrefix ${{ parameters.publishConfig.BuildRegistry.repoPrefix }} -ImageInfoPath $(artifactsPath)/image-info.json"
         if [ "$TESTCATEGORIESOVERRIDE" != "" ]; then
           additionalTestArgs="$additionalTestArgs -TestCategories $TESTCATEGORIESOVERRIDE"
         fi
@@ -53,7 +53,7 @@ steps:
         $azLoginArgs = '--service-principal --tenant $env:AZURE_TENANT_ID -u $env:AZURE_CLIENT_ID --federated-token $env:AZURE_FEDERATED_TOKEN';
         docker exec -e AZURE_TENANT_ID=$env:tenantId -e AZURE_CLIENT_ID=$env:servicePrincipalId -e AZURE_FEDERATED_TOKEN=$env:idToken $(testRunner.container) pwsh
         -File $(engDockerToolsRelativePath)/Invoke-WithRetry.ps1
-        "az login $azLoginArgs; az acr login -n ${{ parameters.publishConfig.buildAcr.server }}"
+        "az login $azLoginArgs; az acr login -n ${{ parameters.publishConfig.BuildRegistry.server }}"
   - ${{ if eq(parameters.preBuildValidation, 'false') }}:
     - template: /eng/docker-tools/templates/steps/download-build-artifact.yml@self
       parameters:
@@ -76,7 +76,7 @@ steps:
   displayName: Test Images
   condition: and(succeeded(), ${{ parameters.condition }})
 - ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest')) }}:
-  - script: docker exec $(testRunner.container) docker logout ${{ parameters.publishConfig.buildAcr.server }}
+  - script: docker exec $(testRunner.container) docker logout ${{ parameters.publishConfig.BuildRegistry.server }}
     displayName: Docker logout
     condition: and(always(), ${{ parameters.condition }})
     continueOnError: true
diff --git a/eng/docker-tools/templates/steps/test-images-windows-client.yml b/eng/docker-tools/templates/steps/test-images-windows-client.yml
index ad84cff0e8..54bf2e9a14 100644
--- a/eng/docker-tools/templates/steps/test-images-windows-client.yml
+++ b/eng/docker-tools/templates/steps/test-images-windows-client.yml
@@ -1,7 +1,7 @@
 parameters:
   internalProjectName: null
   publishConfig: null
-  condition: true
+  condition: "true"
   customInitSteps: []
   sourceBuildPipelineRunId: ""
 
@@ -20,12 +20,12 @@ steps:
       condition: and(succeeded(), ${{ parameters.condition }})
       command: >-
         az login --service-principal --tenant $env:tenantId -u $env:servicePrincipalId --federated-token $env:idToken;
-        $accessToken = $(az acr login -n ${{ parameters.publishConfig.buildAcr.server }} --expose-token --query accessToken --output tsv);
-        docker login ${{ parameters.publishConfig.buildAcr.server }} -u 00000000-0000-0000-0000-000000000000 -p $accessToken
+        $accessToken = $(az acr login -n ${{ parameters.publishConfig.BuildRegistry.server }} --expose-token --query accessToken --output tsv);
+        docker login ${{ parameters.publishConfig.BuildRegistry.server }} -u 00000000-0000-0000-0000-000000000000 -p $accessToken
 - ${{ parameters.customInitSteps }}
 - powershell: |
     if ("${{ variables['System.TeamProject'] }}" -eq "${{ parameters.internalProjectName }}" -and "${{ variables['Build.Reason'] }}" -ne "PullRequest") {
-      $additionalTestArgs="$env:ADDITIONALTESTARGS -PullImages -Registry ${{ parameters.publishConfig.buildAcr.server }} -RepoPrefix ${{ parameters.publishConfig.buildAcr.repoPrefix }} -ImageInfoPath $(artifactsPath)/image-info.json"
+      $additionalTestArgs="$env:ADDITIONALTESTARGS -PullImages -Registry ${{ parameters.publishConfig.BuildRegistry.server }} -RepoPrefix ${{ parameters.publishConfig.BuildRegistry.repoPrefix }} -ImageInfoPath $(artifactsPath)/image-info.json"
     }
     echo "##vso[task.setvariable variable=additionalTestArgs]$additionalTestArgs"
   displayName: Set Test Variables
@@ -50,7 +50,7 @@ steps:
   displayName: Test Images
   condition: and(succeeded(), ${{ parameters.condition }})
 - ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest')) }}:
-  - script: docker logout ${{ parameters.publishConfig.buildAcr.server }}
+  - script: docker logout ${{ parameters.publishConfig.BuildRegistry.server }}
     displayName: Docker logout
     condition: and(always(), ${{ parameters.condition }})
     continueOnError: true
diff --git a/eng/docker-tools/templates/steps/validate-branch.yml b/eng/docker-tools/templates/steps/validate-branch.yml
index 0fb1a841d2..945aefa681 100644
--- a/eng/docker-tools/templates/steps/validate-branch.yml
+++ b/eng/docker-tools/templates/steps/validate-branch.yml
@@ -11,11 +11,11 @@ steps:
         exit 0
       }
 
-      $isOfficialRepoPrefix = "$(officialRepoPrefixes)".Split(',').Contains("${{ parameters.publishConfig.publishAcr.repoPrefix }}")
+      $isOfficialRepoPrefix = "$(officialRepoPrefixes)".Split(',').Contains("${{ parameters.publishConfig.PublishRegistry.repoPrefix }}")
       if (-not $isOfficialRepoPrefix)
       {
         echo "This build will not publish to an official repo prefix, continuing."
-        echo "Publish repo prefix: ${{ parameters.publishConfig.publishAcr.repoPrefix }}"
+        echo "Publish repo prefix: ${{ parameters.publishConfig.PublishRegistry.repoPrefix }}"
         echo "Official repo prefixes: $(officialRepoPrefixes)"
         exit 0
       }
@@ -47,6 +47,6 @@ steps:
       echo "Build definition: $(Build.DefinitionName)"
       echo "1ESPT build type: $(OneESPT.BuildType)"
       echo "Current branch: $(sourceBranch)"
-      echo "Publish repo prefix: ${{ parameters.publishConfig.publishAcr.repoPrefix }}"
+      echo "Publish repo prefix: ${{ parameters.publishConfig.PublishRegistry.repoPrefix }}"
       exit 1
     displayName: Validate Branch
diff --git a/eng/docker-tools/templates/steps/wait-for-mcr-image-ingestion.yml b/eng/docker-tools/templates/steps/wait-for-mcr-image-ingestion.yml
index 6c7236439b..bffaf03789 100644
--- a/eng/docker-tools/templates/steps/wait-for-mcr-image-ingestion.yml
+++ b/eng/docker-tools/templates/steps/wait-for-mcr-image-ingestion.yml
@@ -30,7 +30,7 @@ steps:
       waitForMcrImageIngestion
       '${{ parameters.imageInfoPath }}'
       --manifest '$(manifest)'
-      --repo-prefix '${{ parameters.publishConfig.publishAcr.repoPrefix }}'
+      --repo-prefix '${{ parameters.publishConfig.PublishRegistry.repoPrefix }}'
       --min-queue-time '${{ parameters.minQueueTime }}'
       --timeout '$(mcrImageIngestionTimeout)'
       $(manifestVariables)
diff --git a/eng/docker-tools/templates/variables/common.yml b/eng/docker-tools/templates/variables/common.yml
index 1a994f684b..8b847e7131 100644
--- a/eng/docker-tools/templates/variables/common.yml
+++ b/eng/docker-tools/templates/variables/common.yml
@@ -33,8 +33,10 @@ variables:
 - name: officialBranches
   # comma-delimited list of branch names
   value: main
-- name: mirrorRepoPrefix
+- name: internalMirrorRepoPrefix
   value: 'mirror/'
+- name: publicMirrorRepoPrefix
+  value: ''
 - name: cgBuildGrepArgs
   value: "''"
 - name: test.init
diff --git a/eng/docker-tools/templates/variables/docker-images.yml b/eng/docker-tools/templates/variables/docker-images.yml
index fff171d695..999a72cf58 100644
--- a/eng/docker-tools/templates/variables/docker-images.yml
+++ b/eng/docker-tools/templates/variables/docker-images.yml
@@ -1,5 +1,5 @@
 variables:
-  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2852433
+  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2877314
   imageNames.imageBuilder: $(imageNames.imageBuilderName)
   imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
   imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner
diff --git a/eng/dockerfile-templates/Dockerfile.download-dotnet b/eng/dockerfile-templates/Dockerfile.download-dotnet
index 9cf99ff7d1..d745e77736 100644
--- a/eng/dockerfile-templates/Dockerfile.download-dotnet
+++ b/eng/dockerfile-templates/Dockerfile.download-dotnet
@@ -45,7 +45,7 @@
       Internal/release stable builds will use product versions for both paths and filenames.
       Public stable builds still use build versions for paths but stable versions for filenames.
       Public unstable builds use build versions for both paths and filenames. ^
-    set isStableVersion to find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^
+    set isStableVersion to find(buildVersion, "alpha") < 0 && find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^
     set fileVersion to when(isStableVersion, productVersion, buildVersion) ^
 
     set archiveExtension to when(isWindows, ".zip", ".tar.gz") ^
diff --git a/eng/dockerfile-templates/Dockerfile.linux.validate-checksum b/eng/dockerfile-templates/Dockerfile.linux.validate-checksum
index e001932dea..219f27fd01 100644
--- a/eng/dockerfile-templates/Dockerfile.linux.validate-checksum
+++ b/eng/dockerfile-templates/Dockerfile.linux.validate-checksum
@@ -27,9 +27,13 @@
 
     set isAlpine to find(OS_VERSION, "alpine") >= 0 ^
 
+    _ Ubuntu 26.04 (resolute) uses rust-based coreutils (uutils) which has case-sensitive hashsum functions ^
+    set isUUtils to find(OS_VERSION_BASE, "resolute") >= 0 ^
+    set normalizeCaseFn to when(isUUtils, "| tr 'A-F' 'a-f'", "") ^
+
     set shaValue to
         when(ARGS["sha-file"] && ARGS["sha-file-is-bare"],
-            cat("$(cat ", ARGS["sha-file"],")"),
+            cat("$(cat ", ARGS["sha-file"], normalizeCaseFn, ")"),
         when(ARGS["sha-var-name"],
             cat("$", ARGS["sha-var-name"]),
             ARGS["sha"]))
diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.envs b/eng/dockerfile-templates/aspnet/Dockerfile.envs
index f781a195c8..ebabad80de 100644
--- a/eng/dockerfile-templates/aspnet/Dockerfile.envs
+++ b/eng/dockerfile-templates/aspnet/Dockerfile.envs
@@ -4,7 +4,10 @@
 
     set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
     set buildVersion to VARIABLES[cat("aspnet|", dotnetVersion, "|build-version")] ^
-    set isStableBranding to find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^
+    set isStableBranding to
+        find(buildVersion, "alpha") < 0
+        && find(buildVersion, "preview") < 0
+        && find(buildVersion, "rc.") < 0 ^
 
     set runtimeVersion to when(isStableBranding,
         VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")],
diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.linux b/eng/dockerfile-templates/aspnet/Dockerfile.linux
index ba1d261eaa..a84b5db2e3 100644
--- a/eng/dockerfile-templates/aspnet/Dockerfile.linux
+++ b/eng/dockerfile-templates/aspnet/Dockerfile.linux
@@ -20,7 +20,8 @@
     set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^
 
     _ Workaround for https://bugs.launchpad.net/ubuntu/+source/tar/+bug/2059734. Remove when fixed. ^
-    set osVersionBase to when(ARCH_VERSIONED = "arm32v7" && osVersionBase = "noble", "jammy", osVersionBase) ^
+    set isUbuntu to find(OS_ARCH_HYPHENATED, "Ubuntu") >= 0 ^
+    set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^
 
     set installerImageTag to when(isDistrolessAzureLinux,
         cat("mcr.microsoft.com/"
diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite b/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite
index 03ac2c23e5..1e1b550808 100644
--- a/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite
+++ b/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite
@@ -17,7 +17,8 @@
     set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^
 
     _ Workaround for https://bugs.launchpad.net/ubuntu/+source/tar/+bug/2059734. Remove when fixed. ^
-    set osVersionBase to when(osVersionBase = "noble" && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^
+    set isUbuntu to find(OS_ARCH_HYPHENATED, "Ubuntu") >= 0 ^
+    set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^
 
     set installerImageTag to when(isDistrolessAzureLinux,
         cat("mcr.microsoft.com/",
diff --git a/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu b/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu
index 115a629015..f3dc045f11 100644
--- a/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu
+++ b/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu
@@ -17,7 +17,7 @@
 
     set installerImageTag to cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl") ^
 
-    set opensslPkg to when(match(osVersionBase, "noble"), "libssl3t64", "libssl3") ^
+    set opensslPkg to when(match(osVersionBase, "jammy"), "libssl3", "libssl3t64") ^
 
     set basePkgs to [
             "base-files_base",
@@ -97,7 +97,7 @@ RUN {{InsertTemplate("Dockerfile.linux.non-root-user-staged", [
 
 RUN mkdir --parents /rootfs/var/lib/dpkg/ \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
-        --release ubuntu-{{osVersionNumber}} --root /rootfs \{{for index, pkg in pkgs:
+        --release ubuntu-{{osVersionNumber}}{{if match(osVersionBase, "resolute"): --ignore=unstable}} --root /rootfs \{{for index, pkg in pkgs:
             {{pkg}}{{if index < len(pkgs) - 1: \}}}}
 
 
diff --git a/eng/dockerfile-templates/runtime/Dockerfile.envs b/eng/dockerfile-templates/runtime/Dockerfile.envs
index c658e10133..8c4cee0ae2 100644
--- a/eng/dockerfile-templates/runtime/Dockerfile.envs
+++ b/eng/dockerfile-templates/runtime/Dockerfile.envs
@@ -3,11 +3,14 @@
         is-standalone (optional): Whether the ENV instruction should be included ^
 
     set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
-    set runtimeVersion to VARIABLES[cat("runtime|", dotnetVersion, "|build-version")] ^
-    set isStableBranding to find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^
+    set buildVersion to VARIABLES[cat("runtime|", dotnetVersion, "|build-version")] ^
+    set isStableBranding to
+        find(buildVersion, "alpha") < 0
+        && find(buildVersion, "preview") < 0
+        && find(buildVersion, "rc.") < 0 ^
     set runtimeVersion to when(isStableBranding,
         VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")],
-        VARIABLES[cat("runtime|", dotnetVersion, "|build-version")])
+        buildVersion)
 
 }}# .NET Runtime version
 {{if ARGS["is-standalone"]:ENV }}DOTNET_VERSION={{runtimeVersion}}
diff --git a/eng/dockerfile-templates/runtime/Dockerfile.linux b/eng/dockerfile-templates/runtime/Dockerfile.linux
index 319dc58175..5ea2e8a526 100644
--- a/eng/dockerfile-templates/runtime/Dockerfile.linux
+++ b/eng/dockerfile-templates/runtime/Dockerfile.linux
@@ -21,7 +21,8 @@
     set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^
 
     _ Workaround for https://bugs.launchpad.net/ubuntu/+source/tar/+bug/2059734. Remove when fixed. ^
-    set osVersionBase to when(ARCH_VERSIONED = "arm32v7" && osVersionBase = "noble", "jammy", osVersionBase) ^
+    set isUbuntu to find(OS_ARCH_HYPHENATED, "Ubuntu") >= 0 ^
+    set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^
 
     set installerImageTag to when(isDistrolessAzureLinux,
         cat("mcr.microsoft.com/"
diff --git a/eng/dockerfile-templates/sdk/Dockerfile.envs b/eng/dockerfile-templates/sdk/Dockerfile.envs
index d730fe0e31..d57580f859 100644
--- a/eng/dockerfile-templates/sdk/Dockerfile.envs
+++ b/eng/dockerfile-templates/sdk/Dockerfile.envs
@@ -4,7 +4,10 @@
 
     set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
     set buildVersion to VARIABLES[cat("sdk|", dotnetVersion, "|build-version")] ^
-    set isStableBranding to find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^
+    set isStableBranding to
+        find(buildVersion, "alpha") < 0
+        && find(buildVersion, "preview") < 0
+        && find(buildVersion, "rc.") < 0 ^
 
     set sdkVersion to when(isStableBranding,
         VARIABLES[cat("sdk|", dotnetVersion, "|product-version")],
diff --git a/eng/dockerfile-templates/sdk/Dockerfile.linux b/eng/dockerfile-templates/sdk/Dockerfile.linux
index f3f338cc84..55c3475bc0 100644
--- a/eng/dockerfile-templates/sdk/Dockerfile.linux
+++ b/eng/dockerfile-templates/sdk/Dockerfile.linux
@@ -9,7 +9,8 @@
     set baseImageTag to cat("$REPO:", tagVersion, "-", OS_VERSION, ARCH_TAG_SUFFIX) ^
 
     _ Workaround for https://bugs.launchpad.net/ubuntu/+source/tar/+bug/2059734. Remove when fixed. ^
-    set osVersionBase to when(ARCH_VERSIONED = "arm32v7" && OS_VERSION_BASE = "noble", "jammy", OS_VERSION_BASE) ^
+    set isUbuntu to find(OS_ARCH_HYPHENATED, "Ubuntu") >= 0 ^
+    set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", OS_VERSION_BASE) ^
 
     set internalInstallerBase to when(isAlpine || isAzureLinux,
         baseImageTag,
diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
index 1adf2342ba..6b7bdf5b40 100644
--- a/eng/mcr-tags-metadata-templates/aspnet-tags.yml
+++ b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
@@ -5,9 +5,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)
@@ -15,9 +19,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)
@@ -30,9 +38,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 8e91480bf6..a3994b69bb 100644
--- a/eng/mcr-tags-metadata-templates/runtime-tags.yml
+++ b/eng/mcr-tags-metadata-templates/runtime-tags.yml
@@ -3,13 +3,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)
@@ -18,7 +22,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/eng/pipelines/stages/build-and-test.yml b/eng/pipelines/stages/build-and-test.yml
index 7a40b42d1d..5f7547ce73 100644
--- a/eng/pipelines/stages/build-and-test.yml
+++ b/eng/pipelines/stages/build-and-test.yml
@@ -45,8 +45,8 @@ stages:
   - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
     parameters:
       serviceConnections:
-      - name: ${{ parameters.publishConfig.internalMirrorAcr.serviceConnection.name }}
-      - name: ${{ parameters.publishConfig.buildAcr.serviceConnection.name }}
+      - name: ${{ parameters.publishConfig.InternalMirrorRegistry.serviceConnection.name }}
+      - name: ${{ parameters.publishConfig.BuildRegistry.serviceConnection.name }}
       - ${{ if parameters.storageAccountServiceConnection }}:
         - name: ${{ parameters.storageAccountServiceConnection.name }}
 
diff --git a/eng/pipelines/stages/build-test-publish-repo.yml b/eng/pipelines/stages/build-test-publish-repo.yml
index c53f34e24f..7e1d04893a 100644
--- a/eng/pipelines/stages/build-test-publish-repo.yml
+++ b/eng/pipelines/stages/build-test-publish-repo.yml
@@ -37,9 +37,9 @@ stages:
   - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
     parameters:
       serviceConnections:
-      - name: ${{ parameters.publishConfig.internalMirrorAcr.serviceConnection.name }}
-      - name: ${{ parameters.publishConfig.buildAcr.serviceConnection.name }}
-      - name: ${{ parameters.publishConfig.publishAcr.serviceConnection.name }}
+      - name: ${{ parameters.publishConfig.InternalMirrorRegistry.serviceConnection.name }}
+      - name: ${{ parameters.publishConfig.BuildRegistry.serviceConnection.name }}
+      - name: ${{ parameters.publishConfig.PublishRegistry.serviceConnection.name }}
       - ${{ each serviceConnection in parameters.additionalServiceConnections }}:
         - name: ${{ serviceConnection.name }}
 
diff --git a/eng/pipelines/stages/publish.yml b/eng/pipelines/stages/publish.yml
index c26aec8865..f4d20bb028 100644
--- a/eng/pipelines/stages/publish.yml
+++ b/eng/pipelines/stages/publish.yml
@@ -40,7 +40,7 @@ stages:
   - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self
     parameters:
       serviceConnections:
-      - name: ${{ parameters.publishConfig.publishAcr.serviceConnection.name }}
+      - name: ${{ parameters.publishConfig.PublishRegistry.serviceConnection.name }}
       - ${{ each serviceConnection in parameters.additionalServiceConnections }}:
         - name: ${{ serviceConnection.name }}
 
diff --git a/eng/pipelines/steps/set-custom-test-variables.yml b/eng/pipelines/steps/set-custom-test-variables.yml
index 9101ce6637..877726585d 100644
--- a/eng/pipelines/steps/set-custom-test-variables.yml
+++ b/eng/pipelines/steps/set-custom-test-variables.yml
@@ -14,7 +14,7 @@ steps:
     $testRunnerOptions="-e SYSTEM_TEAMPROJECT='$env:SYSTEM_TEAMPROJECT'"
     $testInit=""
 
-    if (("${{ parameters.publishConfig.publishAcr.repoPrefix }}".Contains("internal/")) -or $${{ parameters.isInternalServicingValidation }}) {
+    if (("${{ parameters.publishConfig.PublishRegistry.repoPrefix }}".Contains("internal/")) -or $${{ parameters.isInternalServicingValidation }}) {
       if ($Env:AGENT_OS -eq 'Linux') {
         $testRunnerOptions="$testRunnerOptions -e INTERNAL_TESTING='1' -e INTERNAL_ACCESS_TOKEN='$(System.AccessToken)'"
       }
diff --git a/eng/pipelines/variables/core-official.yml b/eng/pipelines/variables/core-official.yml
index d16638159c..8309eb8167 100644
--- a/eng/pipelines/variables/core-official.yml
+++ b/eng/pipelines/variables/core-official.yml
@@ -12,5 +12,7 @@ variables:
 - name: officialBranchPrefixes
   value: internal/release/
 
-- name: publishEolAnnotations
-  value: true
+# Temporarily disabled due to https://github.com/dotnet/docker-tools/issues/1905
+# Uncomment when the issue is resolved.
+# - name: publishEolAnnotations
+#   value: true
diff --git a/eng/readme-templates/FeaturedTags.md b/eng/readme-templates/FeaturedTags.md
index c16bb0abc6..114d6aaef3 100644
--- a/eng/readme-templates/FeaturedTags.md
+++ b/eng/readme-templates/FeaturedTags.md
@@ -24,7 +24,9 @@ elif match(REPO, "aspire-dashboard"):* `13`
   * `docker pull {{FULL_REPO}}:13`^
 elif match(REPO, "yarp"):* `2.3-preview`
   * `docker pull {{FULL_REPO}}:2.3-preview`^
-else:* `10.0` (Long-Term Support)
+else:{{if VARIABLES["branch"] = "nightly":* `11.0-preview` (Preview)
+  * `docker pull {{FULL_REPO}}:11.0-preview`
+}}* `10.0` (Long-Term Support)
   * `docker pull {{FULL_REPO}}:10.0`
 * `9.0` (Standard Support)
   * `docker pull {{FULL_REPO}}:9.0`
diff --git a/manifest.json b/manifest.json
index c36fabf4cf..4f591fb572 100644
--- a/manifest.json
+++ b/manifest.json
@@ -83,7 +83,6 @@
           "sharedTags": {
             "$(dotnet|8.0|fixed-tag)-alpine3.22": {},
             "$(dotnet|8.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|8.0|minor-tag)-alpine": {},
             "$(dotnet|8.0|fixed-tag)-alpine3.22-aot": {
               "docType": "Undocumented"
             },
@@ -100,7 +99,6 @@
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.22-amd64": {},
                 "$(dotnet|8.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine-amd64": {},
                 "$(dotnet|8.0|fixed-tag)-alpine3.22-aot-amd64": {
                   "docType": "Undocumented"
                 },
@@ -118,7 +116,6 @@
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.22-arm32v7": {},
                 "$(dotnet|8.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine-arm32v7": {},
                 "$(dotnet|8.0|fixed-tag)-alpine3.22-aot-arm32v7": {
                   "docType": "Undocumented"
                 },
@@ -137,7 +134,6 @@
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.22-arm64v8": {},
                 "$(dotnet|8.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine-arm64v8": {},
                 "$(dotnet|8.0|fixed-tag)-alpine3.22-aot-arm64v8": {
                   "docType": "Undocumented"
                 },
@@ -163,8 +159,7 @@
               "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": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.22-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
@@ -184,8 +179,7 @@
               "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": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.22-extra-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -206,8 +200,7 @@
               "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": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.22-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -232,7 +225,8 @@
             },
             "$(dotnet|8.0|minor-tag)-alpine3.23-aot": {
               "docType": "Undocumented"
-            }
+            },
+            "$(dotnet|8.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -248,6 +242,10 @@
                 },
                 "$(dotnet|8.0|minor-tag)-alpine3.23-aot-amd64": {
                   "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-alpine-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine-aot-amd64": {
+                  "docType": "Undocumented"
                 }
               }
             },
@@ -265,6 +263,10 @@
                 },
                 "$(dotnet|8.0|minor-tag)-alpine3.23-aot-arm32v7": {
                   "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-alpine-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine-aot-arm32v7": {
+                  "docType": "Undocumented"
                 }
               },
               "variant": "v7"
@@ -283,6 +285,10 @@
                 },
                 "$(dotnet|8.0|minor-tag)-alpine3.23-aot-arm64v8": {
                   "docType": "Undocumented"
+                },
+                "$(dotnet|8.0|minor-tag)-alpine-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine-aot-arm64v8": {
+                  "docType": "Undocumented"
                 }
               },
               "variant": "v8"
@@ -303,7 +309,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.23-extra-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-extra-amd64": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.23-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
@@ -323,7 +330,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.23-extra-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-extra-arm32v7": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.23-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine-extra-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -344,7 +352,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.23-extra-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-extra-arm64v8": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.23-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -1070,7 +1079,6 @@
           "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-aot": {
               "docType": "Undocumented"
             },
@@ -1087,7 +1095,6 @@
               "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-aot-amd64": {
                   "docType": "Undocumented"
                 },
@@ -1105,7 +1112,6 @@
               "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-aot-arm32v7": {
                   "docType": "Undocumented"
                 },
@@ -1124,7 +1130,6 @@
               "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-aot-arm64v8": {
                   "docType": "Undocumented"
                 },
@@ -1140,8 +1145,7 @@
           "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": {}
+            "$(dotnet|9.0|minor-tag)-alpine3.22-extra": {}
           },
           "platforms": [
             {
@@ -1151,8 +1155,7 @@
               "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": {}
+                "$(dotnet|9.0|minor-tag)-alpine3.22-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
@@ -1172,8 +1175,7 @@
               "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": {}
+                "$(dotnet|9.0|minor-tag)-alpine3.22-extra-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -1194,8 +1196,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(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": {}
+                "$(dotnet|9.0|minor-tag)-alpine3.22-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -1220,6 +1221,10 @@
             },
             "$(dotnet|9.0|minor-tag)-alpine3.23-aot": {
               "docType": "Undocumented"
+            },
+            "$(dotnet|9.0|minor-tag)-alpine": {},
+            "$(dotnet|9.0|minor-tag)-alpine-aot": {
+              "docType": "Undocumented"
             }
           },
           "platforms": [
@@ -1236,6 +1241,10 @@
                 },
                 "$(dotnet|9.0|minor-tag)-alpine3.23-aot-amd64": {
                   "docType": "Undocumented"
+                },
+                "$(dotnet|9.0|minor-tag)-alpine-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine-aot-amd64": {
+                  "docType": "Undocumented"
                 }
               }
             },
@@ -1253,6 +1262,10 @@
                 },
                 "$(dotnet|9.0|minor-tag)-alpine3.23-aot-arm32v7": {
                   "docType": "Undocumented"
+                },
+                "$(dotnet|9.0|minor-tag)-alpine-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine-aot-arm32v7": {
+                  "docType": "Undocumented"
                 }
               },
               "variant": "v7"
@@ -1271,6 +1284,10 @@
                 },
                 "$(dotnet|9.0|minor-tag)-alpine3.23-aot-arm64v8": {
                   "docType": "Undocumented"
+                },
+                "$(dotnet|9.0|minor-tag)-alpine-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine-aot-arm64v8": {
+                  "docType": "Undocumented"
                 }
               },
               "variant": "v8"
@@ -1281,7 +1298,8 @@
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
             "$(dotnet|9.0|fixed-tag)-alpine3.23-extra": {},
-            "$(dotnet|9.0|minor-tag)-alpine3.23-extra": {}
+            "$(dotnet|9.0|minor-tag)-alpine3.23-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine-extra": {}
           },
           "platforms": [
             {
@@ -1291,7 +1309,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|9.0|fixed-tag)-alpine3.23-extra-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-extra-amd64": {}
+                "$(dotnet|9.0|minor-tag)-alpine3.23-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
@@ -1311,7 +1330,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|9.0|fixed-tag)-alpine3.23-extra-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-extra-arm32v7": {}
+                "$(dotnet|9.0|minor-tag)-alpine3.23-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine-extra-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -1332,7 +1352,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|9.0|fixed-tag)-alpine3.23-extra-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-extra-arm64v8": {}
+                "$(dotnet|9.0|minor-tag)-alpine3.23-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -1723,8 +1744,7 @@
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
             "$(dotnet|10.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|10.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|10.0|minor-tag)-alpine": {}
+            "$(dotnet|10.0|minor-tag)-alpine3.22": {}
           },
           "platforms": [
             {
@@ -1734,8 +1754,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine-amd64": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.22-amd64": {}
               }
             },
             {
@@ -1746,8 +1765,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine-arm32v7": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.22-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -1759,8 +1777,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine-arm64v8": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.22-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -1770,8 +1787,7 @@
           "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": {}
+            "$(dotnet|10.0|minor-tag)-alpine3.22-extra": {}
           },
           "platforms": [
             {
@@ -1781,8 +1797,7 @@
               "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": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.22-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
@@ -1802,8 +1817,7 @@
               "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": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.22-extra-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -1824,8 +1838,7 @@
               "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": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.22-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -1844,7 +1857,8 @@
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
             "$(dotnet|10.0|fixed-tag)-alpine3.23": {},
-            "$(dotnet|10.0|minor-tag)-alpine3.23": {}
+            "$(dotnet|10.0|minor-tag)-alpine3.23": {},
+            "$(dotnet|10.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -1854,7 +1868,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-amd64": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.23-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -1865,7 +1880,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -1877,7 +1893,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -1887,7 +1904,8 @@
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
             "$(dotnet|10.0|fixed-tag)-alpine3.23-extra": {},
-            "$(dotnet|10.0|minor-tag)-alpine3.23-extra": {}
+            "$(dotnet|10.0|minor-tag)-alpine3.23-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine-extra": {}
           },
           "platforms": [
             {
@@ -1897,7 +1915,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.23-extra-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-amd64": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
@@ -1917,7 +1936,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.23-extra-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-arm32v7": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine-extra-arm32v7": {}
               },
               "variant": "v7",
               "customBuildLegGroups": [
@@ -1938,7 +1958,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.23-extra-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-arm64v8": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.23-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine-extra-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -2315,8 +2336,7 @@
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
             "$(dotnet|8.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|8.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|8.0|minor-tag)-alpine": {}
+            "$(dotnet|8.0|minor-tag)-alpine3.22": {}
           },
           "platforms": [
             {
@@ -2329,8 +2349,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine-amd64": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.22-amd64": {}
               }
             },
             {
@@ -2344,8 +2363,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine-arm32v7": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.22-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -2360,9 +2378,87 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine-arm64v8": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.22-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.22-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.22-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": {}
+              },
+              "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": {}
+              },
+              "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": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.22-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -2371,7 +2467,8 @@
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
             "$(dotnet|8.0|fixed-tag)-alpine3.23": {},
-            "$(dotnet|8.0|minor-tag)-alpine3.23": {}
+            "$(dotnet|8.0|minor-tag)-alpine3.23": {},
+            "$(dotnet|8.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -2384,7 +2481,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-amd64": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.23-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -2398,7 +2496,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -2413,8 +2512,92 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.23-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.23-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine-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": {},
+                "$(dotnet|8.0|minor-tag)-alpine-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": {},
+                "$(dotnet|8.0|minor-tag)-alpine-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": {},
+                "$(dotnet|8.0|minor-tag)-alpine-extra-arm64v8": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -3307,8 +3490,7 @@
           "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|minor-tag)-alpine3.22": {}
           },
           "platforms": [
             {
@@ -3321,8 +3503,7 @@
               "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|minor-tag)-alpine3.22-amd64": {}
               }
             },
             {
@@ -3336,8 +3517,7 @@
               "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|minor-tag)-alpine3.22-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -3352,8 +3532,7 @@
               "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|minor-tag)-alpine3.22-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -3362,35 +3541,117 @@
         {
           "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": {}
           },
           "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": {}
+              },
+              "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": {}
+              },
+              "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-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/alpine3.22-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.22-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-alpine3.23": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.23": {},
+            "$(dotnet|9.0|minor-tag)-alpine": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/alpine3.23/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine-amd64": {}
+              }
+            },
+            {
+              "architecture": "arm",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/alpine3.23/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -3405,8 +3666,92 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|9.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|9.0|minor-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|9.0|fixed-tag)-alpine3.23-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.23-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/9.0/alpine3.23-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/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": {},
+                "$(dotnet|9.0|minor-tag)-alpine-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": {},
+                "$(dotnet|9.0|minor-tag)-alpine-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": {},
+                "$(dotnet|9.0|minor-tag)-alpine-extra-arm64v8": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -3952,8 +4297,7 @@
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
             "$(dotnet|10.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|10.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|10.0|minor-tag)-alpine": {}
+            "$(dotnet|10.0|minor-tag)-alpine3.22": {}
           },
           "platforms": [
             {
@@ -3966,8 +4310,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine-amd64": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.22-amd64": {}
               }
             },
             {
@@ -3981,8 +4324,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine-arm32v7": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.22-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -3997,8 +4339,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine-arm64v8": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.22-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -4007,51 +4348,78 @@
         {
           "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": {}
           },
           "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": {}
+              },
+              "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": {}
               },
+              "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": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.22-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -4059,35 +4427,54 @@
         {
           "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": {},
+            "$(dotnet|10.0|minor-tag)-alpine": {}
           },
           "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": {},
+                "$(dotnet|10.0|minor-tag)-alpine-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": {},
+                "$(dotnet|10.0|minor-tag)-alpine-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": {},
+                "$(dotnet|10.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -4096,27 +4483,147 @@
         {
           "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": {},
+            "$(dotnet|10.0|minor-tag)-alpine-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": {},
+                "$(dotnet|10.0|minor-tag)-alpine-extra-amd64": {}
               },
               "customBuildLegGroups": [
                 {
-                  "name": "pr-build",
-                  "type": "Supplemental",
-                  "dependencies": [
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/runtime/10.0/alpine3.23-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/runtime/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": {},
+                "$(dotnet|10.0|minor-tag)-alpine-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": {},
+                "$(dotnet|10.0|minor-tag)-alpine-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "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"
                   ]
                 }
@@ -4535,8 +5042,7 @@
           "productVersion": "$(dotnet|8.0|product-version)",
           "sharedTags": {
             "$(dotnet|8.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|8.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|8.0|minor-tag)-alpine": {}
+            "$(dotnet|8.0|minor-tag)-alpine3.22": {}
           },
           "platforms": [
             {
@@ -4549,8 +5055,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine-amd64": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.22-amd64": {}
               }
             },
             {
@@ -4564,8 +5069,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine-arm32v7": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.22-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -4580,9 +5084,87 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine-arm64v8": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.22-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.22-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.22-extra": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "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-extra-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.22-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
               },
+              "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-extra-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-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)"
+              },
+              "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-extra-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.22-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.22-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -4643,11 +5225,95 @@
             }
           ]
         },
+        {
+          "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": {},
-            "$(dotnet|8.0|minor-tag)-alpine3.23": {}
+            "$(dotnet|8.0|minor-tag)-alpine3.23": {},
+            "$(dotnet|8.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -4660,7 +5326,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-amd64": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.23-amd64": {},
+                "$(dotnet|8.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -4674,7 +5341,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|8.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -4689,8 +5357,92 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|8.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|8.0|minor-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-alpine3.23-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine3.23-extra": {},
+            "$(dotnet|8.0|minor-tag)-alpine-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": {},
+                "$(dotnet|8.0|minor-tag)-alpine-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": {},
+                "$(dotnet|8.0|minor-tag)-alpine-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": {},
+                "$(dotnet|8.0|minor-tag)-alpine-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|8.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -4731,18 +5483,97 @@
               "variant": "v7"
             },
             {
-              "architecture": "arm64",
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "dockerfile": "src/aspnet/8.0/alpine3.23-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "os": "linux",
+              "osVersion": "alpine3.23",
+              "tags": {
+                "$(dotnet|8.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
+                "$(dotnet|8.0|minor-tag)-alpine3.23-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|8.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|8.0|fixed-tag)-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/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "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-arm64v8": {},
-                "$(dotnet|8.0|minor-tag)-alpine3.23-composite-arm64v8": {}
+                "$(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"
             }
           ]
@@ -6082,9 +6913,279 @@
               "os": "linux",
               "osVersion": "bookworm-slim",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-bookworm-slim-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-bookworm-slim-arm64v8": {}
+                "$(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": {}
+          },
+          "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": {}
+              }
+            },
+            {
+              "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": {}
+              },
+              "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": {}
+              },
+              "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": {}
+          },
+          "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": {}
+              },
+              "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": {}
+              },
+              "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/alpine3.22-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|9.0|fixed-tag)-alpine3.22-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|9.0|minor-tag)-alpine3.22-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "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": {}
+          },
+          "platforms": [
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "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-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-deps)"
+              },
+              "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-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-deps)"
+              },
+              "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-composite-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.22-composite-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine-composite-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|9.0|product-version)",
+          "sharedTags": {
+            "$(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-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-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"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "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-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"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "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-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"
             }
           ]
@@ -6092,8 +7193,8 @@
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|9.0|minor-tag)-alpine3.22": {},
+            "$(dotnet|9.0|fixed-tag)-alpine3.23": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.23": {},
             "$(dotnet|9.0|minor-tag)-alpine": {}
           },
           "platforms": [
@@ -6101,13 +7202,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22/amd64",
+              "dockerfile": "src/aspnet/9.0/alpine3.23/amd64",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-amd64": {},
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-amd64": {},
                 "$(dotnet|9.0|minor-tag)-alpine-amd64": {}
               }
             },
@@ -6116,13 +7217,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22/arm32v7",
+              "dockerfile": "src/aspnet/9.0/alpine3.23/arm32v7",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-arm32v7": {},
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-arm32v7": {},
                 "$(dotnet|9.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
@@ -6132,13 +7233,13 @@
               "buildArgs": {
                 "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22/arm64v8",
+              "dockerfile": "src/aspnet/9.0/alpine3.23/arm64v8",
               "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-arm64v8": {},
                 "$(dotnet|9.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
@@ -6148,55 +7249,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.23-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.23-extra": {},
+            "$(dotnet|9.0|minor-tag)-alpine-extra": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22-composite/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/9.0/alpine3.23-extra/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "alpine3.23",
               "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.23-extra-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-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.23-amd64"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22-composite/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/9.0/alpine3.23-extra/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "alpine3.23",
               "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.23-extra-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-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.23-arm32v7"
+                  ]
+                }
+              ],
+              "architecture": "arm",
               "variant": "v7"
             },
             {
-              "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime-deps)"
+                "REPO": "$(Repo:runtime)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.22-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/9.0/alpine3.23-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra",
               "os": "linux",
-              "osVersion": "alpine3.22",
+              "osVersion": "alpine3.23",
               "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.23-extra-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-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.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -6204,50 +7332,50 @@
         {
           "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.23-composite": {},
+            "$(dotnet|9.0|minor-tag)-alpine3.23-composite": {}
           },
           "platforms": [
             {
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.23/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/amd64",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-amd64": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-amd64": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-amd64": {}
               }
             },
             {
               "architecture": "arm",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.23/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/arm32v7",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-arm32v7": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-arm32v7": {}
               },
               "variant": "v7"
             },
             {
               "architecture": "arm64",
               "buildArgs": {
-                "REPO": "$(Repo:runtime)"
+                "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.23/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
               "os": "linux",
               "osVersion": "alpine3.23",
               "tags": {
-                "$(dotnet|9.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|9.0|fixed-tag)-alpine3.23-composite-arm64v8": {},
+                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -6256,51 +7384,78 @@
         {
           "productVersion": "$(dotnet|9.0|product-version)",
           "sharedTags": {
-            "$(dotnet|9.0|fixed-tag)-alpine3.23-composite": {},
-            "$(dotnet|9.0|minor-tag)-alpine3.23-composite": {}
+            "$(dotnet|9.0|fixed-tag)-alpine3.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/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "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-amd64": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-amd64": {}
-              }
+                "$(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"
+                  ]
+                }
+              ]
             },
             {
-              "architecture": "arm",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/arm32v7",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/9.0/alpine3.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-arm32v7": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-arm32v7": {}
+                "$(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"
             },
             {
-              "architecture": "arm64",
               "buildArgs": {
                 "REPO": "$(Repo:runtime-deps)"
               },
-              "dockerfile": "src/aspnet/9.0/alpine3.23-composite/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite",
+              "dockerfile": "src/aspnet/9.0/alpine3.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-arm64v8": {},
-                "$(dotnet|9.0|minor-tag)-alpine3.23-composite-arm64v8": {}
+                "$(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"
             }
           ]
@@ -7120,8 +8275,7 @@
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
             "$(dotnet|10.0|fixed-tag)-alpine3.22": {},
-            "$(dotnet|10.0|minor-tag)-alpine3.22": {},
-            "$(dotnet|10.0|minor-tag)-alpine": {}
+            "$(dotnet|10.0|minor-tag)-alpine3.22": {}
           },
           "platforms": [
             {
@@ -7134,8 +8288,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine-amd64": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.22-amd64": {}
               }
             },
             {
@@ -7149,25 +8302,102 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine-arm32v7": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.22-arm32v7": {}
+              },
+              "variant": "v7"
+            },
+            {
+              "architecture": "arm64",
+              "buildArgs": {
+                "REPO": "$(Repo:runtime)"
+              },
+              "dockerfile": "src/aspnet/10.0/alpine3.22/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "os": "linux",
+              "osVersion": "alpine3.22",
+              "tags": {
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-arm64v8": {}
+              },
+              "variant": "v8"
+            }
+          ]
+        },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(dotnet|10.0|fixed-tag)-alpine3.22-extra": {},
+            "$(dotnet|10.0|minor-tag)-alpine3.22-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": {}
+              },
+              "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": {}
               },
+              "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)"
               },
-              "dockerfile": "src/aspnet/10.0/alpine3.22/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux",
+              "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-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine-arm64v8": {}
+                "$(dotnet|10.0|fixed-tag)-alpine3.22-extra-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine3.22-extra-arm64v8": {}
               },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.22-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -7228,11 +8458,95 @@
             }
           ]
         },
+        {
+          "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": {}
+            "$(dotnet|10.0|minor-tag)-alpine3.23": {},
+            "$(dotnet|10.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -7245,7 +8559,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-amd64": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.23-amd64": {},
+                "$(dotnet|10.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -7259,7 +8574,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.23-arm32v7": {},
+                "$(dotnet|10.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -7274,8 +8590,92 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(dotnet|10.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(dotnet|10.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(dotnet|10.0|minor-tag)-alpine3.23-arm64v8": {},
+                "$(dotnet|10.0|minor-tag)-alpine-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": {},
+            "$(dotnet|10.0|minor-tag)-alpine-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": {},
+                "$(dotnet|10.0|minor-tag)-alpine-extra-amd64": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-amd64"
+                  ]
+                }
+              ]
+            },
+            {
+              "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": {},
+                "$(dotnet|10.0|minor-tag)-alpine-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)"
               },
+              "dockerfile": "src/aspnet/10.0/alpine3.23-extra/arm64v8",
+              "dockerfileTemplate": "eng/dockerfile-templates/aspnet/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": {},
+                "$(dotnet|10.0|minor-tag)-alpine-extra-arm64v8": {}
+              },
+              "customBuildLegGroups": [
+                {
+                  "name": "test-dependencies",
+                  "type": "Integral",
+                  "dependencies": [
+                    "$(Repo:sdk):$(sdk|10.0|minor-tag)-alpine3.23-arm64v8"
+                  ]
+                }
+              ],
+              "architecture": "arm64",
               "variant": "v8"
             }
           ]
@@ -7332,6 +8732,85 @@
             }
           ]
         },
+        {
+          "productVersion": "$(dotnet|10.0|product-version)",
+          "sharedTags": {
+            "$(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-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-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"
+                  ]
+                }
+              ]
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "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-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"
+            },
+            {
+              "buildArgs": {
+                "REPO": "$(Repo:runtime-deps)"
+              },
+              "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-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"
+            }
+          ]
+        },
         {
           "productVersion": "$(dotnet|10.0|product-version)",
           "sharedTags": {
@@ -8079,8 +9558,7 @@
           "productVersion": "$(sdk|8.0|product-version)",
           "sharedTags": {
             "$(sdk|8.0|fixed-tag)-alpine3.22": {},
-            "$(sdk|8.0|minor-tag)-alpine3.22": {},
-            "$(sdk|8.0|minor-tag)-alpine": {}
+            "$(sdk|8.0|minor-tag)-alpine3.22": {}
           },
           "platforms": [
             {
@@ -8093,8 +9571,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(sdk|8.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(sdk|8.0|minor-tag)-alpine3.22-amd64": {},
-                "$(sdk|8.0|minor-tag)-alpine-amd64": {}
+                "$(sdk|8.0|minor-tag)-alpine3.22-amd64": {}
               }
             },
             {
@@ -8108,8 +9585,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(sdk|8.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(sdk|8.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(sdk|8.0|minor-tag)-alpine-arm32v7": {}
+                "$(sdk|8.0|minor-tag)-alpine3.22-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -8124,8 +9600,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(sdk|8.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(sdk|8.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(sdk|8.0|minor-tag)-alpine-arm64v8": {}
+                "$(sdk|8.0|minor-tag)-alpine3.22-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -8135,7 +9610,8 @@
           "productVersion": "$(sdk|8.0|product-version)",
           "sharedTags": {
             "$(sdk|8.0|fixed-tag)-alpine3.23": {},
-            "$(sdk|8.0|minor-tag)-alpine3.23": {}
+            "$(sdk|8.0|minor-tag)-alpine3.23": {},
+            "$(sdk|8.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -8148,7 +9624,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|8.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(sdk|8.0|minor-tag)-alpine3.23-amd64": {}
+                "$(sdk|8.0|minor-tag)-alpine3.23-amd64": {},
+                "$(sdk|8.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -8162,7 +9639,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|8.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(sdk|8.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(sdk|8.0|minor-tag)-alpine3.23-arm32v7": {},
+                "$(sdk|8.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -8177,7 +9655,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|8.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(sdk|8.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(sdk|8.0|minor-tag)-alpine3.23-arm64v8": {},
+                "$(sdk|8.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -8533,8 +10012,7 @@
           "productVersion": "$(sdk|9.0|product-version)",
           "sharedTags": {
             "$(sdk|9.0|fixed-tag)-alpine3.22": {},
-            "$(sdk|9.0|minor-tag)-alpine3.22": {},
-            "$(sdk|9.0|minor-tag)-alpine": {}
+            "$(sdk|9.0|minor-tag)-alpine3.22": {}
           },
           "platforms": [
             {
@@ -8547,8 +10025,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(sdk|9.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(sdk|9.0|minor-tag)-alpine3.22-amd64": {},
-                "$(sdk|9.0|minor-tag)-alpine-amd64": {}
+                "$(sdk|9.0|minor-tag)-alpine3.22-amd64": {}
               }
             },
             {
@@ -8562,8 +10039,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(sdk|9.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(sdk|9.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(sdk|9.0|minor-tag)-alpine-arm32v7": {}
+                "$(sdk|9.0|minor-tag)-alpine3.22-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -8578,8 +10054,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(sdk|9.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(sdk|9.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(sdk|9.0|minor-tag)-alpine-arm64v8": {}
+                "$(sdk|9.0|minor-tag)-alpine3.22-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -8589,7 +10064,8 @@
           "productVersion": "$(sdk|9.0|product-version)",
           "sharedTags": {
             "$(sdk|9.0|fixed-tag)-alpine3.23": {},
-            "$(sdk|9.0|minor-tag)-alpine3.23": {}
+            "$(sdk|9.0|minor-tag)-alpine3.23": {},
+            "$(sdk|9.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -8602,7 +10078,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|9.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(sdk|9.0|minor-tag)-alpine3.23-amd64": {}
+                "$(sdk|9.0|minor-tag)-alpine3.23-amd64": {},
+                "$(sdk|9.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -8616,7 +10093,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|9.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(sdk|9.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(sdk|9.0|minor-tag)-alpine3.23-arm32v7": {},
+                "$(sdk|9.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -8631,7 +10109,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|9.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(sdk|9.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(sdk|9.0|minor-tag)-alpine3.23-arm64v8": {},
+                "$(sdk|9.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -8932,8 +10411,7 @@
           "productVersion": "$(sdk|10.0|product-version)",
           "sharedTags": {
             "$(sdk|10.0|fixed-tag)-alpine3.22": {},
-            "$(sdk|10.0|minor-tag)-alpine3.22": {},
-            "$(sdk|10.0|minor-tag)-alpine": {}
+            "$(sdk|10.0|minor-tag)-alpine3.22": {}
           },
           "platforms": [
             {
@@ -8946,8 +10424,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(sdk|10.0|fixed-tag)-alpine3.22-amd64": {},
-                "$(sdk|10.0|minor-tag)-alpine3.22-amd64": {},
-                "$(sdk|10.0|minor-tag)-alpine-amd64": {}
+                "$(sdk|10.0|minor-tag)-alpine3.22-amd64": {}
               }
             },
             {
@@ -8961,8 +10438,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(sdk|10.0|fixed-tag)-alpine3.22-arm32v7": {},
-                "$(sdk|10.0|minor-tag)-alpine3.22-arm32v7": {},
-                "$(sdk|10.0|minor-tag)-alpine-arm32v7": {}
+                "$(sdk|10.0|minor-tag)-alpine3.22-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -8977,8 +10453,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(sdk|10.0|fixed-tag)-alpine3.22-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-alpine3.22-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-alpine-arm64v8": {}
+                "$(sdk|10.0|minor-tag)-alpine3.22-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -8988,8 +10463,7 @@
           "productVersion": "$(sdk|10.0|product-version)",
           "sharedTags": {
             "$(sdk|10.0|fixed-tag)-alpine3.22-aot": {},
-            "$(sdk|10.0|minor-tag)-alpine3.22-aot": {},
-            "$(sdk|10.0|minor-tag)-alpine-aot": {}
+            "$(sdk|10.0|minor-tag)-alpine3.22-aot": {}
           },
           "platforms": [
             {
@@ -9002,8 +10476,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(sdk|10.0|fixed-tag)-alpine3.22-aot-amd64": {},
-                "$(sdk|10.0|minor-tag)-alpine3.22-aot-amd64": {},
-                "$(sdk|10.0|minor-tag)-alpine-aot-amd64": {}
+                "$(sdk|10.0|minor-tag)-alpine3.22-aot-amd64": {}
               },
               "customBuildLegGroups": [
                 {
@@ -9026,8 +10499,7 @@
               "osVersion": "alpine3.22",
               "tags": {
                 "$(sdk|10.0|fixed-tag)-alpine3.22-aot-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-alpine3.22-aot-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-alpine-aot-arm64v8": {}
+                "$(sdk|10.0|minor-tag)-alpine3.22-aot-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
@@ -9046,7 +10518,8 @@
           "productVersion": "$(sdk|10.0|product-version)",
           "sharedTags": {
             "$(sdk|10.0|fixed-tag)-alpine3.23": {},
-            "$(sdk|10.0|minor-tag)-alpine3.23": {}
+            "$(sdk|10.0|minor-tag)-alpine3.23": {},
+            "$(sdk|10.0|minor-tag)-alpine": {}
           },
           "platforms": [
             {
@@ -9059,7 +10532,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|10.0|fixed-tag)-alpine3.23-amd64": {},
-                "$(sdk|10.0|minor-tag)-alpine3.23-amd64": {}
+                "$(sdk|10.0|minor-tag)-alpine3.23-amd64": {},
+                "$(sdk|10.0|minor-tag)-alpine-amd64": {}
               }
             },
             {
@@ -9073,7 +10547,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|10.0|fixed-tag)-alpine3.23-arm32v7": {},
-                "$(sdk|10.0|minor-tag)-alpine3.23-arm32v7": {}
+                "$(sdk|10.0|minor-tag)-alpine3.23-arm32v7": {},
+                "$(sdk|10.0|minor-tag)-alpine-arm32v7": {}
               },
               "variant": "v7"
             },
@@ -9088,7 +10563,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|10.0|fixed-tag)-alpine3.23-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-alpine3.23-arm64v8": {}
+                "$(sdk|10.0|minor-tag)-alpine3.23-arm64v8": {},
+                "$(sdk|10.0|minor-tag)-alpine-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -9098,7 +10574,8 @@
           "productVersion": "$(sdk|10.0|product-version)",
           "sharedTags": {
             "$(sdk|10.0|fixed-tag)-alpine3.23-aot": {},
-            "$(sdk|10.0|minor-tag)-alpine3.23-aot": {}
+            "$(sdk|10.0|minor-tag)-alpine3.23-aot": {},
+            "$(sdk|10.0|minor-tag)-alpine-aot": {}
           },
           "platforms": [
             {
@@ -9111,7 +10588,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|10.0|fixed-tag)-alpine3.23-aot-amd64": {},
-                "$(sdk|10.0|minor-tag)-alpine3.23-aot-amd64": {}
+                "$(sdk|10.0|minor-tag)-alpine3.23-aot-amd64": {},
+                "$(sdk|10.0|minor-tag)-alpine-aot-amd64": {}
               },
               "customBuildLegGroups": [
                 {
@@ -9134,7 +10612,8 @@
               "osVersion": "alpine3.23",
               "tags": {
                 "$(sdk|10.0|fixed-tag)-alpine3.23-aot-arm64v8": {},
-                "$(sdk|10.0|minor-tag)-alpine3.23-aot-arm64v8": {}
+                "$(sdk|10.0|minor-tag)-alpine3.23-aot-arm64v8": {},
+                "$(sdk|10.0|minor-tag)-alpine-aot-arm64v8": {}
               },
               "variant": "v8",
               "customBuildLegGroups": [
diff --git a/manifest.versions.json b/manifest.versions.json
index b204a9c811..410e437a95 100644
--- a/manifest.versions.json
+++ b/manifest.versions.json
@@ -6,10 +6,13 @@
     "base-url|public|maintenance|nightly": "https://builds.dotnet.microsoft.com/dotnet",
     "base-url|public|preview|main": "https://builds.dotnet.microsoft.com/dotnet",
     "base-url|public|preview|nightly": "https://ci.dot.net/public",
-    "base-url|public-checksums|main": "https://builds.dotnet.microsoft.com/dotnet",
-    "base-url|public-checksums|nightly": "https://ci.dot.net/public-checksums",
 
-    "alpine|floating-tag-version": "alpine3.22",
+    "base-url|public-checksums|maintenance|main": "https://builds.dotnet.microsoft.com/dotnet",
+    "base-url|public-checksums|maintenance|nightly": "https://builds.dotnet.microsoft.com/dotnet",
+    "base-url|public-checksums|preview|main": "https://builds.dotnet.microsoft.com/dotnet",
+    "base-url|public-checksums|preview|nightly": "https://ci.dot.net/public-checksums",
+
+    "alpine|floating-tag-version": "alpine3.23",
     "alpine|10.0|floating-tag-version": "$(alpine|floating-tag-version)",
     "alpine|9.0|floating-tag-version": "$(alpine|floating-tag-version)",
     "alpine|8.0|floating-tag-version": "$(alpine|floating-tag-version)",
@@ -24,13 +27,13 @@
     "aspire-dashboard|base-url|main": "$(base-url|public|preview|nightly)",
     "aspire-dashboard|base-url|nightly": "$(base-url|public|preview|nightly)",
 
-    "aspnet|8.0|build-version": "8.0.22",
+    "aspnet|8.0|build-version": "8.0.23",
     "aspnet-composite|8.0|build-version": "$(aspnet|8.0|build-version)",
 
-    "aspnet|10.0|build-version": "10.0.1",
+    "aspnet|10.0|build-version": "10.0.2",
     "aspnet-composite|10.0|build-version": "$(aspnet|10.0|build-version)",
 
-    "aspnet|9.0|build-version": "9.0.11",
+    "aspnet|9.0|build-version": "9.0.12",
     "aspnet-composite|9.0|build-version": "$(aspnet|9.0|build-version)",
 
     "chisel|latest|build-version": "v1.3.0",
@@ -60,7 +63,7 @@
     "chisel|8.0|arm|sha384": "$(chisel|latest|arm|sha384)",
     "chisel|8.0|arm64|sha384": "$(chisel|latest|arm64|sha384)",
 
-    "dotnet|8.0|product-version": "8.0.22",
+    "dotnet|8.0|product-version": "8.0.23",
     "dotnet|8.0|fixed-tag": "$(dotnet|8.0|product-version)",
     "dotnet|8.0|minor-tag": "8.0",
     "dotnet|8.0|base-url|main": "$(base-url|public|maintenance|main)",
@@ -69,7 +72,7 @@
     "dotnet|8.0|base-url|checksums|nightly": "$(dotnet|8.0|base-url|nightly)",
     "dotnet|8.0|aggregate-checksums": "/checksums/$(dotnet|8.0|product-version)-sha.txt",
 
-    "dotnet|9.0|product-version": "9.0.11",
+    "dotnet|9.0|product-version": "9.0.12",
     "dotnet|9.0|fixed-tag": "$(dotnet|9.0|product-version)",
     "dotnet|9.0|minor-tag": "9.0",
     "dotnet|9.0|base-url|main": "$(base-url|public|maintenance|main)",
@@ -78,7 +81,7 @@
     "dotnet|9.0|base-url|checksums|nightly": "$(dotnet|9.0|base-url|nightly)",
     "dotnet|9.0|aggregate-checksums": "/checksums/$(dotnet|9.0|product-version)-sha.txt",
 
-    "dotnet|10.0|product-version": "10.0.1",
+    "dotnet|10.0|product-version": "10.0.2",
     "dotnet|10.0|fixed-tag": "$(dotnet|10.0|product-version)",
     "dotnet|10.0|minor-tag": "10.0",
     "dotnet|10.0|base-url|main": "$(base-url|public|maintenance|main)",
@@ -91,6 +94,7 @@
     "libicu|focal": 66,
     "libicu|jammy": 70,
     "libicu|noble": 74,
+    "libicu|resolute": 76,
 
     "libssl|alpine3.22": "3",
     "libssl|alpine3.23": "3",
@@ -99,6 +103,7 @@
     "libssl|focal": "1.1",
     "libssl|jammy": "3",
     "libssl|noble": "3t64",
+    "libssl|resolute": "3t64",
 
     "mingit|latest|x64|url": "https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip",
     "mingit|latest|x64|sha": "f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2",
@@ -145,8 +150,8 @@
     "monitor|10.0|minor-tag": "10.0",
     "monitor|10.0|base-url|main": "$(base-url|public|maintenance|main)",
     "monitor|10.0|base-url|nightly": "$(base-url|public|maintenance|nightly)",
-    "monitor|10.0|base-url|checksums|main": "$(base-url|public-checksums|main)",
-    "monitor|10.0|base-url|checksums|nightly": "$(base-url|public-checksums|nightly)",
+    "monitor|10.0|base-url|checksums|main": "$(base-url|public-checksums|maintenance|main)",
+    "monitor|10.0|base-url|checksums|nightly": "$(base-url|public-checksums|maintenance|nightly)",
 
     "powershell|8.0|build-version": "7.4.13",
     "powershell|8.0|Linux.Alpine|sha": "aad1256a8a29ae6646408a6bba00459745e4d676a4643541d55340fca0f311caecaa1f7a3490d49812d255d253d94ae06ba8134a5e5a304504decab556f58031",
@@ -179,12 +184,12 @@
     "rocks-toolbox|9.0|version": "$(rocks-toolbox|latest|version)",
     "rocks-toolbox|10.0|version": "$(rocks-toolbox|latest|version)",
 
-    "runtime|8.0|build-version": "8.0.22",
-    "runtime|9.0|build-version": "9.0.11",
-    "runtime|10.0|build-version": "10.0.1",
+    "runtime|8.0|build-version": "8.0.23",
+    "runtime|9.0|build-version": "9.0.12",
+    "runtime|10.0|build-version": "10.0.2",
 
-    "sdk|8.0|build-version": "8.0.416",
-    "sdk|8.0|product-version": "8.0.416",
+    "sdk|8.0|build-version": "8.0.417",
+    "sdk|8.0|product-version": "8.0.417",
     "sdk|8.0|base-url|main": "$(dotnet|8.0|base-url|main)",
     "sdk|8.0|base-url|nightly": "$(dotnet|8.0|base-url|nightly)",
     "sdk|8.0|base-url|checksums|main": "$(sdk|8.0|base-url|main)",
@@ -192,8 +197,8 @@
     "sdk|8.0|fixed-tag": "$(sdk|8.0|product-version)",
     "sdk|8.0|minor-tag": "$(dotnet|8.0|minor-tag)",
 
-    "sdk|9.0|build-version": "9.0.308",
-    "sdk|9.0|product-version": "9.0.308",
+    "sdk|9.0|build-version": "9.0.309",
+    "sdk|9.0|product-version": "9.0.309",
     "sdk|9.0|base-url|main": "$(dotnet|9.0|base-url|main)",
     "sdk|9.0|base-url|nightly": "$(dotnet|9.0|base-url|nightly)",
     "sdk|9.0|base-url|checksums|main": "$(sdk|9.0|base-url|main)",
@@ -201,8 +206,8 @@
     "sdk|9.0|fixed-tag": "$(sdk|9.0|product-version)",
     "sdk|9.0|minor-tag": "$(dotnet|9.0|minor-tag)",
 
-    "sdk|10.0|build-version": "10.0.101",
-    "sdk|10.0|product-version": "10.0.101",
+    "sdk|10.0|build-version": "10.0.102",
+    "sdk|10.0|product-version": "10.0.102",
     "sdk|10.0|base-url|main": "$(dotnet|10.0|base-url|main)",
     "sdk|10.0|base-url|nightly": "$(dotnet|10.0|base-url|nightly)",
     "sdk|10.0|base-url|checksums|main": "$(dotnet|10.0|base-url|checksums|main)",
@@ -211,7 +216,7 @@
     "sdk|10.0|minor-tag": "$(dotnet|10.0|minor-tag)",
 
     "syft|repo": "anchore/syft",
-    "syft|version": "v1.38.0",
+    "syft|version": "v1.40.0",
     "syft|tag": "$(syft|version)-debug"
   }
 }
diff --git a/src/aspire-dashboard/amd64/Dockerfile b/src/aspire-dashboard/amd64/Dockerfile
index 67c43d7562..8669326d46 100644
--- a/src/aspire-dashboard/amd64/Dockerfile
+++ b/src/aspire-dashboard/amd64/Dockerfile
@@ -19,7 +19,7 @@ RUN dotnet_aspire_version=13.1.0-preview.1.25616.3 \
 
 
 # Aspire Dashboard image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-extra-amd64
+FROM $REPO:8.0.23-azurelinux3.0-distroless-extra-amd64
 
 WORKDIR /app
 COPY --from=installer /app .
diff --git a/src/aspire-dashboard/arm64v8/Dockerfile b/src/aspire-dashboard/arm64v8/Dockerfile
index 8772fddd9e..3de44464ae 100644
--- a/src/aspire-dashboard/arm64v8/Dockerfile
+++ b/src/aspire-dashboard/arm64v8/Dockerfile
@@ -19,7 +19,7 @@ RUN dotnet_aspire_version=13.1.0-preview.1.25616.3 \
 
 
 # Aspire Dashboard image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-extra-arm64v8
+FROM $REPO:8.0.23-azurelinux3.0-distroless-extra-arm64v8
 
 WORKDIR /app
 COPY --from=installer /app .
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..bd7ce2bccf
--- /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.2-alpine3.22-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.2 \
+    && 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.2-alpine3.22-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.2 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.2
+
+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..9ce1347a81
--- /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.2-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.2 \
+    && 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.2-alpine3.22-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.2 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.2
+
+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..3e7b14e10d
--- /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.2-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.2 \
+    && 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.2-alpine3.22-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.2 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.2
+
+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/amd64/Dockerfile b/src/aspnet/10.0/alpine3.22-composite/amd64/Dockerfile
index 46ce29bb9a..644c8a7d44 100644
--- a/src/aspnet/10.0/alpine3.22-composite/amd64/Dockerfile
+++ b/src/aspnet/10.0/alpine3.22-composite/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.22-amd64 AS installer
+FROM $REPO:10.0.2-alpine3.22-amd64 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-alpine3.22-amd64
+FROM $REPO:10.0.2-alpine3.22-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 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/arm32v7/Dockerfile b/src/aspnet/10.0/alpine3.22-composite/arm32v7/Dockerfile
index 459459bf6c..42f318cd75 100644
--- a/src/aspnet/10.0/alpine3.22-composite/arm32v7/Dockerfile
+++ b/src/aspnet/10.0/alpine3.22-composite/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.22-arm32v7 AS installer
+FROM $REPO:10.0.2-alpine3.22-arm32v7 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-alpine3.22-arm32v7
+FROM $REPO:10.0.2-alpine3.22-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 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/arm64v8/Dockerfile b/src/aspnet/10.0/alpine3.22-composite/arm64v8/Dockerfile
index e9b6473b30..27a3f7e2a2 100644
--- a/src/aspnet/10.0/alpine3.22-composite/arm64v8/Dockerfile
+++ b/src/aspnet/10.0/alpine3.22-composite/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.22-arm64v8 AS installer
+FROM $REPO:10.0.2-alpine3.22-arm64v8 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-alpine3.22-arm64v8
+FROM $REPO:10.0.2-alpine3.22-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 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..157df17afb
--- /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.2-alpine3.22-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.2 \
+    && 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.2-alpine3.22-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.2
+
+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..35f3af2f99
--- /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.2-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.2 \
+    && 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.2-alpine3.22-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.2
+
+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..6b70bfb5fa
--- /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.2-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.2 \
+    && 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.2-alpine3.22-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.2
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.22/amd64/Dockerfile b/src/aspnet/10.0/alpine3.22/amd64/Dockerfile
index f16480be43..bf2661aeb8 100644
--- a/src/aspnet/10.0/alpine3.22/amd64/Dockerfile
+++ b/src/aspnet/10.0/alpine3.22/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.22-amd64 AS installer
+FROM $REPO:10.0.2-alpine3.22-amd64 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-alpine3.22-amd64
+FROM $REPO:10.0.2-alpine3.22-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.22/arm32v7/Dockerfile b/src/aspnet/10.0/alpine3.22/arm32v7/Dockerfile
index ec17f2670a..17bf9e639b 100644
--- a/src/aspnet/10.0/alpine3.22/arm32v7/Dockerfile
+++ b/src/aspnet/10.0/alpine3.22/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.22-arm32v7 AS installer
+FROM $REPO:10.0.2-alpine3.22-arm32v7 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-alpine3.22-arm32v7
+FROM $REPO:10.0.2-alpine3.22-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.22/arm64v8/Dockerfile b/src/aspnet/10.0/alpine3.22/arm64v8/Dockerfile
index a0fb61e93a..d9fad766fa 100644
--- a/src/aspnet/10.0/alpine3.22/arm64v8/Dockerfile
+++ b/src/aspnet/10.0/alpine3.22/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.22-arm64v8 AS installer
+FROM $REPO:10.0.2-alpine3.22-arm64v8 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-alpine3.22-arm64v8
+FROM $REPO:10.0.2-alpine3.22-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 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..ddb43ab757
--- /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.2-alpine3.23-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.2 \
+    && 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.2-alpine3.23-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.2 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.2
+
+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..5ae69e5cde
--- /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.2-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.2 \
+    && 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.2-alpine3.23-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.2 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.2
+
+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..a530bbf6b8
--- /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.2-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=10.0.2 \
+    && 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.2-alpine3.23-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=10.0.2 \
+    # ASP.NET Core version
+    ASPNET_VERSION=10.0.2
+
+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/amd64/Dockerfile b/src/aspnet/10.0/alpine3.23-composite/amd64/Dockerfile
index f8c4243cc1..e379c5d56a 100644
--- a/src/aspnet/10.0/alpine3.23-composite/amd64/Dockerfile
+++ b/src/aspnet/10.0/alpine3.23-composite/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.23-amd64 AS installer
+FROM $REPO:10.0.2-alpine3.23-amd64 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-alpine3.23-amd64
+FROM $REPO:10.0.2-alpine3.23-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 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/arm32v7/Dockerfile b/src/aspnet/10.0/alpine3.23-composite/arm32v7/Dockerfile
index bf2bf2158c..bf69cf9dfa 100644
--- a/src/aspnet/10.0/alpine3.23-composite/arm32v7/Dockerfile
+++ b/src/aspnet/10.0/alpine3.23-composite/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.23-arm32v7 AS installer
+FROM $REPO:10.0.2-alpine3.23-arm32v7 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-alpine3.23-arm32v7
+FROM $REPO:10.0.2-alpine3.23-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 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/arm64v8/Dockerfile b/src/aspnet/10.0/alpine3.23-composite/arm64v8/Dockerfile
index 89ffefe55f..5d56da1cc5 100644
--- a/src/aspnet/10.0/alpine3.23-composite/arm64v8/Dockerfile
+++ b/src/aspnet/10.0/alpine3.23-composite/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.23-arm64v8 AS installer
+FROM $REPO:10.0.2-alpine3.23-arm64v8 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-alpine3.23-arm64v8
+FROM $REPO:10.0.2-alpine3.23-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 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..e6ba3a23f8
--- /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.2-alpine3.23-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.2 \
+    && 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.2-alpine3.23-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.2
+
+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..e7fdf82eee
--- /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.2-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.2 \
+    && 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.2-alpine3.23-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.2
+
+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..cbf96ce974
--- /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.2-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=10.0.2 \
+    && 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.2-alpine3.23-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=10.0.2
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.23/amd64/Dockerfile b/src/aspnet/10.0/alpine3.23/amd64/Dockerfile
index cbc738123c..a8ac647614 100644
--- a/src/aspnet/10.0/alpine3.23/amd64/Dockerfile
+++ b/src/aspnet/10.0/alpine3.23/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.23-amd64 AS installer
+FROM $REPO:10.0.2-alpine3.23-amd64 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-alpine3.23-amd64
+FROM $REPO:10.0.2-alpine3.23-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.23/arm32v7/Dockerfile b/src/aspnet/10.0/alpine3.23/arm32v7/Dockerfile
index d7282aaadd..d461732139 100644
--- a/src/aspnet/10.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/aspnet/10.0/alpine3.23/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.23-arm32v7 AS installer
+FROM $REPO:10.0.2-alpine3.23-arm32v7 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-alpine3.23-arm32v7
+FROM $REPO:10.0.2-alpine3.23-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/alpine3.23/arm64v8/Dockerfile b/src/aspnet/10.0/alpine3.23/arm64v8/Dockerfile
index ca4c93aeae..9134fbefca 100644
--- a/src/aspnet/10.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/aspnet/10.0/alpine3.23/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.23-arm64v8 AS installer
+FROM $REPO:10.0.2-alpine3.23-arm64v8 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-alpine3.23-arm64v8
+FROM $REPO:10.0.2-alpine3.23-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
index 48a6684df1..0aebd6950a 100644
--- a/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
@@ -26,13 +26,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-azurelinux3.0-distroless-extra-amd64
+FROM $REPO:10.0.2-azurelinux3.0-distroless-extra-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
index 65b27dbfdc..579f32660b 100644
--- a/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
@@ -26,13 +26,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-azurelinux3.0-distroless-extra-arm64v8
+FROM $REPO:10.0.2-azurelinux3.0-distroless-extra-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
index 6cf83c217e..18f506ff52 100644
--- a/src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
+++ b/src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
@@ -26,13 +26,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-azurelinux3.0-distroless-amd64
+FROM $REPO:10.0.2-azurelinux3.0-distroless-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
index 26bef49941..5c13e24c77 100644
--- a/src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
+++ b/src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
@@ -26,13 +26,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-azurelinux3.0-distroless-arm64v8
+FROM $REPO:10.0.2-azurelinux3.0-distroless-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
index 56cf858064..530aa1c4b7 100644
--- a/src/aspnet/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
+++ b/src/aspnet/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
@@ -23,9 +23,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-azurelinux3.0-distroless-extra-amd64
+FROM $REPO:10.0.2-azurelinux3.0-distroless-extra-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
index 5832459714..ad90000479 100644
--- a/src/aspnet/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
+++ b/src/aspnet/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
@@ -23,9 +23,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-azurelinux3.0-distroless-extra-arm64v8
+FROM $REPO:10.0.2-azurelinux3.0-distroless-extra-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless/amd64/Dockerfile
index 8db560bf56..af8874cf32 100644
--- a/src/aspnet/10.0/azurelinux3.0-distroless/amd64/Dockerfile
+++ b/src/aspnet/10.0/azurelinux3.0-distroless/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
@@ -23,9 +23,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-azurelinux3.0-distroless-amd64
+FROM $REPO:10.0.2-azurelinux3.0-distroless-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile
index d3326a796e..c6b9aa5c7c 100644
--- a/src/aspnet/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile
+++ b/src/aspnet/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
@@ -23,9 +23,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-azurelinux3.0-distroless-arm64v8
+FROM $REPO:10.0.2-azurelinux3.0-distroless-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/azurelinux3.0/amd64/Dockerfile b/src/aspnet/10.0/azurelinux3.0/amd64/Dockerfile
index bf44318bf1..5c0ebc4b05 100644
--- a/src/aspnet/10.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/aspnet/10.0/azurelinux3.0/amd64/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:10.0.1-azurelinux3.0-amd64 AS installer
+FROM $REPO:10.0.2-azurelinux3.0-amd64 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
@@ -21,9 +21,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-azurelinux3.0-amd64
+FROM $REPO:10.0.2-azurelinux3.0-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/azurelinux3.0/arm64v8/Dockerfile b/src/aspnet/10.0/azurelinux3.0/arm64v8/Dockerfile
index 7f911a3756..c32630bfd4 100644
--- a/src/aspnet/10.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/aspnet/10.0/azurelinux3.0/arm64v8/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:10.0.1-azurelinux3.0-arm64v8 AS installer
+FROM $REPO:10.0.2-azurelinux3.0-arm64v8 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
@@ -21,9 +21,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-azurelinux3.0-arm64v8
+FROM $REPO:10.0.2-azurelinux3.0-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile
index e530e8254b..5271cde17d 100644
--- a/src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile
+++ b/src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '10.0.1'; `
+        $aspnetcore_version = '10.0.2'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512-bare'; `
         `
@@ -30,9 +30,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-nanoserver-ltsc2022
+FROM $REPO:10.0.2-nanoserver-ltsc2022
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile
index 9aca151c0d..427fe69836 100644
--- a/src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '10.0.1'; `
+        $aspnetcore_version = '10.0.2'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512-bare'; `
         `
@@ -30,9 +30,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-nanoserver-ltsc2025
+FROM $REPO:10.0.2-nanoserver-ltsc2025
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/10.0/noble-chiseled-composite-extra/amd64/Dockerfile b/src/aspnet/10.0/noble-chiseled-composite-extra/amd64/Dockerfile
index 9ece505e75..670cee62f4 100644
--- a/src/aspnet/10.0/noble-chiseled-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/10.0/noble-chiseled-composite-extra/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
@@ -20,13 +20,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-noble-chiseled-extra-amd64
+FROM $REPO:10.0.2-noble-chiseled-extra-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/10.0/noble-chiseled-composite-extra/arm32v7/Dockerfile b/src/aspnet/10.0/noble-chiseled-composite-extra/arm32v7/Dockerfile
index cd310100de..d326ca93f0 100644
--- a/src/aspnet/10.0/noble-chiseled-composite-extra/arm32v7/Dockerfile
+++ b/src/aspnet/10.0/noble-chiseled-composite-extra/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
@@ -20,13 +20,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-noble-chiseled-extra-arm32v7
+FROM $REPO:10.0.2-noble-chiseled-extra-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/10.0/noble-chiseled-composite-extra/arm64v8/Dockerfile b/src/aspnet/10.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
index 8adcf87424..460c9c7e47 100644
--- a/src/aspnet/10.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/10.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
@@ -20,13 +20,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-noble-chiseled-extra-arm64v8
+FROM $REPO:10.0.2-noble-chiseled-extra-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/10.0/noble-chiseled-composite/amd64/Dockerfile b/src/aspnet/10.0/noble-chiseled-composite/amd64/Dockerfile
index 988320c141..f77b7b3ce7 100644
--- a/src/aspnet/10.0/noble-chiseled-composite/amd64/Dockerfile
+++ b/src/aspnet/10.0/noble-chiseled-composite/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
@@ -20,13 +20,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-noble-chiseled-amd64
+FROM $REPO:10.0.2-noble-chiseled-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/10.0/noble-chiseled-composite/arm32v7/Dockerfile b/src/aspnet/10.0/noble-chiseled-composite/arm32v7/Dockerfile
index 3adb363129..1679068bb5 100644
--- a/src/aspnet/10.0/noble-chiseled-composite/arm32v7/Dockerfile
+++ b/src/aspnet/10.0/noble-chiseled-composite/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \
@@ -20,13 +20,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-noble-chiseled-arm32v7
+FROM $REPO:10.0.2-noble-chiseled-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/10.0/noble-chiseled-composite/arm64v8/Dockerfile b/src/aspnet/10.0/noble-chiseled-composite/arm64v8/Dockerfile
index a3c13af3c1..5eda253e9f 100644
--- a/src/aspnet/10.0/noble-chiseled-composite/arm64v8/Dockerfile
+++ b/src/aspnet/10.0/noble-chiseled-composite/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
@@ -20,13 +20,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:10.0.1-noble-chiseled-arm64v8
+FROM $REPO:10.0.2-noble-chiseled-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1 \
+    DOTNET_VERSION=10.0.2 \
     # ASP.NET Core version
-    ASPNET_VERSION=10.0.1
+    ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile b/src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile
index 586042c832..32c51f60b4 100644
--- a/src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile
+++ b/src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-noble-chiseled-extra-amd64
+FROM $REPO:10.0.2-noble-chiseled-extra-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile
index 670f055603..0bd0292d0c 100644
--- a/src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile
+++ b/src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-noble-chiseled-extra-arm32v7
+FROM $REPO:10.0.2-noble-chiseled-extra-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile
index 02d752c0cf..a6fb7fb30b 100644
--- a/src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile
+++ b/src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-noble-chiseled-extra-arm64v8
+FROM $REPO:10.0.2-noble-chiseled-extra-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/noble-chiseled/amd64/Dockerfile b/src/aspnet/10.0/noble-chiseled/amd64/Dockerfile
index 56c4b1f064..851fdae130 100644
--- a/src/aspnet/10.0/noble-chiseled/amd64/Dockerfile
+++ b/src/aspnet/10.0/noble-chiseled/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-noble-chiseled-amd64
+FROM $REPO:10.0.2-noble-chiseled-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile b/src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile
index 8bc8e5166f..b9d31ea336 100644
--- a/src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile
+++ b/src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-noble-chiseled-arm32v7
+FROM $REPO:10.0.2-noble-chiseled-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile b/src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile
index 5d032afc0e..b6d07d90aa 100644
--- a/src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile
+++ b/src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-noble-chiseled-arm64v8
+FROM $REPO:10.0.2-noble-chiseled-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/noble/amd64/Dockerfile b/src/aspnet/10.0/noble/amd64/Dockerfile
index 281abb26ac..a3618fcd80 100644
--- a/src/aspnet/10.0/noble/amd64/Dockerfile
+++ b/src/aspnet/10.0/noble/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-noble-amd64
+FROM $REPO:10.0.2-noble-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/noble/arm32v7/Dockerfile b/src/aspnet/10.0/noble/arm32v7/Dockerfile
index e4b0c75c0f..bcd65cd385 100644
--- a/src/aspnet/10.0/noble/arm32v7/Dockerfile
+++ b/src/aspnet/10.0/noble/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-noble-arm32v7
+FROM $REPO:10.0.2-noble-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/noble/arm64v8/Dockerfile b/src/aspnet/10.0/noble/arm64v8/Dockerfile
index ee68b54ef2..64d36f5700 100644
--- a/src/aspnet/10.0/noble/arm64v8/Dockerfile
+++ b/src/aspnet/10.0/noble/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=10.0.1 \
+RUN aspnetcore_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=10.0.1 \
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-noble-arm64v8
+FROM $REPO:10.0.2-noble-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile
index 520d72a5ff..0324b47cbc 100644
--- a/src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile
+++ b/src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '10.0.1'; `
+        $aspnetcore_version = '10.0.2'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512-bare'; `
         `
@@ -30,9 +30,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-windowsservercore-ltsc2022
+FROM $REPO:10.0.2-windowsservercore-ltsc2022
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile
index 947b2bb2ba..00d36c2a7f 100644
--- a/src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '10.0.1'; `
+        $aspnetcore_version = '10.0.2'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $aspnetcore_file + '.sha512-bare'; `
         `
@@ -30,9 +30,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:10.0.1-windowsservercore-ltsc2025
+FROM $REPO:10.0.2-windowsservercore-ltsc2025
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=10.0.1
+ENV ASPNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
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..721b6bc947
--- /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.23-alpine3.22-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.23 \
+    && 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.23-alpine3.22-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.23 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.23
+
+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..c8ff52aeaf
--- /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.23-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.23 \
+    && 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.23-alpine3.22-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.23 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.23
+
+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..9d1bb77546
--- /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.23-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.23 \
+    && 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.23-alpine3.22-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.23 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.23
+
+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/amd64/Dockerfile b/src/aspnet/8.0/alpine3.22-composite/amd64/Dockerfile
index a8a463ab31..1dc64495c3 100644
--- a/src/aspnet/8.0/alpine3.22-composite/amd64/Dockerfile
+++ b/src/aspnet/8.0/alpine3.22-composite/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.22-amd64 AS installer
+FROM $REPO:8.0.23-alpine3.22-amd64 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-alpine3.22-amd64
+FROM $REPO:8.0.23-alpine3.22-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 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/arm32v7/Dockerfile b/src/aspnet/8.0/alpine3.22-composite/arm32v7/Dockerfile
index 1da210b81b..f4deb12916 100644
--- a/src/aspnet/8.0/alpine3.22-composite/arm32v7/Dockerfile
+++ b/src/aspnet/8.0/alpine3.22-composite/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.22-arm32v7 AS installer
+FROM $REPO:8.0.23-alpine3.22-arm32v7 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-alpine3.22-arm32v7
+FROM $REPO:8.0.23-alpine3.22-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 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/arm64v8/Dockerfile b/src/aspnet/8.0/alpine3.22-composite/arm64v8/Dockerfile
index 44ab52d572..f81d5c875f 100644
--- a/src/aspnet/8.0/alpine3.22-composite/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/alpine3.22-composite/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.22-arm64v8 AS installer
+FROM $REPO:8.0.23-alpine3.22-arm64v8 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-alpine3.22-arm64v8
+FROM $REPO:8.0.23-alpine3.22-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 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..e2de23c031
--- /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.23-alpine3.22-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.23 \
+    && 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.23-alpine3.22-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.23
+
+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..a65973793a
--- /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.23-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.23 \
+    && 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.23-alpine3.22-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.23
+
+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..8e8aeb8e4d
--- /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.23-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.23 \
+    && 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.23-alpine3.22-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.23
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.22/amd64/Dockerfile b/src/aspnet/8.0/alpine3.22/amd64/Dockerfile
index 18b9ba6040..be444e5435 100644
--- a/src/aspnet/8.0/alpine3.22/amd64/Dockerfile
+++ b/src/aspnet/8.0/alpine3.22/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.22-amd64 AS installer
+FROM $REPO:8.0.23-alpine3.22-amd64 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-alpine3.22-amd64
+FROM $REPO:8.0.23-alpine3.22-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.22/arm32v7/Dockerfile b/src/aspnet/8.0/alpine3.22/arm32v7/Dockerfile
index 91a90f0bc3..a3e4c81cf5 100644
--- a/src/aspnet/8.0/alpine3.22/arm32v7/Dockerfile
+++ b/src/aspnet/8.0/alpine3.22/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.22-arm32v7 AS installer
+FROM $REPO:8.0.23-alpine3.22-arm32v7 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-alpine3.22-arm32v7
+FROM $REPO:8.0.23-alpine3.22-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.22/arm64v8/Dockerfile b/src/aspnet/8.0/alpine3.22/arm64v8/Dockerfile
index 95ddf271fd..2e01fdd17f 100644
--- a/src/aspnet/8.0/alpine3.22/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/alpine3.22/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.22-arm64v8 AS installer
+FROM $REPO:8.0.23-alpine3.22-arm64v8 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-alpine3.22-arm64v8
+FROM $REPO:8.0.23-alpine3.22-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 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..86dc33d9b5
--- /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.23-alpine3.23-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.23 \
+    && 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.23-alpine3.23-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.23 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.23
+
+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..8deabbad23
--- /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.23-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.23 \
+    && 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.23-alpine3.23-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.23 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.23
+
+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..e12d31b23c
--- /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.23-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=8.0.23 \
+    && 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.23-alpine3.23-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=8.0.23 \
+    # ASP.NET Core version
+    ASPNET_VERSION=8.0.23
+
+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/amd64/Dockerfile b/src/aspnet/8.0/alpine3.23-composite/amd64/Dockerfile
index 730b604182..443349812e 100644
--- a/src/aspnet/8.0/alpine3.23-composite/amd64/Dockerfile
+++ b/src/aspnet/8.0/alpine3.23-composite/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.23-amd64 AS installer
+FROM $REPO:8.0.23-alpine3.23-amd64 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-alpine3.23-amd64
+FROM $REPO:8.0.23-alpine3.23-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 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/arm32v7/Dockerfile b/src/aspnet/8.0/alpine3.23-composite/arm32v7/Dockerfile
index 746ea4ce8e..1b9d83802b 100644
--- a/src/aspnet/8.0/alpine3.23-composite/arm32v7/Dockerfile
+++ b/src/aspnet/8.0/alpine3.23-composite/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.23-arm32v7 AS installer
+FROM $REPO:8.0.23-alpine3.23-arm32v7 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-alpine3.23-arm32v7
+FROM $REPO:8.0.23-alpine3.23-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 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/arm64v8/Dockerfile b/src/aspnet/8.0/alpine3.23-composite/arm64v8/Dockerfile
index 82a5ddc4f7..e8a3b1b9d7 100644
--- a/src/aspnet/8.0/alpine3.23-composite/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/alpine3.23-composite/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.23-arm64v8 AS installer
+FROM $REPO:8.0.23-alpine3.23-arm64v8 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-alpine3.23-arm64v8
+FROM $REPO:8.0.23-alpine3.23-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 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..01d1b651f0
--- /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.23-alpine3.23-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.23 \
+    && 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.23-alpine3.23-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.23
+
+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..82afd69683
--- /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.23-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.23 \
+    && 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.23-alpine3.23-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.23
+
+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..a222e9339d
--- /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.23-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=8.0.23 \
+    && 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.23-alpine3.23-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=8.0.23
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.23/amd64/Dockerfile b/src/aspnet/8.0/alpine3.23/amd64/Dockerfile
index 6c438965f5..736f3c3d2e 100644
--- a/src/aspnet/8.0/alpine3.23/amd64/Dockerfile
+++ b/src/aspnet/8.0/alpine3.23/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.23-amd64 AS installer
+FROM $REPO:8.0.23-alpine3.23-amd64 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-alpine3.23-amd64
+FROM $REPO:8.0.23-alpine3.23-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.23/arm32v7/Dockerfile b/src/aspnet/8.0/alpine3.23/arm32v7/Dockerfile
index e2309a8b4c..ca103b9b85 100644
--- a/src/aspnet/8.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/aspnet/8.0/alpine3.23/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.23-arm32v7 AS installer
+FROM $REPO:8.0.23-alpine3.23-arm32v7 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-alpine3.23-arm32v7
+FROM $REPO:8.0.23-alpine3.23-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/alpine3.23/arm64v8/Dockerfile b/src/aspnet/8.0/alpine3.23/arm64v8/Dockerfile
index 1101903d21..0592780bd0 100644
--- a/src/aspnet/8.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/alpine3.23/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.23-arm64v8 AS installer
+FROM $REPO:8.0.23-alpine3.23-arm64v8 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-alpine3.23-arm64v8
+FROM $REPO:8.0.23-alpine3.23-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
index 1bbbd24634..a3fde2da49 100644
--- a/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -27,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-extra-amd64
+FROM $REPO:8.0.23-azurelinux3.0-distroless-extra-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
index 4818b3b10a..adc7c2f09e 100644
--- a/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -27,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-extra-arm64v8
+FROM $REPO:8.0.23-azurelinux3.0-distroless-extra-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
index 9bb52b95e7..624c6ed0ff 100644
--- a/src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
+++ b/src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -27,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-amd64
+FROM $REPO:8.0.23-azurelinux3.0-distroless-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
index f00de290b0..549e890b12 100644
--- a/src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -27,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-arm64v8
+FROM $REPO:8.0.23-azurelinux3.0-distroless-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
index 5556e55aa7..efae5638c7 100644
--- a/src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
+++ b/src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -24,9 +24,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-extra-amd64
+FROM $REPO:8.0.23-azurelinux3.0-distroless-extra-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
index bbcb14a847..21a1fefa7a 100644
--- a/src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -24,9 +24,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-extra-arm64v8
+FROM $REPO:8.0.23-azurelinux3.0-distroless-extra-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile
index 26f4aec5b2..f13cf36393 100644
--- a/src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile
+++ b/src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -24,9 +24,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-amd64
+FROM $REPO:8.0.23-azurelinux3.0-distroless-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile
index 75470ce753..2b98556cce 100644
--- a/src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -24,9 +24,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-arm64v8
+FROM $REPO:8.0.23-azurelinux3.0-distroless-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/azurelinux3.0/amd64/Dockerfile b/src/aspnet/8.0/azurelinux3.0/amd64/Dockerfile
index 0241b3b25d..8f5302d480 100644
--- a/src/aspnet/8.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/aspnet/8.0/azurelinux3.0/amd64/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:8.0.22-azurelinux3.0-amd64 AS installer
+FROM $REPO:8.0.23-azurelinux3.0-amd64 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -22,9 +22,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-azurelinux3.0-amd64
+FROM $REPO:8.0.23-azurelinux3.0-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/azurelinux3.0/arm64v8/Dockerfile b/src/aspnet/8.0/azurelinux3.0/arm64v8/Dockerfile
index cf7435b2cd..9ea1668877 100644
--- a/src/aspnet/8.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/azurelinux3.0/arm64v8/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:8.0.22-azurelinux3.0-arm64v8 AS installer
+FROM $REPO:8.0.23-azurelinux3.0-arm64v8 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -22,9 +22,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-azurelinux3.0-arm64v8
+FROM $REPO:8.0.23-azurelinux3.0-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/bookworm-slim/amd64/Dockerfile b/src/aspnet/8.0/bookworm-slim/amd64/Dockerfile
index fba73e47e1..f998cc71e6 100644
--- a/src/aspnet/8.0/bookworm-slim/amd64/Dockerfile
+++ b/src/aspnet/8.0/bookworm-slim/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:bookworm-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-bookworm-slim-amd64
+FROM $REPO:8.0.23-bookworm-slim-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/bookworm-slim/arm32v7/Dockerfile b/src/aspnet/8.0/bookworm-slim/arm32v7/Dockerfile
index 4c5dff1c89..18fe6991ad 100644
--- a/src/aspnet/8.0/bookworm-slim/arm32v7/Dockerfile
+++ b/src/aspnet/8.0/bookworm-slim/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:bookworm-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-bookworm-slim-arm32v7
+FROM $REPO:8.0.23-bookworm-slim-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/bookworm-slim/arm64v8/Dockerfile b/src/aspnet/8.0/bookworm-slim/arm64v8/Dockerfile
index 670878b309..78e815c777 100644
--- a/src/aspnet/8.0/bookworm-slim/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/bookworm-slim/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:bookworm-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-bookworm-slim-arm64v8
+FROM $REPO:8.0.23-bookworm-slim-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/amd64/Dockerfile b/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/amd64/Dockerfile
index 66d0f4e512..da1eba46ec 100644
--- a/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -27,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-cbl-mariner2.0-distroless-extra-amd64
+FROM $REPO:8.0.23-cbl-mariner2.0-distroless-extra-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/arm64v8/Dockerfile b/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/arm64v8/Dockerfile
index 72d3628970..99dc406a76 100644
--- a/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -27,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-cbl-mariner2.0-distroless-extra-arm64v8
+FROM $REPO:8.0.23-cbl-mariner2.0-distroless-extra-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/cbl-mariner2.0-distroless-composite/amd64/Dockerfile b/src/aspnet/8.0/cbl-mariner2.0-distroless-composite/amd64/Dockerfile
index a2851dd899..42bb9e07e2 100644
--- a/src/aspnet/8.0/cbl-mariner2.0-distroless-composite/amd64/Dockerfile
+++ b/src/aspnet/8.0/cbl-mariner2.0-distroless-composite/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -27,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-cbl-mariner2.0-distroless-amd64
+FROM $REPO:8.0.23-cbl-mariner2.0-distroless-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/cbl-mariner2.0-distroless-composite/arm64v8/Dockerfile b/src/aspnet/8.0/cbl-mariner2.0-distroless-composite/arm64v8/Dockerfile
index 54feeceeda..653f04aefc 100644
--- a/src/aspnet/8.0/cbl-mariner2.0-distroless-composite/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/cbl-mariner2.0-distroless-composite/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -27,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-cbl-mariner2.0-distroless-arm64v8
+FROM $REPO:8.0.23-cbl-mariner2.0-distroless-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile b/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile
index adec3e9b0b..aab825e493 100644
--- a/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile
+++ b/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -24,9 +24,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-cbl-mariner2.0-distroless-extra-amd64
+FROM $REPO:8.0.23-cbl-mariner2.0-distroless-extra-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile b/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile
index 4bf634ff9b..c17ba46987 100644
--- a/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -24,9 +24,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-cbl-mariner2.0-distroless-extra-arm64v8
+FROM $REPO:8.0.23-cbl-mariner2.0-distroless-extra-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/cbl-mariner2.0-distroless/amd64/Dockerfile b/src/aspnet/8.0/cbl-mariner2.0-distroless/amd64/Dockerfile
index f2214cde90..b1d62efb19 100644
--- a/src/aspnet/8.0/cbl-mariner2.0-distroless/amd64/Dockerfile
+++ b/src/aspnet/8.0/cbl-mariner2.0-distroless/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -24,9 +24,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-cbl-mariner2.0-distroless-amd64
+FROM $REPO:8.0.23-cbl-mariner2.0-distroless-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile b/src/aspnet/8.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile
index 591a02ba9b..b346208182 100644
--- a/src/aspnet/8.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -24,9 +24,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-cbl-mariner2.0-distroless-arm64v8
+FROM $REPO:8.0.23-cbl-mariner2.0-distroless-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/cbl-mariner2.0/amd64/Dockerfile b/src/aspnet/8.0/cbl-mariner2.0/amd64/Dockerfile
index b53cde1035..627133a809 100644
--- a/src/aspnet/8.0/cbl-mariner2.0/amd64/Dockerfile
+++ b/src/aspnet/8.0/cbl-mariner2.0/amd64/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:8.0.22-cbl-mariner2.0-amd64 AS installer
+FROM $REPO:8.0.23-cbl-mariner2.0-amd64 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -22,9 +22,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-cbl-mariner2.0-amd64
+FROM $REPO:8.0.23-cbl-mariner2.0-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/cbl-mariner2.0/arm64v8/Dockerfile b/src/aspnet/8.0/cbl-mariner2.0/arm64v8/Dockerfile
index b4f4c5a177..70815f2a78 100644
--- a/src/aspnet/8.0/cbl-mariner2.0/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/cbl-mariner2.0/arm64v8/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:8.0.22-cbl-mariner2.0-arm64v8 AS installer
+FROM $REPO:8.0.23-cbl-mariner2.0-arm64v8 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -22,9 +22,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-cbl-mariner2.0-arm64v8
+FROM $REPO:8.0.23-cbl-mariner2.0-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/jammy-chiseled-composite-extra/amd64/Dockerfile b/src/aspnet/8.0/jammy-chiseled-composite-extra/amd64/Dockerfile
index 411efcd349..3d4984e2c3 100644
--- a/src/aspnet/8.0/jammy-chiseled-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/8.0/jammy-chiseled-composite-extra/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-jammy-chiseled-extra-amd64
+FROM $REPO:8.0.23-jammy-chiseled-extra-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/jammy-chiseled-composite-extra/arm32v7/Dockerfile b/src/aspnet/8.0/jammy-chiseled-composite-extra/arm32v7/Dockerfile
index 805afe2311..a8759fb5aa 100644
--- a/src/aspnet/8.0/jammy-chiseled-composite-extra/arm32v7/Dockerfile
+++ b/src/aspnet/8.0/jammy-chiseled-composite-extra/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-jammy-chiseled-extra-arm32v7
+FROM $REPO:8.0.23-jammy-chiseled-extra-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/jammy-chiseled-composite-extra/arm64v8/Dockerfile b/src/aspnet/8.0/jammy-chiseled-composite-extra/arm64v8/Dockerfile
index 9759dc12bb..aa502089f6 100644
--- a/src/aspnet/8.0/jammy-chiseled-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/jammy-chiseled-composite-extra/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-jammy-chiseled-extra-arm64v8
+FROM $REPO:8.0.23-jammy-chiseled-extra-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/jammy-chiseled-composite/amd64/Dockerfile b/src/aspnet/8.0/jammy-chiseled-composite/amd64/Dockerfile
index 10295584fa..0026baec51 100644
--- a/src/aspnet/8.0/jammy-chiseled-composite/amd64/Dockerfile
+++ b/src/aspnet/8.0/jammy-chiseled-composite/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-jammy-chiseled-amd64
+FROM $REPO:8.0.23-jammy-chiseled-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/jammy-chiseled-composite/arm32v7/Dockerfile b/src/aspnet/8.0/jammy-chiseled-composite/arm32v7/Dockerfile
index aec1e7ae24..fb98729aed 100644
--- a/src/aspnet/8.0/jammy-chiseled-composite/arm32v7/Dockerfile
+++ b/src/aspnet/8.0/jammy-chiseled-composite/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-jammy-chiseled-arm32v7
+FROM $REPO:8.0.23-jammy-chiseled-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/jammy-chiseled-composite/arm64v8/Dockerfile b/src/aspnet/8.0/jammy-chiseled-composite/arm64v8/Dockerfile
index f45356795e..e9e61a17ee 100644
--- a/src/aspnet/8.0/jammy-chiseled-composite/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/jammy-chiseled-composite/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-jammy-chiseled-arm64v8
+FROM $REPO:8.0.23-jammy-chiseled-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/jammy-chiseled-extra/amd64/Dockerfile b/src/aspnet/8.0/jammy-chiseled-extra/amd64/Dockerfile
index 64853e2f0e..895c8c3db1 100644
--- a/src/aspnet/8.0/jammy-chiseled-extra/amd64/Dockerfile
+++ b/src/aspnet/8.0/jammy-chiseled-extra/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-jammy-chiseled-extra-amd64
+FROM $REPO:8.0.23-jammy-chiseled-extra-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/jammy-chiseled-extra/arm32v7/Dockerfile b/src/aspnet/8.0/jammy-chiseled-extra/arm32v7/Dockerfile
index 50a91df3f3..c33802bfeb 100644
--- a/src/aspnet/8.0/jammy-chiseled-extra/arm32v7/Dockerfile
+++ b/src/aspnet/8.0/jammy-chiseled-extra/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-jammy-chiseled-extra-arm32v7
+FROM $REPO:8.0.23-jammy-chiseled-extra-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/jammy-chiseled-extra/arm64v8/Dockerfile b/src/aspnet/8.0/jammy-chiseled-extra/arm64v8/Dockerfile
index e757745956..1fa6805736 100644
--- a/src/aspnet/8.0/jammy-chiseled-extra/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/jammy-chiseled-extra/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-jammy-chiseled-extra-arm64v8
+FROM $REPO:8.0.23-jammy-chiseled-extra-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/jammy-chiseled/amd64/Dockerfile b/src/aspnet/8.0/jammy-chiseled/amd64/Dockerfile
index aeac1506c7..9a6b942a9b 100644
--- a/src/aspnet/8.0/jammy-chiseled/amd64/Dockerfile
+++ b/src/aspnet/8.0/jammy-chiseled/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-jammy-chiseled-amd64
+FROM $REPO:8.0.23-jammy-chiseled-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/jammy-chiseled/arm32v7/Dockerfile b/src/aspnet/8.0/jammy-chiseled/arm32v7/Dockerfile
index 3808c70ce1..2d826630af 100644
--- a/src/aspnet/8.0/jammy-chiseled/arm32v7/Dockerfile
+++ b/src/aspnet/8.0/jammy-chiseled/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-jammy-chiseled-arm32v7
+FROM $REPO:8.0.23-jammy-chiseled-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/jammy-chiseled/arm64v8/Dockerfile b/src/aspnet/8.0/jammy-chiseled/arm64v8/Dockerfile
index 55b00ad00f..fa8abde194 100644
--- a/src/aspnet/8.0/jammy-chiseled/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/jammy-chiseled/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-jammy-chiseled-arm64v8
+FROM $REPO:8.0.23-jammy-chiseled-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/jammy/amd64/Dockerfile b/src/aspnet/8.0/jammy/amd64/Dockerfile
index c73d0a996a..cc2d0c8ace 100644
--- a/src/aspnet/8.0/jammy/amd64/Dockerfile
+++ b/src/aspnet/8.0/jammy/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-jammy-amd64
+FROM $REPO:8.0.23-jammy-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/jammy/arm32v7/Dockerfile b/src/aspnet/8.0/jammy/arm32v7/Dockerfile
index 333cd6d5e6..75c929b0dd 100644
--- a/src/aspnet/8.0/jammy/arm32v7/Dockerfile
+++ b/src/aspnet/8.0/jammy/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-jammy-arm32v7
+FROM $REPO:8.0.23-jammy-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/jammy/arm64v8/Dockerfile b/src/aspnet/8.0/jammy/arm64v8/Dockerfile
index 32694051c4..e038cd8f83 100644
--- a/src/aspnet/8.0/jammy/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/jammy/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-jammy-arm64v8
+FROM $REPO:8.0.23-jammy-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/nanoserver-1809/amd64/Dockerfile b/src/aspnet/8.0/nanoserver-1809/amd64/Dockerfile
index f084e407ed..f50154f5cf 100644
--- a/src/aspnet/8.0/nanoserver-1809/amd64/Dockerfile
+++ b/src/aspnet/8.0/nanoserver-1809/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '8.0.22'; `
+        $aspnetcore_version = '8.0.23'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $aspnetcore_version + '-sha.txt'; `
         `
@@ -39,9 +39,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-nanoserver-1809
+FROM $REPO:8.0.23-nanoserver-1809
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/8.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/aspnet/8.0/nanoserver-ltsc2022/amd64/Dockerfile
index d2072839a9..c92c680049 100644
--- a/src/aspnet/8.0/nanoserver-ltsc2022/amd64/Dockerfile
+++ b/src/aspnet/8.0/nanoserver-ltsc2022/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '8.0.22'; `
+        $aspnetcore_version = '8.0.23'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $aspnetcore_version + '-sha.txt'; `
         `
@@ -39,9 +39,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-nanoserver-ltsc2022
+FROM $REPO:8.0.23-nanoserver-ltsc2022
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/8.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/aspnet/8.0/nanoserver-ltsc2025/amd64/Dockerfile
index 3e1d974f3c..599d57ec4d 100644
--- a/src/aspnet/8.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/aspnet/8.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '8.0.22'; `
+        $aspnetcore_version = '8.0.23'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $aspnetcore_version + '-sha.txt'; `
         `
@@ -39,9 +39,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-nanoserver-ltsc2025
+FROM $REPO:8.0.23-nanoserver-ltsc2025
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/8.0/noble-chiseled-composite-extra/amd64/Dockerfile b/src/aspnet/8.0/noble-chiseled-composite-extra/amd64/Dockerfile
index a0016017af..3985523f89 100644
--- a/src/aspnet/8.0/noble-chiseled-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/8.0/noble-chiseled-composite-extra/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-noble-chiseled-extra-amd64
+FROM $REPO:8.0.23-noble-chiseled-extra-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/noble-chiseled-composite-extra/arm64v8/Dockerfile b/src/aspnet/8.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
index 1df91b6838..3405ce8b94 100644
--- a/src/aspnet/8.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-noble-chiseled-extra-arm64v8
+FROM $REPO:8.0.23-noble-chiseled-extra-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/noble-chiseled-composite/amd64/Dockerfile b/src/aspnet/8.0/noble-chiseled-composite/amd64/Dockerfile
index 419ab274cd..c280777022 100644
--- a/src/aspnet/8.0/noble-chiseled-composite/amd64/Dockerfile
+++ b/src/aspnet/8.0/noble-chiseled-composite/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-noble-chiseled-amd64
+FROM $REPO:8.0.23-noble-chiseled-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/noble-chiseled-composite/arm64v8/Dockerfile b/src/aspnet/8.0/noble-chiseled-composite/arm64v8/Dockerfile
index fefbbe95cc..8075e786f2 100644
--- a/src/aspnet/8.0/noble-chiseled-composite/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/noble-chiseled-composite/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:8.0.22-noble-chiseled-arm64v8
+FROM $REPO:8.0.23-noble-chiseled-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22 \
+    DOTNET_VERSION=8.0.23 \
     # ASP.NET Core version
-    ASPNET_VERSION=8.0.22
+    ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/8.0/noble-chiseled-extra/amd64/Dockerfile b/src/aspnet/8.0/noble-chiseled-extra/amd64/Dockerfile
index 2a10eab88e..198acabaaa 100644
--- a/src/aspnet/8.0/noble-chiseled-extra/amd64/Dockerfile
+++ b/src/aspnet/8.0/noble-chiseled-extra/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-noble-chiseled-extra-amd64
+FROM $REPO:8.0.23-noble-chiseled-extra-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/aspnet/8.0/noble-chiseled-extra/arm64v8/Dockerfile
index 474db745e3..0fc9263c49 100644
--- a/src/aspnet/8.0/noble-chiseled-extra/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/noble-chiseled-extra/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-noble-chiseled-extra-arm64v8
+FROM $REPO:8.0.23-noble-chiseled-extra-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/noble-chiseled/amd64/Dockerfile b/src/aspnet/8.0/noble-chiseled/amd64/Dockerfile
index 20bd170ccf..1bdd2467ec 100644
--- a/src/aspnet/8.0/noble-chiseled/amd64/Dockerfile
+++ b/src/aspnet/8.0/noble-chiseled/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-noble-chiseled-amd64
+FROM $REPO:8.0.23-noble-chiseled-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/noble-chiseled/arm64v8/Dockerfile b/src/aspnet/8.0/noble-chiseled/arm64v8/Dockerfile
index 764f145f33..7af69f10fa 100644
--- a/src/aspnet/8.0/noble-chiseled/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/noble-chiseled/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-noble-chiseled-arm64v8
+FROM $REPO:8.0.23-noble-chiseled-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/noble/amd64/Dockerfile b/src/aspnet/8.0/noble/amd64/Dockerfile
index aa4cd2c681..89f8b9e1ef 100644
--- a/src/aspnet/8.0/noble/amd64/Dockerfile
+++ b/src/aspnet/8.0/noble/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-noble-amd64
+FROM $REPO:8.0.23-noble-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/noble/arm64v8/Dockerfile b/src/aspnet/8.0/noble/arm64v8/Dockerfile
index b68e6b5105..6b7faa096d 100644
--- a/src/aspnet/8.0/noble/arm64v8/Dockerfile
+++ b/src/aspnet/8.0/noble/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=8.0.22 \
+RUN aspnetcore_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=8.0.22 \
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-noble-arm64v8
+FROM $REPO:8.0.23-noble-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/8.0/windowsservercore-ltsc2019/amd64/Dockerfile b/src/aspnet/8.0/windowsservercore-ltsc2019/amd64/Dockerfile
index a85b4b4bd5..56282bad07 100644
--- a/src/aspnet/8.0/windowsservercore-ltsc2019/amd64/Dockerfile
+++ b/src/aspnet/8.0/windowsservercore-ltsc2019/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '8.0.22'; `
+        $aspnetcore_version = '8.0.23'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $aspnetcore_version + '-sha.txt'; `
         `
@@ -39,9 +39,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-windowsservercore-ltsc2019
+FROM $REPO:8.0.23-windowsservercore-ltsc2019
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/8.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/aspnet/8.0/windowsservercore-ltsc2022/amd64/Dockerfile
index 5da6eee0fe..ad56cd5db5 100644
--- a/src/aspnet/8.0/windowsservercore-ltsc2022/amd64/Dockerfile
+++ b/src/aspnet/8.0/windowsservercore-ltsc2022/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '8.0.22'; `
+        $aspnetcore_version = '8.0.23'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $aspnetcore_version + '-sha.txt'; `
         `
@@ -39,9 +39,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-windowsservercore-ltsc2022
+FROM $REPO:8.0.23-windowsservercore-ltsc2022
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/8.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/aspnet/8.0/windowsservercore-ltsc2025/amd64/Dockerfile
index 147fe128da..4c12b69c9a 100644
--- a/src/aspnet/8.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/aspnet/8.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '8.0.22'; `
+        $aspnetcore_version = '8.0.23'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $aspnetcore_version + '-sha.txt'; `
         `
@@ -39,9 +39,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:8.0.22-windowsservercore-ltsc2025
+FROM $REPO:8.0.23-windowsservercore-ltsc2025
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=8.0.22
+ENV ASPNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
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..a49b0c9d3d
--- /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.12-alpine3.22-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.12 \
+    && 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.12-alpine3.22-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.12 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.12
+
+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..a037e42ea5
--- /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.12-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.12 \
+    && 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.12-alpine3.22-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.12 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.12
+
+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..399b673b42
--- /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.12-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.12 \
+    && 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.12-alpine3.22-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.12 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.12
+
+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/amd64/Dockerfile b/src/aspnet/9.0/alpine3.22-composite/amd64/Dockerfile
index 7f85828e3c..a6e90925c7 100644
--- a/src/aspnet/9.0/alpine3.22-composite/amd64/Dockerfile
+++ b/src/aspnet/9.0/alpine3.22-composite/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.22-amd64 AS installer
+FROM $REPO:9.0.12-alpine3.22-amd64 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-alpine3.22-amd64
+FROM $REPO:9.0.12-alpine3.22-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 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/arm32v7/Dockerfile b/src/aspnet/9.0/alpine3.22-composite/arm32v7/Dockerfile
index b1bd61d25e..d78e930728 100644
--- a/src/aspnet/9.0/alpine3.22-composite/arm32v7/Dockerfile
+++ b/src/aspnet/9.0/alpine3.22-composite/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.22-arm32v7 AS installer
+FROM $REPO:9.0.12-alpine3.22-arm32v7 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-alpine3.22-arm32v7
+FROM $REPO:9.0.12-alpine3.22-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 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/arm64v8/Dockerfile b/src/aspnet/9.0/alpine3.22-composite/arm64v8/Dockerfile
index 560af1ee84..bf648d5e12 100644
--- a/src/aspnet/9.0/alpine3.22-composite/arm64v8/Dockerfile
+++ b/src/aspnet/9.0/alpine3.22-composite/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.22-arm64v8 AS installer
+FROM $REPO:9.0.12-alpine3.22-arm64v8 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-alpine3.22-arm64v8
+FROM $REPO:9.0.12-alpine3.22-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 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..a1f2180fe3
--- /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.12-alpine3.22-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.12 \
+    && 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.12-alpine3.22-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.12
+
+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..7649ff8873
--- /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.12-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.12 \
+    && 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.12-alpine3.22-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.12
+
+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..e06a944631
--- /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.12-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.12 \
+    && 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.12-alpine3.22-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.12
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.22/amd64/Dockerfile b/src/aspnet/9.0/alpine3.22/amd64/Dockerfile
index 18133c5c94..5d793f9047 100644
--- a/src/aspnet/9.0/alpine3.22/amd64/Dockerfile
+++ b/src/aspnet/9.0/alpine3.22/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.22-amd64 AS installer
+FROM $REPO:9.0.12-alpine3.22-amd64 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-alpine3.22-amd64
+FROM $REPO:9.0.12-alpine3.22-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.22/arm32v7/Dockerfile b/src/aspnet/9.0/alpine3.22/arm32v7/Dockerfile
index 51ca677f3d..2007a06a39 100644
--- a/src/aspnet/9.0/alpine3.22/arm32v7/Dockerfile
+++ b/src/aspnet/9.0/alpine3.22/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.22-arm32v7 AS installer
+FROM $REPO:9.0.12-alpine3.22-arm32v7 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-alpine3.22-arm32v7
+FROM $REPO:9.0.12-alpine3.22-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.22/arm64v8/Dockerfile b/src/aspnet/9.0/alpine3.22/arm64v8/Dockerfile
index 81772d944a..e8e3d21b14 100644
--- a/src/aspnet/9.0/alpine3.22/arm64v8/Dockerfile
+++ b/src/aspnet/9.0/alpine3.22/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.22-arm64v8 AS installer
+FROM $REPO:9.0.12-alpine3.22-arm64v8 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-alpine3.22-arm64v8
+FROM $REPO:9.0.12-alpine3.22-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 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..6df89ed721
--- /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.12-alpine3.23-extra-amd64 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.12 \
+    && 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.12-alpine3.23-extra-amd64
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.12 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.12
+
+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..d6341b4fe0
--- /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.12-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.12 \
+    && 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.12-alpine3.23-extra-arm32v7
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.12 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.12
+
+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..3b2e137792
--- /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.12-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Composite Runtime
+RUN aspnetcore_version=9.0.12 \
+    && 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.12-alpine3.23-extra-arm64v8
+
+ENV \
+    # .NET Runtime version
+    DOTNET_VERSION=9.0.12 \
+    # ASP.NET Core version
+    ASPNET_VERSION=9.0.12
+
+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/amd64/Dockerfile b/src/aspnet/9.0/alpine3.23-composite/amd64/Dockerfile
index 6d3f72eafc..2529d826a3 100644
--- a/src/aspnet/9.0/alpine3.23-composite/amd64/Dockerfile
+++ b/src/aspnet/9.0/alpine3.23-composite/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.23-amd64 AS installer
+FROM $REPO:9.0.12-alpine3.23-amd64 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-alpine3.23-amd64
+FROM $REPO:9.0.12-alpine3.23-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 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/arm32v7/Dockerfile b/src/aspnet/9.0/alpine3.23-composite/arm32v7/Dockerfile
index 2805c0856f..bb2f47c56d 100644
--- a/src/aspnet/9.0/alpine3.23-composite/arm32v7/Dockerfile
+++ b/src/aspnet/9.0/alpine3.23-composite/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.23-arm32v7 AS installer
+FROM $REPO:9.0.12-alpine3.23-arm32v7 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-alpine3.23-arm32v7
+FROM $REPO:9.0.12-alpine3.23-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 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/arm64v8/Dockerfile b/src/aspnet/9.0/alpine3.23-composite/arm64v8/Dockerfile
index 89260d3a38..4aefc705bf 100644
--- a/src/aspnet/9.0/alpine3.23-composite/arm64v8/Dockerfile
+++ b/src/aspnet/9.0/alpine3.23-composite/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.23-arm64v8 AS installer
+FROM $REPO:9.0.12-alpine3.23-arm64v8 AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && 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 \
@@ -17,13 +17,13 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-alpine3.23-arm64v8
+FROM $REPO:9.0.12-alpine3.23-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 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..073d1dd595
--- /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.12-alpine3.23-extra-amd64 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.12 \
+    && 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.12-alpine3.23-extra-amd64
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.12
+
+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..8e284b3a16
--- /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.12-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.12 \
+    && 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.12-alpine3.23-extra-arm32v7
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.12
+
+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..210cc2bec5
--- /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.12-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve ASP.NET Core
+RUN aspnetcore_version=9.0.12 \
+    && 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.12-alpine3.23-extra-arm64v8
+
+# ASP.NET Core version
+ENV ASPNET_VERSION=9.0.12
+
+COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.23/amd64/Dockerfile b/src/aspnet/9.0/alpine3.23/amd64/Dockerfile
index 0984b8fae9..23d7f8b90e 100644
--- a/src/aspnet/9.0/alpine3.23/amd64/Dockerfile
+++ b/src/aspnet/9.0/alpine3.23/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.23-amd64 AS installer
+FROM $REPO:9.0.12-alpine3.23-amd64 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-alpine3.23-amd64
+FROM $REPO:9.0.12-alpine3.23-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.23/arm32v7/Dockerfile b/src/aspnet/9.0/alpine3.23/arm32v7/Dockerfile
index 20896415a0..dbbd58bf43 100644
--- a/src/aspnet/9.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/aspnet/9.0/alpine3.23/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.23-arm32v7 AS installer
+FROM $REPO:9.0.12-alpine3.23-arm32v7 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-alpine3.23-arm32v7
+FROM $REPO:9.0.12-alpine3.23-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/alpine3.23/arm64v8/Dockerfile b/src/aspnet/9.0/alpine3.23/arm64v8/Dockerfile
index fc0e69d57b..986b78f715 100644
--- a/src/aspnet/9.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/aspnet/9.0/alpine3.23/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.23-arm64v8 AS installer
+FROM $REPO:9.0.12-alpine3.23-arm64v8 AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && 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 \
@@ -17,9 +17,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-alpine3.23-arm64v8
+FROM $REPO:9.0.12-alpine3.23-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
index ef44b5f335..45dd719065 100644
--- a/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -27,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-azurelinux3.0-distroless-extra-amd64
+FROM $REPO:9.0.12-azurelinux3.0-distroless-extra-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
index 7424a26d5e..9e06d77c22 100644
--- a/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -27,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-azurelinux3.0-distroless-extra-arm64v8
+FROM $REPO:9.0.12-azurelinux3.0-distroless-extra-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/9.0/azurelinux3.0-distroless-composite/amd64/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
index 0d42cd2aac..b96080262b 100644
--- a/src/aspnet/9.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
+++ b/src/aspnet/9.0/azurelinux3.0-distroless-composite/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -27,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-azurelinux3.0-distroless-amd64
+FROM $REPO:9.0.12-azurelinux3.0-distroless-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/9.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
index 0cb53e5335..708509f604 100644
--- a/src/aspnet/9.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
+++ b/src/aspnet/9.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -27,13 +27,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-azurelinux3.0-distroless-arm64v8
+FROM $REPO:9.0.12-azurelinux3.0-distroless-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
index 48adddbce9..d33f48136c 100644
--- a/src/aspnet/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
+++ b/src/aspnet/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -24,9 +24,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-azurelinux3.0-distroless-extra-amd64
+FROM $REPO:9.0.12-azurelinux3.0-distroless-extra-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
index 5929501bd2..7b76bbacac 100644
--- a/src/aspnet/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
+++ b/src/aspnet/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -24,9 +24,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-azurelinux3.0-distroless-extra-arm64v8
+FROM $REPO:9.0.12-azurelinux3.0-distroless-extra-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless/amd64/Dockerfile
index 32ddcddba0..9f9f95e0da 100644
--- a/src/aspnet/9.0/azurelinux3.0-distroless/amd64/Dockerfile
+++ b/src/aspnet/9.0/azurelinux3.0-distroless/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -24,9 +24,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-azurelinux3.0-distroless-amd64
+FROM $REPO:9.0.12-azurelinux3.0-distroless-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile
index f70fccc7c2..0398c43c0d 100644
--- a/src/aspnet/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile
+++ b/src/aspnet/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -24,9 +24,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-azurelinux3.0-distroless-arm64v8
+FROM $REPO:9.0.12-azurelinux3.0-distroless-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/azurelinux3.0/amd64/Dockerfile b/src/aspnet/9.0/azurelinux3.0/amd64/Dockerfile
index 8ec88b9a5b..9641c06122 100644
--- a/src/aspnet/9.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/aspnet/9.0/azurelinux3.0/amd64/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:9.0.11-azurelinux3.0-amd64 AS installer
+FROM $REPO:9.0.12-azurelinux3.0-amd64 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -22,9 +22,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-azurelinux3.0-amd64
+FROM $REPO:9.0.12-azurelinux3.0-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/azurelinux3.0/arm64v8/Dockerfile b/src/aspnet/9.0/azurelinux3.0/arm64v8/Dockerfile
index 3c46b577ba..a92556fb0c 100644
--- a/src/aspnet/9.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/aspnet/9.0/azurelinux3.0/arm64v8/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 
 # Installer image
-FROM $REPO:9.0.11-azurelinux3.0-arm64v8 AS installer
+FROM $REPO:9.0.12-azurelinux3.0-arm64v8 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -22,9 +22,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-azurelinux3.0-arm64v8
+FROM $REPO:9.0.12-azurelinux3.0-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/bookworm-slim/amd64/Dockerfile b/src/aspnet/9.0/bookworm-slim/amd64/Dockerfile
index ee2f2cd5dc..b07c6e976e 100644
--- a/src/aspnet/9.0/bookworm-slim/amd64/Dockerfile
+++ b/src/aspnet/9.0/bookworm-slim/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:bookworm-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-bookworm-slim-amd64
+FROM $REPO:9.0.12-bookworm-slim-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/bookworm-slim/arm32v7/Dockerfile b/src/aspnet/9.0/bookworm-slim/arm32v7/Dockerfile
index b0400e0bf3..359fe31563 100644
--- a/src/aspnet/9.0/bookworm-slim/arm32v7/Dockerfile
+++ b/src/aspnet/9.0/bookworm-slim/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:bookworm-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-bookworm-slim-arm32v7
+FROM $REPO:9.0.12-bookworm-slim-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/bookworm-slim/arm64v8/Dockerfile b/src/aspnet/9.0/bookworm-slim/arm64v8/Dockerfile
index 96f6b6e9d5..052d611eb2 100644
--- a/src/aspnet/9.0/bookworm-slim/arm64v8/Dockerfile
+++ b/src/aspnet/9.0/bookworm-slim/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:bookworm-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-bookworm-slim-arm64v8
+FROM $REPO:9.0.12-bookworm-slim-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/nanoserver-1809/amd64/Dockerfile b/src/aspnet/9.0/nanoserver-1809/amd64/Dockerfile
index 19348fb3d7..54306244bc 100644
--- a/src/aspnet/9.0/nanoserver-1809/amd64/Dockerfile
+++ b/src/aspnet/9.0/nanoserver-1809/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '9.0.11'; `
+        $aspnetcore_version = '9.0.12'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $aspnetcore_version + '-sha.txt'; `
         `
@@ -39,9 +39,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-nanoserver-1809
+FROM $REPO:9.0.12-nanoserver-1809
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/9.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/aspnet/9.0/nanoserver-ltsc2022/amd64/Dockerfile
index d6c5622e54..f2a43f77a2 100644
--- a/src/aspnet/9.0/nanoserver-ltsc2022/amd64/Dockerfile
+++ b/src/aspnet/9.0/nanoserver-ltsc2022/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '9.0.11'; `
+        $aspnetcore_version = '9.0.12'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $aspnetcore_version + '-sha.txt'; `
         `
@@ -39,9 +39,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-nanoserver-ltsc2022
+FROM $REPO:9.0.12-nanoserver-ltsc2022
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/9.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/aspnet/9.0/nanoserver-ltsc2025/amd64/Dockerfile
index 8f19c0b8fa..bd36bcb092 100644
--- a/src/aspnet/9.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/aspnet/9.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '9.0.11'; `
+        $aspnetcore_version = '9.0.12'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $aspnetcore_version + '-sha.txt'; `
         `
@@ -39,9 +39,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-nanoserver-ltsc2025
+FROM $REPO:9.0.12-nanoserver-ltsc2025
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/9.0/noble-chiseled-composite-extra/amd64/Dockerfile b/src/aspnet/9.0/noble-chiseled-composite-extra/amd64/Dockerfile
index bfbff8a82b..9da94b1b7d 100644
--- a/src/aspnet/9.0/noble-chiseled-composite-extra/amd64/Dockerfile
+++ b/src/aspnet/9.0/noble-chiseled-composite-extra/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-noble-chiseled-extra-amd64
+FROM $REPO:9.0.12-noble-chiseled-extra-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/9.0/noble-chiseled-composite-extra/arm32v7/Dockerfile b/src/aspnet/9.0/noble-chiseled-composite-extra/arm32v7/Dockerfile
index f98a593339..dc23a47c11 100644
--- a/src/aspnet/9.0/noble-chiseled-composite-extra/arm32v7/Dockerfile
+++ b/src/aspnet/9.0/noble-chiseled-composite-extra/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-noble-chiseled-extra-arm32v7
+FROM $REPO:9.0.12-noble-chiseled-extra-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/9.0/noble-chiseled-composite-extra/arm64v8/Dockerfile b/src/aspnet/9.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
index cabceb7a8d..755a97bdf3 100644
--- a/src/aspnet/9.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
+++ b/src/aspnet/9.0/noble-chiseled-composite-extra/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-noble-chiseled-extra-arm64v8
+FROM $REPO:9.0.12-noble-chiseled-extra-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/9.0/noble-chiseled-composite/amd64/Dockerfile b/src/aspnet/9.0/noble-chiseled-composite/amd64/Dockerfile
index e150daffcd..78f4f9ead8 100644
--- a/src/aspnet/9.0/noble-chiseled-composite/amd64/Dockerfile
+++ b/src/aspnet/9.0/noble-chiseled-composite/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-noble-chiseled-amd64
+FROM $REPO:9.0.12-noble-chiseled-amd64
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/9.0/noble-chiseled-composite/arm32v7/Dockerfile b/src/aspnet/9.0/noble-chiseled-composite/arm32v7/Dockerfile
index d66b021c10..ef22dadb58 100644
--- a/src/aspnet/9.0/noble-chiseled-composite/arm32v7/Dockerfile
+++ b/src/aspnet/9.0/noble-chiseled-composite/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-noble-chiseled-arm32v7
+FROM $REPO:9.0.12-noble-chiseled-arm32v7
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/9.0/noble-chiseled-composite/arm64v8/Dockerfile b/src/aspnet/9.0/noble-chiseled-composite/arm64v8/Dockerfile
index 24a753aadd..33696123f2 100644
--- a/src/aspnet/9.0/noble-chiseled-composite/arm64v8/Dockerfile
+++ b/src/aspnet/9.0/noble-chiseled-composite/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Composite Runtime
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -21,13 +21,13 @@ RUN mkdir /dotnet-symlink \
 
 
 # ASP.NET Composite Image
-FROM $REPO:9.0.11-noble-chiseled-arm64v8
+FROM $REPO:9.0.12-noble-chiseled-arm64v8
 
 ENV \
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11 \
+    DOTNET_VERSION=9.0.12 \
     # ASP.NET Core version
-    ASPNET_VERSION=9.0.11
+    ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/aspnet/9.0/noble-chiseled-extra/amd64/Dockerfile b/src/aspnet/9.0/noble-chiseled-extra/amd64/Dockerfile
index bde24d01b9..6eb68b7ca6 100644
--- a/src/aspnet/9.0/noble-chiseled-extra/amd64/Dockerfile
+++ b/src/aspnet/9.0/noble-chiseled-extra/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-noble-chiseled-extra-amd64
+FROM $REPO:9.0.12-noble-chiseled-extra-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/aspnet/9.0/noble-chiseled-extra/arm32v7/Dockerfile
index ec751aecdc..5a9308cda4 100644
--- a/src/aspnet/9.0/noble-chiseled-extra/arm32v7/Dockerfile
+++ b/src/aspnet/9.0/noble-chiseled-extra/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-noble-chiseled-extra-arm32v7
+FROM $REPO:9.0.12-noble-chiseled-extra-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/aspnet/9.0/noble-chiseled-extra/arm64v8/Dockerfile
index 7c563c6e7f..94e80d4b93 100644
--- a/src/aspnet/9.0/noble-chiseled-extra/arm64v8/Dockerfile
+++ b/src/aspnet/9.0/noble-chiseled-extra/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-noble-chiseled-extra-arm64v8
+FROM $REPO:9.0.12-noble-chiseled-extra-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/noble-chiseled/amd64/Dockerfile b/src/aspnet/9.0/noble-chiseled/amd64/Dockerfile
index 2c5d2f28e2..591aa9d914 100644
--- a/src/aspnet/9.0/noble-chiseled/amd64/Dockerfile
+++ b/src/aspnet/9.0/noble-chiseled/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-noble-chiseled-amd64
+FROM $REPO:9.0.12-noble-chiseled-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/noble-chiseled/arm32v7/Dockerfile b/src/aspnet/9.0/noble-chiseled/arm32v7/Dockerfile
index fc65b36c6d..6d41d93d69 100644
--- a/src/aspnet/9.0/noble-chiseled/arm32v7/Dockerfile
+++ b/src/aspnet/9.0/noble-chiseled/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-noble-chiseled-arm32v7
+FROM $REPO:9.0.12-noble-chiseled-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/noble-chiseled/arm64v8/Dockerfile b/src/aspnet/9.0/noble-chiseled/arm64v8/Dockerfile
index c8d52a3d94..518a0dbf71 100644
--- a/src/aspnet/9.0/noble-chiseled/arm64v8/Dockerfile
+++ b/src/aspnet/9.0/noble-chiseled/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-noble-chiseled-arm64v8
+FROM $REPO:9.0.12-noble-chiseled-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/noble/amd64/Dockerfile b/src/aspnet/9.0/noble/amd64/Dockerfile
index fafa7346fb..02645aef17 100644
--- a/src/aspnet/9.0/noble/amd64/Dockerfile
+++ b/src/aspnet/9.0/noble/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-noble-amd64
+FROM $REPO:9.0.12-noble-amd64
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/noble/arm32v7/Dockerfile b/src/aspnet/9.0/noble/arm32v7/Dockerfile
index 5b0a57b91c..c7da9fe2f9 100644
--- a/src/aspnet/9.0/noble/arm32v7/Dockerfile
+++ b/src/aspnet/9.0/noble/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-noble-arm32v7
+FROM $REPO:9.0.12-noble-arm32v7
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/noble/arm64v8/Dockerfile b/src/aspnet/9.0/noble/arm64v8/Dockerfile
index 277f3c6808..b684f45b3b 100644
--- a/src/aspnet/9.0/noble/arm64v8/Dockerfile
+++ b/src/aspnet/9.0/noble/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve ASP.NET Core
-RUN aspnetcore_version=9.0.11 \
+RUN aspnetcore_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$aspnetcore_version-sha.txt \
@@ -18,9 +18,9 @@ RUN aspnetcore_version=9.0.11 \
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-noble-arm64v8
+FROM $REPO:9.0.12-noble-arm64v8
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
diff --git a/src/aspnet/9.0/windowsservercore-ltsc2019/amd64/Dockerfile b/src/aspnet/9.0/windowsservercore-ltsc2019/amd64/Dockerfile
index b2e368fb95..80aaa86294 100644
--- a/src/aspnet/9.0/windowsservercore-ltsc2019/amd64/Dockerfile
+++ b/src/aspnet/9.0/windowsservercore-ltsc2019/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '9.0.11'; `
+        $aspnetcore_version = '9.0.12'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $aspnetcore_version + '-sha.txt'; `
         `
@@ -39,9 +39,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-windowsservercore-ltsc2019
+FROM $REPO:9.0.12-windowsservercore-ltsc2019
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/9.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/aspnet/9.0/windowsservercore-ltsc2022/amd64/Dockerfile
index 96ff332216..faa7519975 100644
--- a/src/aspnet/9.0/windowsservercore-ltsc2022/amd64/Dockerfile
+++ b/src/aspnet/9.0/windowsservercore-ltsc2022/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '9.0.11'; `
+        $aspnetcore_version = '9.0.12'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $aspnetcore_version + '-sha.txt'; `
         `
@@ -39,9 +39,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-windowsservercore-ltsc2022
+FROM $REPO:9.0.12-windowsservercore-ltsc2022
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/aspnet/9.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/aspnet/9.0/windowsservercore-ltsc2025/amd64/Dockerfile
index e44b9f3a8c..5ea7fc0b8a 100644
--- a/src/aspnet/9.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/aspnet/9.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $aspnetcore_version = '9.0.11'; `
+        $aspnetcore_version = '9.0.12'; `
         $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $aspnetcore_version + '-sha.txt'; `
         `
@@ -39,9 +39,9 @@ RUN powershell -Command `
 
 
 # ASP.NET Core image
-FROM $REPO:9.0.11-windowsservercore-ltsc2025
+FROM $REPO:9.0.12-windowsservercore-ltsc2025
 
 # ASP.NET Core version
-ENV ASPNET_VERSION=9.0.11
+ENV ASPNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]
diff --git a/src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile b/src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile
index dae56ec88e..998b761643 100644
--- a/src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile
+++ b/src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile
@@ -23,7 +23,7 @@ RUN dotnet_monitor_version=10.0.0 \
 
 
 # .NET Monitor Base image
-FROM $REPO:10.0.1-azurelinux3.0-distroless-amd64
+FROM $REPO:10.0.2-azurelinux3.0-distroless-amd64
 
 WORKDIR /app
 COPY --from=installer /app .
diff --git a/src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile
index fa9295a233..77f761b3b1 100644
--- a/src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile
+++ b/src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile
@@ -23,7 +23,7 @@ RUN dotnet_monitor_version=10.0.0 \
 
 
 # .NET Monitor Base image
-FROM $REPO:10.0.1-azurelinux3.0-distroless-arm64v8
+FROM $REPO:10.0.2-azurelinux3.0-distroless-arm64v8
 
 WORKDIR /app
 COPY --from=installer /app .
diff --git a/src/monitor-base/8.1/azurelinux-distroless/amd64/Dockerfile b/src/monitor-base/8.1/azurelinux-distroless/amd64/Dockerfile
index 934a4e62d1..5bc0d8aed8 100644
--- a/src/monitor-base/8.1/azurelinux-distroless/amd64/Dockerfile
+++ b/src/monitor-base/8.1/azurelinux-distroless/amd64/Dockerfile
@@ -20,7 +20,7 @@ RUN dotnet_monitor_version=8.1.3 \
 
 
 # .NET Monitor Base image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-amd64
+FROM $REPO:8.0.23-azurelinux3.0-distroless-amd64
 
 WORKDIR /app
 COPY --from=installer /app .
diff --git a/src/monitor-base/8.1/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor-base/8.1/azurelinux-distroless/arm64v8/Dockerfile
index 62290d1b4e..ea743bb546 100644
--- a/src/monitor-base/8.1/azurelinux-distroless/arm64v8/Dockerfile
+++ b/src/monitor-base/8.1/azurelinux-distroless/arm64v8/Dockerfile
@@ -20,7 +20,7 @@ RUN dotnet_monitor_version=8.1.3 \
 
 
 # .NET Monitor Base image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-arm64v8
+FROM $REPO:8.0.23-azurelinux3.0-distroless-arm64v8
 
 WORKDIR /app
 COPY --from=installer /app .
diff --git a/src/monitor-base/8.1/ubuntu-chiseled/amd64/Dockerfile b/src/monitor-base/8.1/ubuntu-chiseled/amd64/Dockerfile
index fe0ae0f6a7..d569d99fae 100644
--- a/src/monitor-base/8.1/ubuntu-chiseled/amd64/Dockerfile
+++ b/src/monitor-base/8.1/ubuntu-chiseled/amd64/Dockerfile
@@ -14,7 +14,7 @@ RUN dotnet_monitor_version=8.1.3 \
 
 
 # .NET Monitor Base image
-FROM $REPO:8.0.22-jammy-chiseled-amd64
+FROM $REPO:8.0.23-jammy-chiseled-amd64
 
 WORKDIR /app
 COPY --from=installer /app .
diff --git a/src/monitor-base/8.1/ubuntu-chiseled/arm64v8/Dockerfile b/src/monitor-base/8.1/ubuntu-chiseled/arm64v8/Dockerfile
index a7ac57f670..3893d8f078 100644
--- a/src/monitor-base/8.1/ubuntu-chiseled/arm64v8/Dockerfile
+++ b/src/monitor-base/8.1/ubuntu-chiseled/arm64v8/Dockerfile
@@ -14,7 +14,7 @@ RUN dotnet_monitor_version=8.1.3 \
 
 
 # .NET Monitor Base image
-FROM $REPO:8.0.22-jammy-chiseled-arm64v8
+FROM $REPO:8.0.23-jammy-chiseled-arm64v8
 
 WORKDIR /app
 COPY --from=installer /app .
diff --git a/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile b/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile
index 34b43e9d43..56e0e5eb0b 100644
--- a/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile
+++ b/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile
@@ -20,7 +20,7 @@ RUN dotnet_monitor_version=9.0.5 \
 
 
 # .NET Monitor Base image
-FROM $REPO:9.0.11-azurelinux3.0-distroless-amd64
+FROM $REPO:9.0.12-azurelinux3.0-distroless-amd64
 
 WORKDIR /app
 COPY --from=installer /app .
diff --git a/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile
index 328a146cdb..a6c3a53e1d 100644
--- a/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile
+++ b/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile
@@ -20,7 +20,7 @@ RUN dotnet_monitor_version=9.0.5 \
 
 
 # .NET Monitor Base image
-FROM $REPO:9.0.11-azurelinux3.0-distroless-arm64v8
+FROM $REPO:9.0.12-azurelinux3.0-distroless-arm64v8
 
 WORKDIR /app
 COPY --from=installer /app .
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..88c3dd275d
--- /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.2-alpine3.22-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.2 \
+    && 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.2-alpine3.22-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.2
+
+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..c5b8a819a4
--- /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.2-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.2 \
+    && 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.2-alpine3.22-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.2
+
+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..1d6e56d0cc
--- /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.2-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.2 \
+    && 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.2-alpine3.22-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.2
+
+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/amd64/Dockerfile b/src/runtime/10.0/alpine3.22/amd64/Dockerfile
index bf3e056efb..55c3888b7a 100644
--- a/src/runtime/10.0/alpine3.22/amd64/Dockerfile
+++ b/src/runtime/10.0/alpine3.22/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.22-amd64 AS installer
+FROM $REPO:10.0.2-alpine3.22-amd64 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=10.0.1 \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-alpine3.22-amd64
+FROM $REPO:10.0.2-alpine3.22-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/10.0/alpine3.22/arm32v7/Dockerfile b/src/runtime/10.0/alpine3.22/arm32v7/Dockerfile
index fbc60cfbde..d81a1b8634 100644
--- a/src/runtime/10.0/alpine3.22/arm32v7/Dockerfile
+++ b/src/runtime/10.0/alpine3.22/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.22-arm32v7 AS installer
+FROM $REPO:10.0.2-alpine3.22-arm32v7 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=10.0.1 \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-alpine3.22-arm32v7
+FROM $REPO:10.0.2-alpine3.22-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/10.0/alpine3.22/arm64v8/Dockerfile b/src/runtime/10.0/alpine3.22/arm64v8/Dockerfile
index dff2fb35d7..c0e8e24f27 100644
--- a/src/runtime/10.0/alpine3.22/arm64v8/Dockerfile
+++ b/src/runtime/10.0/alpine3.22/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.22-arm64v8 AS installer
+FROM $REPO:10.0.2-alpine3.22-arm64v8 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=10.0.1 \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-alpine3.22-arm64v8
+FROM $REPO:10.0.2-alpine3.22-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/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..a1c8f5c7b4
--- /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.2-alpine3.23-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.2 \
+    && 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.2-alpine3.23-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.2
+
+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..696aacc5c0
--- /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.2-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.2 \
+    && 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.2-alpine3.23-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.2
+
+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..5b97a29ac7
--- /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.2-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=10.0.2 \
+    && 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.2-alpine3.23-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=10.0.2
+
+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/amd64/Dockerfile b/src/runtime/10.0/alpine3.23/amd64/Dockerfile
index 76e146706c..2fa6b88b21 100644
--- a/src/runtime/10.0/alpine3.23/amd64/Dockerfile
+++ b/src/runtime/10.0/alpine3.23/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.23-amd64 AS installer
+FROM $REPO:10.0.2-alpine3.23-amd64 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=10.0.1 \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-alpine3.23-amd64
+FROM $REPO:10.0.2-alpine3.23-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/10.0/alpine3.23/arm32v7/Dockerfile b/src/runtime/10.0/alpine3.23/arm32v7/Dockerfile
index bbfaf53800..e2c9f7aa76 100644
--- a/src/runtime/10.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/runtime/10.0/alpine3.23/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.23-arm32v7 AS installer
+FROM $REPO:10.0.2-alpine3.23-arm32v7 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=10.0.1 \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-alpine3.23-arm32v7
+FROM $REPO:10.0.2-alpine3.23-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/10.0/alpine3.23/arm64v8/Dockerfile b/src/runtime/10.0/alpine3.23/arm64v8/Dockerfile
index b655177a9e..96e6b3cf5a 100644
--- a/src/runtime/10.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/runtime/10.0/alpine3.23/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:10.0.1-alpine3.23-arm64v8 AS installer
+FROM $REPO:10.0.2-alpine3.23-arm64v8 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=10.0.1 \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-alpine3.23-arm64v8
+FROM $REPO:10.0.2-alpine3.23-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
index fa2f97d3b4..dc2cf5e837 100644
--- a/src/runtime/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
+++ b/src/runtime/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
@@ -26,10 +26,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-azurelinux3.0-distroless-extra-amd64
+FROM $REPO:10.0.2-azurelinux3.0-distroless-extra-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
index 3088318d32..2813bfd898 100644
--- a/src/runtime/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
+++ b/src/runtime/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
@@ -26,10 +26,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-azurelinux3.0-distroless-extra-arm64v8
+FROM $REPO:10.0.2-azurelinux3.0-distroless-extra-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/10.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime/10.0/azurelinux3.0-distroless/amd64/Dockerfile
index 18835b9cf5..22aafea1b3 100644
--- a/src/runtime/10.0/azurelinux3.0-distroless/amd64/Dockerfile
+++ b/src/runtime/10.0/azurelinux3.0-distroless/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
@@ -26,10 +26,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-azurelinux3.0-distroless-amd64
+FROM $REPO:10.0.2-azurelinux3.0-distroless-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile
index c3f774e353..2285f56de2 100644
--- a/src/runtime/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile
+++ b/src/runtime/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
@@ -26,10 +26,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-azurelinux3.0-distroless-arm64v8
+FROM $REPO:10.0.2-azurelinux3.0-distroless-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/10.0/azurelinux3.0/amd64/Dockerfile b/src/runtime/10.0/azurelinux3.0/amd64/Dockerfile
index a454bbc69c..a8b15aa779 100644
--- a/src/runtime/10.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/runtime/10.0/azurelinux3.0/amd64/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:10.0.1-azurelinux3.0-amd64 AS installer
+FROM $REPO:10.0.2-azurelinux3.0-amd64 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
@@ -21,10 +21,10 @@ RUN dotnet_version=10.0.1 \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-azurelinux3.0-amd64
+FROM $REPO:10.0.2-azurelinux3.0-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/10.0/azurelinux3.0/arm64v8/Dockerfile b/src/runtime/10.0/azurelinux3.0/arm64v8/Dockerfile
index dccf884646..73027bb66c 100644
--- a/src/runtime/10.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/runtime/10.0/azurelinux3.0/arm64v8/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:10.0.1-azurelinux3.0-arm64v8 AS installer
+FROM $REPO:10.0.2-azurelinux3.0-arm64v8 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
@@ -21,10 +21,10 @@ RUN dotnet_version=10.0.1 \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-azurelinux3.0-arm64v8
+FROM $REPO:10.0.2-azurelinux3.0-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile
index e468181cf2..d0f6ba3ace 100644
--- a/src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile
+++ b/src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '10.0.1'; `
+        $dotnet_version = '10.0.2'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; `
         `
@@ -36,7 +36,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1
+    DOTNET_VERSION=10.0.2
 
 # In order to set system PATH, ContainerAdministrator must be used
 USER ContainerAdministrator
diff --git a/src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile
index 3a27cfe9ff..2313419ee2 100644
--- a/src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '10.0.1'; `
+        $dotnet_version = '10.0.2'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; `
         `
@@ -36,7 +36,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1
+    DOTNET_VERSION=10.0.2
 
 # In order to set system PATH, ContainerAdministrator must be used
 USER ContainerAdministrator
diff --git a/src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile
index 7a07249cb2..4bcb336ee0 100644
--- a/src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile
+++ b/src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
@@ -20,10 +20,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-noble-chiseled-extra-amd64
+FROM $REPO:10.0.2-noble-chiseled-extra-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile
index 29f766299a..e08d556c5d 100644
--- a/src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile
+++ b/src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
@@ -20,10 +20,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-noble-chiseled-extra-arm32v7
+FROM $REPO:10.0.2-noble-chiseled-extra-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile
index 3b3ca71cfa..77574d53f2 100644
--- a/src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile
+++ b/src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
@@ -20,10 +20,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-noble-chiseled-extra-arm64v8
+FROM $REPO:10.0.2-noble-chiseled-extra-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/10.0/noble-chiseled/amd64/Dockerfile b/src/runtime/10.0/noble-chiseled/amd64/Dockerfile
index 8b4dd96945..eeff9afeff 100644
--- a/src/runtime/10.0/noble-chiseled/amd64/Dockerfile
+++ b/src/runtime/10.0/noble-chiseled/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
@@ -20,10 +20,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-noble-chiseled-amd64
+FROM $REPO:10.0.2-noble-chiseled-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile b/src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile
index a54429b18f..f78c9acdbb 100644
--- a/src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile
+++ b/src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
@@ -20,10 +20,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-noble-chiseled-arm32v7
+FROM $REPO:10.0.2-noble-chiseled-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile
index 8df23a6eed..5f61effda8 100644
--- a/src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile
+++ b/src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
@@ -20,10 +20,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-noble-chiseled-arm64v8
+FROM $REPO:10.0.2-noble-chiseled-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/10.0/noble/amd64/Dockerfile b/src/runtime/10.0/noble/amd64/Dockerfile
index cf89614bb8..10566da8e7 100644
--- a/src/runtime/10.0/noble/amd64/Dockerfile
+++ b/src/runtime/10.0/noble/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \
@@ -17,10 +17,10 @@ RUN dotnet_version=10.0.1 \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-noble-amd64
+FROM $REPO:10.0.2-noble-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/10.0/noble/arm32v7/Dockerfile b/src/runtime/10.0/noble/arm32v7/Dockerfile
index 4709701db2..25bf729520 100644
--- a/src/runtime/10.0/noble/arm32v7/Dockerfile
+++ b/src/runtime/10.0/noble/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \
@@ -17,10 +17,10 @@ RUN dotnet_version=10.0.1 \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-noble-arm32v7
+FROM $REPO:10.0.2-noble-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/10.0/noble/arm64v8/Dockerfile b/src/runtime/10.0/noble/arm64v8/Dockerfile
index 27d83a6789..18d6379eab 100644
--- a/src/runtime/10.0/noble/arm64v8/Dockerfile
+++ b/src/runtime/10.0/noble/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=10.0.1 \
+RUN dotnet_version=10.0.2 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \
@@ -17,10 +17,10 @@ RUN dotnet_version=10.0.1 \
 
 
 # .NET runtime image
-FROM $REPO:10.0.1-noble-arm64v8
+FROM $REPO:10.0.2-noble-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=10.0.1
+ENV DOTNET_VERSION=10.0.2
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile
index 98afb24423..1e0cddebbc 100644
--- a/src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile
+++ b/src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '10.0.1'; `
+        $dotnet_version = '10.0.2'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; `
         `
@@ -36,7 +36,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1
+    DOTNET_VERSION=10.0.2
 
 RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
 
diff --git a/src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile
index eab5976973..741d0eea2c 100644
--- a/src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '10.0.1'; `
+        $dotnet_version = '10.0.2'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; `
         `
@@ -36,7 +36,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=10.0.1
+    DOTNET_VERSION=10.0.2
 
 RUN setx /M PATH "%PATH%;C:\Program Files\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..958ae44b02
--- /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.23-alpine3.22-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.23 \
+    && 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.23-alpine3.22-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.23
+
+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..862a40e200
--- /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.23-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.23 \
+    && 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.23-alpine3.22-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.23
+
+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..b2757c8f49
--- /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.23-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.23 \
+    && 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.23-alpine3.22-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.23
+
+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/amd64/Dockerfile b/src/runtime/8.0/alpine3.22/amd64/Dockerfile
index fa1b4b1ccd..350f51727e 100644
--- a/src/runtime/8.0/alpine3.22/amd64/Dockerfile
+++ b/src/runtime/8.0/alpine3.22/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.22-amd64 AS installer
+FROM $REPO:8.0.23-alpine3.22-amd64 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-alpine3.22-amd64
+FROM $REPO:8.0.23-alpine3.22-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/alpine3.22/arm32v7/Dockerfile b/src/runtime/8.0/alpine3.22/arm32v7/Dockerfile
index 7d449b1eed..1ac6510369 100644
--- a/src/runtime/8.0/alpine3.22/arm32v7/Dockerfile
+++ b/src/runtime/8.0/alpine3.22/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.22-arm32v7 AS installer
+FROM $REPO:8.0.23-alpine3.22-arm32v7 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-alpine3.22-arm32v7
+FROM $REPO:8.0.23-alpine3.22-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/alpine3.22/arm64v8/Dockerfile b/src/runtime/8.0/alpine3.22/arm64v8/Dockerfile
index d4d0a4bb66..d252d8911f 100644
--- a/src/runtime/8.0/alpine3.22/arm64v8/Dockerfile
+++ b/src/runtime/8.0/alpine3.22/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.22-arm64v8 AS installer
+FROM $REPO:8.0.23-alpine3.22-arm64v8 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-alpine3.22-arm64v8
+FROM $REPO:8.0.23-alpine3.22-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/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..10a3739a1b
--- /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.23-alpine3.23-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.23 \
+    && 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.23-alpine3.23-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.23
+
+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..278344c0ba
--- /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.23-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.23 \
+    && 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.23-alpine3.23-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.23
+
+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..c50c4d399e
--- /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.23-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=8.0.23 \
+    && 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.23-alpine3.23-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=8.0.23
+
+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/amd64/Dockerfile b/src/runtime/8.0/alpine3.23/amd64/Dockerfile
index 1a5e94bb53..c306781ed6 100644
--- a/src/runtime/8.0/alpine3.23/amd64/Dockerfile
+++ b/src/runtime/8.0/alpine3.23/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.23-amd64 AS installer
+FROM $REPO:8.0.23-alpine3.23-amd64 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-alpine3.23-amd64
+FROM $REPO:8.0.23-alpine3.23-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/alpine3.23/arm32v7/Dockerfile b/src/runtime/8.0/alpine3.23/arm32v7/Dockerfile
index 06e5984fd1..62ba43f9f9 100644
--- a/src/runtime/8.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/runtime/8.0/alpine3.23/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.23-arm32v7 AS installer
+FROM $REPO:8.0.23-alpine3.23-arm32v7 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-alpine3.23-arm32v7
+FROM $REPO:8.0.23-alpine3.23-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/alpine3.23/arm64v8/Dockerfile b/src/runtime/8.0/alpine3.23/arm64v8/Dockerfile
index f515c6516a..86119d92dd 100644
--- a/src/runtime/8.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/runtime/8.0/alpine3.23/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-alpine3.23-arm64v8 AS installer
+FROM $REPO:8.0.23-alpine3.23-arm64v8 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-alpine3.23-arm64v8
+FROM $REPO:8.0.23-alpine3.23-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
index 462ed6648f..7883bcb60d 100644
--- a/src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
+++ b/src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -27,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-extra-amd64
+FROM $REPO:8.0.23-azurelinux3.0-distroless-extra-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
index 2dc57dfec7..b194f9f2ea 100644
--- a/src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
+++ b/src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -27,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-extra-arm64v8
+FROM $REPO:8.0.23-azurelinux3.0-distroless-extra-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile
index 15809e56cf..23dce5543d 100644
--- a/src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile
+++ b/src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -27,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-amd64
+FROM $REPO:8.0.23-azurelinux3.0-distroless-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile
index 21f2799ab4..e6618451a6 100644
--- a/src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile
+++ b/src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -27,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-azurelinux3.0-distroless-arm64v8
+FROM $REPO:8.0.23-azurelinux3.0-distroless-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/azurelinux3.0/amd64/Dockerfile b/src/runtime/8.0/azurelinux3.0/amd64/Dockerfile
index a0c7436fce..f8d0866215 100644
--- a/src/runtime/8.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/runtime/8.0/azurelinux3.0/amd64/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-azurelinux3.0-amd64 AS installer
+FROM $REPO:8.0.23-azurelinux3.0-amd64 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -22,10 +22,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-azurelinux3.0-amd64
+FROM $REPO:8.0.23-azurelinux3.0-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/azurelinux3.0/arm64v8/Dockerfile b/src/runtime/8.0/azurelinux3.0/arm64v8/Dockerfile
index 33877d6284..6e0fc1afae 100644
--- a/src/runtime/8.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/runtime/8.0/azurelinux3.0/arm64v8/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-azurelinux3.0-arm64v8 AS installer
+FROM $REPO:8.0.23-azurelinux3.0-arm64v8 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -22,10 +22,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-azurelinux3.0-arm64v8
+FROM $REPO:8.0.23-azurelinux3.0-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/bookworm-slim/amd64/Dockerfile b/src/runtime/8.0/bookworm-slim/amd64/Dockerfile
index 25206cbc48..9bea4bcfb2 100644
--- a/src/runtime/8.0/bookworm-slim/amd64/Dockerfile
+++ b/src/runtime/8.0/bookworm-slim/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:bookworm-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,10 +18,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-bookworm-slim-amd64
+FROM $REPO:8.0.23-bookworm-slim-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/bookworm-slim/arm32v7/Dockerfile b/src/runtime/8.0/bookworm-slim/arm32v7/Dockerfile
index bb455cc047..6195938e45 100644
--- a/src/runtime/8.0/bookworm-slim/arm32v7/Dockerfile
+++ b/src/runtime/8.0/bookworm-slim/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:bookworm-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,10 +18,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-bookworm-slim-arm32v7
+FROM $REPO:8.0.23-bookworm-slim-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/bookworm-slim/arm64v8/Dockerfile b/src/runtime/8.0/bookworm-slim/arm64v8/Dockerfile
index 4105c5782e..255e8120d5 100644
--- a/src/runtime/8.0/bookworm-slim/arm64v8/Dockerfile
+++ b/src/runtime/8.0/bookworm-slim/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:bookworm-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,10 +18,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-bookworm-slim-arm64v8
+FROM $REPO:8.0.23-bookworm-slim-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile b/src/runtime/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile
index d9a0bb5b2a..2c927cf5c6 100644
--- a/src/runtime/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile
+++ b/src/runtime/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -27,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-cbl-mariner2.0-distroless-extra-amd64
+FROM $REPO:8.0.23-cbl-mariner2.0-distroless-extra-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile b/src/runtime/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile
index dc0266f29b..4df21b4318 100644
--- a/src/runtime/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile
+++ b/src/runtime/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -27,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-cbl-mariner2.0-distroless-extra-arm64v8
+FROM $REPO:8.0.23-cbl-mariner2.0-distroless-extra-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/cbl-mariner2.0-distroless/amd64/Dockerfile b/src/runtime/8.0/cbl-mariner2.0-distroless/amd64/Dockerfile
index 24798bf8cf..55a249e016 100644
--- a/src/runtime/8.0/cbl-mariner2.0-distroless/amd64/Dockerfile
+++ b/src/runtime/8.0/cbl-mariner2.0-distroless/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -27,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-cbl-mariner2.0-distroless-amd64
+FROM $REPO:8.0.23-cbl-mariner2.0-distroless-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile b/src/runtime/8.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile
index f50dc1c915..9a2db8dc5e 100644
--- a/src/runtime/8.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile
+++ b/src/runtime/8.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -27,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-cbl-mariner2.0-distroless-arm64v8
+FROM $REPO:8.0.23-cbl-mariner2.0-distroless-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/cbl-mariner2.0/amd64/Dockerfile b/src/runtime/8.0/cbl-mariner2.0/amd64/Dockerfile
index b0ba318cf8..cd069f4223 100644
--- a/src/runtime/8.0/cbl-mariner2.0/amd64/Dockerfile
+++ b/src/runtime/8.0/cbl-mariner2.0/amd64/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-cbl-mariner2.0-amd64 AS installer
+FROM $REPO:8.0.23-cbl-mariner2.0-amd64 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -22,10 +22,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-cbl-mariner2.0-amd64
+FROM $REPO:8.0.23-cbl-mariner2.0-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/cbl-mariner2.0/arm64v8/Dockerfile b/src/runtime/8.0/cbl-mariner2.0/arm64v8/Dockerfile
index c2dc785706..6e4d508b81 100644
--- a/src/runtime/8.0/cbl-mariner2.0/arm64v8/Dockerfile
+++ b/src/runtime/8.0/cbl-mariner2.0/arm64v8/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:8.0.22-cbl-mariner2.0-arm64v8 AS installer
+FROM $REPO:8.0.23-cbl-mariner2.0-arm64v8 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -22,10 +22,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-cbl-mariner2.0-arm64v8
+FROM $REPO:8.0.23-cbl-mariner2.0-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/jammy-chiseled-extra/amd64/Dockerfile b/src/runtime/8.0/jammy-chiseled-extra/amd64/Dockerfile
index bc873126da..3ebf217c1b 100644
--- a/src/runtime/8.0/jammy-chiseled-extra/amd64/Dockerfile
+++ b/src/runtime/8.0/jammy-chiseled-extra/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-jammy-chiseled-extra-amd64
+FROM $REPO:8.0.23-jammy-chiseled-extra-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/jammy-chiseled-extra/arm32v7/Dockerfile b/src/runtime/8.0/jammy-chiseled-extra/arm32v7/Dockerfile
index 96fa147f5b..4ce02bd81b 100644
--- a/src/runtime/8.0/jammy-chiseled-extra/arm32v7/Dockerfile
+++ b/src/runtime/8.0/jammy-chiseled-extra/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-jammy-chiseled-extra-arm32v7
+FROM $REPO:8.0.23-jammy-chiseled-extra-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/jammy-chiseled-extra/arm64v8/Dockerfile b/src/runtime/8.0/jammy-chiseled-extra/arm64v8/Dockerfile
index ef70e05e53..a00857af44 100644
--- a/src/runtime/8.0/jammy-chiseled-extra/arm64v8/Dockerfile
+++ b/src/runtime/8.0/jammy-chiseled-extra/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-jammy-chiseled-extra-arm64v8
+FROM $REPO:8.0.23-jammy-chiseled-extra-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/jammy-chiseled/amd64/Dockerfile b/src/runtime/8.0/jammy-chiseled/amd64/Dockerfile
index 369f15dd52..1179688b76 100644
--- a/src/runtime/8.0/jammy-chiseled/amd64/Dockerfile
+++ b/src/runtime/8.0/jammy-chiseled/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-jammy-chiseled-amd64
+FROM $REPO:8.0.23-jammy-chiseled-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/jammy-chiseled/arm32v7/Dockerfile b/src/runtime/8.0/jammy-chiseled/arm32v7/Dockerfile
index fd4419db1f..5bab0fae08 100644
--- a/src/runtime/8.0/jammy-chiseled/arm32v7/Dockerfile
+++ b/src/runtime/8.0/jammy-chiseled/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-jammy-chiseled-arm32v7
+FROM $REPO:8.0.23-jammy-chiseled-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/jammy-chiseled/arm64v8/Dockerfile b/src/runtime/8.0/jammy-chiseled/arm64v8/Dockerfile
index 526f98dfa2..e252db9631 100644
--- a/src/runtime/8.0/jammy-chiseled/arm64v8/Dockerfile
+++ b/src/runtime/8.0/jammy-chiseled/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-jammy-chiseled-arm64v8
+FROM $REPO:8.0.23-jammy-chiseled-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/jammy/amd64/Dockerfile b/src/runtime/8.0/jammy/amd64/Dockerfile
index c0caee4df2..69eb811e6b 100644
--- a/src/runtime/8.0/jammy/amd64/Dockerfile
+++ b/src/runtime/8.0/jammy/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,10 +18,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-jammy-amd64
+FROM $REPO:8.0.23-jammy-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/jammy/arm32v7/Dockerfile b/src/runtime/8.0/jammy/arm32v7/Dockerfile
index 92ddff30ab..0c3f034b59 100644
--- a/src/runtime/8.0/jammy/arm32v7/Dockerfile
+++ b/src/runtime/8.0/jammy/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,10 +18,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-jammy-arm32v7
+FROM $REPO:8.0.23-jammy-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/jammy/arm64v8/Dockerfile b/src/runtime/8.0/jammy/arm64v8/Dockerfile
index ea0504c2ad..bbb31ce710 100644
--- a/src/runtime/8.0/jammy/arm64v8/Dockerfile
+++ b/src/runtime/8.0/jammy/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,10 +18,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-jammy-arm64v8
+FROM $REPO:8.0.23-jammy-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/nanoserver-1809/amd64/Dockerfile b/src/runtime/8.0/nanoserver-1809/amd64/Dockerfile
index 6c6d4473d6..43baf0d2b2 100644
--- a/src/runtime/8.0/nanoserver-1809/amd64/Dockerfile
+++ b/src/runtime/8.0/nanoserver-1809/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '8.0.22'; `
+        $dotnet_version = '8.0.23'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -45,7 +45,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22
+    DOTNET_VERSION=8.0.23
 
 # In order to set system PATH, ContainerAdministrator must be used
 USER ContainerAdministrator
diff --git a/src/runtime/8.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/runtime/8.0/nanoserver-ltsc2022/amd64/Dockerfile
index d31060e381..171723db59 100644
--- a/src/runtime/8.0/nanoserver-ltsc2022/amd64/Dockerfile
+++ b/src/runtime/8.0/nanoserver-ltsc2022/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '8.0.22'; `
+        $dotnet_version = '8.0.23'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -45,7 +45,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22
+    DOTNET_VERSION=8.0.23
 
 # In order to set system PATH, ContainerAdministrator must be used
 USER ContainerAdministrator
diff --git a/src/runtime/8.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/runtime/8.0/nanoserver-ltsc2025/amd64/Dockerfile
index 983d0e1af0..b9db26b5dd 100644
--- a/src/runtime/8.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/runtime/8.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '8.0.22'; `
+        $dotnet_version = '8.0.23'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -45,7 +45,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22
+    DOTNET_VERSION=8.0.23
 
 # In order to set system PATH, ContainerAdministrator must be used
 USER ContainerAdministrator
diff --git a/src/runtime/8.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime/8.0/noble-chiseled-extra/amd64/Dockerfile
index 14f6eeae57..50241403ad 100644
--- a/src/runtime/8.0/noble-chiseled-extra/amd64/Dockerfile
+++ b/src/runtime/8.0/noble-chiseled-extra/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-noble-chiseled-extra-amd64
+FROM $REPO:8.0.23-noble-chiseled-extra-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime/8.0/noble-chiseled-extra/arm64v8/Dockerfile
index b8a71a1c70..8c2511432e 100644
--- a/src/runtime/8.0/noble-chiseled-extra/arm64v8/Dockerfile
+++ b/src/runtime/8.0/noble-chiseled-extra/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-noble-chiseled-extra-arm64v8
+FROM $REPO:8.0.23-noble-chiseled-extra-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/noble-chiseled/amd64/Dockerfile b/src/runtime/8.0/noble-chiseled/amd64/Dockerfile
index bac3b4b9a4..6de80c107d 100644
--- a/src/runtime/8.0/noble-chiseled/amd64/Dockerfile
+++ b/src/runtime/8.0/noble-chiseled/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-noble-chiseled-amd64
+FROM $REPO:8.0.23-noble-chiseled-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime/8.0/noble-chiseled/arm64v8/Dockerfile
index 74207b7619..79155d8b56 100644
--- a/src/runtime/8.0/noble-chiseled/arm64v8/Dockerfile
+++ b/src/runtime/8.0/noble-chiseled/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-noble-chiseled-arm64v8
+FROM $REPO:8.0.23-noble-chiseled-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/8.0/noble/amd64/Dockerfile b/src/runtime/8.0/noble/amd64/Dockerfile
index 068cb7b07e..466b1b8463 100644
--- a/src/runtime/8.0/noble/amd64/Dockerfile
+++ b/src/runtime/8.0/noble/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,10 +18,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-noble-amd64
+FROM $REPO:8.0.23-noble-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/noble/arm64v8/Dockerfile b/src/runtime/8.0/noble/arm64v8/Dockerfile
index f872e5c589..206a7d5451 100644
--- a/src/runtime/8.0/noble/arm64v8/Dockerfile
+++ b/src/runtime/8.0/noble/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=8.0.22 \
+RUN dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,10 +18,10 @@ RUN dotnet_version=8.0.22 \
 
 
 # .NET runtime image
-FROM $REPO:8.0.22-noble-arm64v8
+FROM $REPO:8.0.23-noble-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=8.0.22
+ENV DOTNET_VERSION=8.0.23
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/8.0/windowsservercore-ltsc2019/amd64/Dockerfile b/src/runtime/8.0/windowsservercore-ltsc2019/amd64/Dockerfile
index 08ae47f8ad..1d7e868254 100644
--- a/src/runtime/8.0/windowsservercore-ltsc2019/amd64/Dockerfile
+++ b/src/runtime/8.0/windowsservercore-ltsc2019/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '8.0.22'; `
+        $dotnet_version = '8.0.23'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -45,7 +45,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22
+    DOTNET_VERSION=8.0.23
 
 RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
 
diff --git a/src/runtime/8.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/runtime/8.0/windowsservercore-ltsc2022/amd64/Dockerfile
index 89e65e44f9..a20b1222b0 100644
--- a/src/runtime/8.0/windowsservercore-ltsc2022/amd64/Dockerfile
+++ b/src/runtime/8.0/windowsservercore-ltsc2022/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '8.0.22'; `
+        $dotnet_version = '8.0.23'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -45,7 +45,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22
+    DOTNET_VERSION=8.0.23
 
 RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
 
diff --git a/src/runtime/8.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/runtime/8.0/windowsservercore-ltsc2025/amd64/Dockerfile
index 8ba79e4d33..b92dfcdd97 100644
--- a/src/runtime/8.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/runtime/8.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '8.0.22'; `
+        $dotnet_version = '8.0.23'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -45,7 +45,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=8.0.22
+    DOTNET_VERSION=8.0.23
 
 RUN setx /M PATH "%PATH%;C:\Program Files\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..86397ae16f
--- /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.12-alpine3.22-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.12 \
+    && 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.12-alpine3.22-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.12
+
+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..8a70bee204
--- /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.12-alpine3.22-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.12 \
+    && 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.12-alpine3.22-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.12
+
+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..37af3d176a
--- /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.12-alpine3.22-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.12 \
+    && 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.12-alpine3.22-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.12
+
+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/amd64/Dockerfile b/src/runtime/9.0/alpine3.22/amd64/Dockerfile
index 321787e556..4da74916c3 100644
--- a/src/runtime/9.0/alpine3.22/amd64/Dockerfile
+++ b/src/runtime/9.0/alpine3.22/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.22-amd64 AS installer
+FROM $REPO:9.0.12-alpine3.22-amd64 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=9.0.11 \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-alpine3.22-amd64
+FROM $REPO:9.0.12-alpine3.22-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/9.0/alpine3.22/arm32v7/Dockerfile b/src/runtime/9.0/alpine3.22/arm32v7/Dockerfile
index 8013f6bee9..ec1573f800 100644
--- a/src/runtime/9.0/alpine3.22/arm32v7/Dockerfile
+++ b/src/runtime/9.0/alpine3.22/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.22-arm32v7 AS installer
+FROM $REPO:9.0.12-alpine3.22-arm32v7 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=9.0.11 \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-alpine3.22-arm32v7
+FROM $REPO:9.0.12-alpine3.22-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/9.0/alpine3.22/arm64v8/Dockerfile b/src/runtime/9.0/alpine3.22/arm64v8/Dockerfile
index 64f25603d3..1ad2a9a376 100644
--- a/src/runtime/9.0/alpine3.22/arm64v8/Dockerfile
+++ b/src/runtime/9.0/alpine3.22/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.22-arm64v8 AS installer
+FROM $REPO:9.0.12-alpine3.22-arm64v8 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=9.0.11 \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-alpine3.22-arm64v8
+FROM $REPO:9.0.12-alpine3.22-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/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..bbc5654a25
--- /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.12-alpine3.23-extra-amd64 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.12 \
+    && 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.12-alpine3.23-extra-amd64
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.12
+
+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..94405b9a1a
--- /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.12-alpine3.23-extra-arm32v7 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.12 \
+    && 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.12-alpine3.23-extra-arm32v7
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.12
+
+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..d1996b31df
--- /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.12-alpine3.23-extra-arm64v8 AS installer
+
+# Retrieve .NET Runtime
+RUN dotnet_version=9.0.12 \
+    && 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.12-alpine3.23-extra-arm64v8
+
+# .NET Runtime version
+ENV DOTNET_VERSION=9.0.12
+
+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/amd64/Dockerfile b/src/runtime/9.0/alpine3.23/amd64/Dockerfile
index 86edcec26f..e9d9456d5a 100644
--- a/src/runtime/9.0/alpine3.23/amd64/Dockerfile
+++ b/src/runtime/9.0/alpine3.23/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.23-amd64 AS installer
+FROM $REPO:9.0.12-alpine3.23-amd64 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=9.0.11 \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-alpine3.23-amd64
+FROM $REPO:9.0.12-alpine3.23-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/9.0/alpine3.23/arm32v7/Dockerfile b/src/runtime/9.0/alpine3.23/arm32v7/Dockerfile
index a0c25d537b..284d66946b 100644
--- a/src/runtime/9.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/runtime/9.0/alpine3.23/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.23-arm32v7 AS installer
+FROM $REPO:9.0.12-alpine3.23-arm32v7 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=9.0.11 \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-alpine3.23-arm32v7
+FROM $REPO:9.0.12-alpine3.23-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/9.0/alpine3.23/arm64v8/Dockerfile b/src/runtime/9.0/alpine3.23/arm64v8/Dockerfile
index dfdc34d85b..5e227dda47 100644
--- a/src/runtime/9.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/runtime/9.0/alpine3.23/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:9.0.11-alpine3.23-arm64v8 AS installer
+FROM $REPO:9.0.12-alpine3.23-arm64v8 AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && 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 \
@@ -17,10 +17,10 @@ RUN dotnet_version=9.0.11 \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-alpine3.23-arm64v8
+FROM $REPO:9.0.12-alpine3.23-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
index 73bdf13dd0..d8221df27e 100644
--- a/src/runtime/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
+++ b/src/runtime/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -27,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-azurelinux3.0-distroless-extra-amd64
+FROM $REPO:9.0.12-azurelinux3.0-distroless-extra-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
index 85a750f76b..e787c750ed 100644
--- a/src/runtime/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
+++ b/src/runtime/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -27,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-azurelinux3.0-distroless-extra-arm64v8
+FROM $REPO:9.0.12-azurelinux3.0-distroless-extra-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/9.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime/9.0/azurelinux3.0-distroless/amd64/Dockerfile
index 5d659a5681..09a55c81b4 100644
--- a/src/runtime/9.0/azurelinux3.0-distroless/amd64/Dockerfile
+++ b/src/runtime/9.0/azurelinux3.0-distroless/amd64/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -27,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-azurelinux3.0-distroless-amd64
+FROM $REPO:9.0.12-azurelinux3.0-distroless-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile
index 0056e2efb2..e529b43be7 100644
--- a/src/runtime/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile
+++ b/src/runtime/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile
@@ -10,7 +10,7 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -27,10 +27,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-azurelinux3.0-distroless-arm64v8
+FROM $REPO:9.0.12-azurelinux3.0-distroless-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/9.0/azurelinux3.0/amd64/Dockerfile b/src/runtime/9.0/azurelinux3.0/amd64/Dockerfile
index 44f4dc8eb2..4c7b3fa4b0 100644
--- a/src/runtime/9.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/runtime/9.0/azurelinux3.0/amd64/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:9.0.11-azurelinux3.0-amd64 AS installer
+FROM $REPO:9.0.12-azurelinux3.0-amd64 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -22,10 +22,10 @@ RUN dotnet_version=9.0.11 \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-azurelinux3.0-amd64
+FROM $REPO:9.0.12-azurelinux3.0-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/9.0/azurelinux3.0/arm64v8/Dockerfile b/src/runtime/9.0/azurelinux3.0/arm64v8/Dockerfile
index ba57120020..533e48a5c8 100644
--- a/src/runtime/9.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/runtime/9.0/azurelinux3.0/arm64v8/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 
 # Installer image
-FROM $REPO:9.0.11-azurelinux3.0-arm64v8 AS installer
+FROM $REPO:9.0.12-azurelinux3.0-arm64v8 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -22,10 +22,10 @@ RUN dotnet_version=9.0.11 \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-azurelinux3.0-arm64v8
+FROM $REPO:9.0.12-azurelinux3.0-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/9.0/bookworm-slim/amd64/Dockerfile b/src/runtime/9.0/bookworm-slim/amd64/Dockerfile
index b8d721bb5e..24eba7116e 100644
--- a/src/runtime/9.0/bookworm-slim/amd64/Dockerfile
+++ b/src/runtime/9.0/bookworm-slim/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:bookworm-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,10 +18,10 @@ RUN dotnet_version=9.0.11 \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-bookworm-slim-amd64
+FROM $REPO:9.0.12-bookworm-slim-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/9.0/bookworm-slim/arm32v7/Dockerfile b/src/runtime/9.0/bookworm-slim/arm32v7/Dockerfile
index 92cd318698..f58b74be83 100644
--- a/src/runtime/9.0/bookworm-slim/arm32v7/Dockerfile
+++ b/src/runtime/9.0/bookworm-slim/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:bookworm-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,10 +18,10 @@ RUN dotnet_version=9.0.11 \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-bookworm-slim-arm32v7
+FROM $REPO:9.0.12-bookworm-slim-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/9.0/bookworm-slim/arm64v8/Dockerfile b/src/runtime/9.0/bookworm-slim/arm64v8/Dockerfile
index 9b6ac8f9b7..a101213524 100644
--- a/src/runtime/9.0/bookworm-slim/arm64v8/Dockerfile
+++ b/src/runtime/9.0/bookworm-slim/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:bookworm-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,10 +18,10 @@ RUN dotnet_version=9.0.11 \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-bookworm-slim-arm64v8
+FROM $REPO:9.0.12-bookworm-slim-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/9.0/nanoserver-1809/amd64/Dockerfile b/src/runtime/9.0/nanoserver-1809/amd64/Dockerfile
index 1543b89c5f..64233d9f82 100644
--- a/src/runtime/9.0/nanoserver-1809/amd64/Dockerfile
+++ b/src/runtime/9.0/nanoserver-1809/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '9.0.11'; `
+        $dotnet_version = '9.0.12'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -45,7 +45,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11
+    DOTNET_VERSION=9.0.12
 
 # In order to set system PATH, ContainerAdministrator must be used
 USER ContainerAdministrator
diff --git a/src/runtime/9.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/runtime/9.0/nanoserver-ltsc2022/amd64/Dockerfile
index 2d1e50edd8..5a7b6ce4a7 100644
--- a/src/runtime/9.0/nanoserver-ltsc2022/amd64/Dockerfile
+++ b/src/runtime/9.0/nanoserver-ltsc2022/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '9.0.11'; `
+        $dotnet_version = '9.0.12'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -45,7 +45,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11
+    DOTNET_VERSION=9.0.12
 
 # In order to set system PATH, ContainerAdministrator must be used
 USER ContainerAdministrator
diff --git a/src/runtime/9.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/runtime/9.0/nanoserver-ltsc2025/amd64/Dockerfile
index d8bf2de65f..0705b0c293 100644
--- a/src/runtime/9.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/runtime/9.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '9.0.11'; `
+        $dotnet_version = '9.0.12'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -45,7 +45,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11
+    DOTNET_VERSION=9.0.12
 
 # In order to set system PATH, ContainerAdministrator must be used
 USER ContainerAdministrator
diff --git a/src/runtime/9.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime/9.0/noble-chiseled-extra/amd64/Dockerfile
index 07cc5f6a89..31881634e7 100644
--- a/src/runtime/9.0/noble-chiseled-extra/amd64/Dockerfile
+++ b/src/runtime/9.0/noble-chiseled-extra/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-noble-chiseled-extra-amd64
+FROM $REPO:9.0.12-noble-chiseled-extra-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/9.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/runtime/9.0/noble-chiseled-extra/arm32v7/Dockerfile
index 307c66537c..c29ef8948f 100644
--- a/src/runtime/9.0/noble-chiseled-extra/arm32v7/Dockerfile
+++ b/src/runtime/9.0/noble-chiseled-extra/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-noble-chiseled-extra-arm32v7
+FROM $REPO:9.0.12-noble-chiseled-extra-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/9.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime/9.0/noble-chiseled-extra/arm64v8/Dockerfile
index 18866e299a..06103d9c37 100644
--- a/src/runtime/9.0/noble-chiseled-extra/arm64v8/Dockerfile
+++ b/src/runtime/9.0/noble-chiseled-extra/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-noble-chiseled-extra-arm64v8
+FROM $REPO:9.0.12-noble-chiseled-extra-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/9.0/noble-chiseled/amd64/Dockerfile b/src/runtime/9.0/noble-chiseled/amd64/Dockerfile
index 92145f4d12..ddeff84574 100644
--- a/src/runtime/9.0/noble-chiseled/amd64/Dockerfile
+++ b/src/runtime/9.0/noble-chiseled/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-noble-chiseled-amd64
+FROM $REPO:9.0.12-noble-chiseled-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/9.0/noble-chiseled/arm32v7/Dockerfile b/src/runtime/9.0/noble-chiseled/arm32v7/Dockerfile
index 1b2e564885..950216baad 100644
--- a/src/runtime/9.0/noble-chiseled/arm32v7/Dockerfile
+++ b/src/runtime/9.0/noble-chiseled/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-noble-chiseled-arm32v7
+FROM $REPO:9.0.12-noble-chiseled-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/9.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime/9.0/noble-chiseled/arm64v8/Dockerfile
index 4c26e4d88a..54565360ad 100644
--- a/src/runtime/9.0/noble-chiseled/arm64v8/Dockerfile
+++ b/src/runtime/9.0/noble-chiseled/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -21,10 +21,10 @@ RUN mkdir /dotnet-symlink \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-noble-chiseled-arm64v8
+FROM $REPO:9.0.12-noble-chiseled-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
 COPY --from=installer ["/dotnet-symlink", "/usr/bin"]
diff --git a/src/runtime/9.0/noble/amd64/Dockerfile b/src/runtime/9.0/noble/amd64/Dockerfile
index bf7d8dae24..6bf56dfb6e 100644
--- a/src/runtime/9.0/noble/amd64/Dockerfile
+++ b/src/runtime/9.0/noble/amd64/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,10 +18,10 @@ RUN dotnet_version=9.0.11 \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-noble-amd64
+FROM $REPO:9.0.12-noble-amd64
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/9.0/noble/arm32v7/Dockerfile b/src/runtime/9.0/noble/arm32v7/Dockerfile
index 7c55b7e012..b88599afee 100644
--- a/src/runtime/9.0/noble/arm32v7/Dockerfile
+++ b/src/runtime/9.0/noble/arm32v7/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,10 +18,10 @@ RUN dotnet_version=9.0.11 \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-noble-arm32v7
+FROM $REPO:9.0.12-noble-arm32v7
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/9.0/noble/arm64v8/Dockerfile b/src/runtime/9.0/noble/arm64v8/Dockerfile
index 7e3f1d7bca..03e0322cdb 100644
--- a/src/runtime/9.0/noble/arm64v8/Dockerfile
+++ b/src/runtime/9.0/noble/arm64v8/Dockerfile
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Retrieve .NET Runtime
-RUN dotnet_version=9.0.11 \
+RUN dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,10 +18,10 @@ RUN dotnet_version=9.0.11 \
 
 
 # .NET runtime image
-FROM $REPO:9.0.11-noble-arm64v8
+FROM $REPO:9.0.12-noble-arm64v8
 
 # .NET Runtime version
-ENV DOTNET_VERSION=9.0.11
+ENV DOTNET_VERSION=9.0.12
 
 COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
 
diff --git a/src/runtime/9.0/windowsservercore-ltsc2019/amd64/Dockerfile b/src/runtime/9.0/windowsservercore-ltsc2019/amd64/Dockerfile
index d22889601f..1b963fd56c 100644
--- a/src/runtime/9.0/windowsservercore-ltsc2019/amd64/Dockerfile
+++ b/src/runtime/9.0/windowsservercore-ltsc2019/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '9.0.11'; `
+        $dotnet_version = '9.0.12'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -45,7 +45,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11
+    DOTNET_VERSION=9.0.12
 
 RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
 
diff --git a/src/runtime/9.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/runtime/9.0/windowsservercore-ltsc2022/amd64/Dockerfile
index edc548ecfb..eb9b49b397 100644
--- a/src/runtime/9.0/windowsservercore-ltsc2022/amd64/Dockerfile
+++ b/src/runtime/9.0/windowsservercore-ltsc2022/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '9.0.11'; `
+        $dotnet_version = '9.0.12'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -45,7 +45,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11
+    DOTNET_VERSION=9.0.12
 
 RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
 
diff --git a/src/runtime/9.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/runtime/9.0/windowsservercore-ltsc2025/amd64/Dockerfile
index 5a054d8ae9..499d785f4a 100644
--- a/src/runtime/9.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/runtime/9.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `
         `
-        $dotnet_version = '9.0.11'; `
+        $dotnet_version = '9.0.12'; `
         $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -45,7 +45,7 @@ ENV `
     # Enable detection of running in a container
     DOTNET_RUNNING_IN_CONTAINER=true `
     # .NET Runtime version
-    DOTNET_VERSION=9.0.11
+    DOTNET_VERSION=9.0.12
 
 RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
 
diff --git a/src/sdk/10.0/alpine3.22-aot/amd64/Dockerfile b/src/sdk/10.0/alpine3.22-aot/amd64/Dockerfile
index f0ea30ee69..968692f524 100644
--- a/src/sdk/10.0/alpine3.22-aot/amd64/Dockerfile
+++ b/src/sdk/10.0/alpine3.22-aot/amd64/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:10.0.101-alpine3.22-amd64
+FROM $REPO:10.0.102-alpine3.22-amd64
 
 RUN apk add --upgrade --no-cache \
         build-base \
diff --git a/src/sdk/10.0/alpine3.22-aot/arm64v8/Dockerfile b/src/sdk/10.0/alpine3.22-aot/arm64v8/Dockerfile
index cc329458a9..3bd02c0620 100644
--- a/src/sdk/10.0/alpine3.22-aot/arm64v8/Dockerfile
+++ b/src/sdk/10.0/alpine3.22-aot/arm64v8/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:10.0.101-alpine3.22-arm64v8
+FROM $REPO:10.0.102-alpine3.22-arm64v8
 
 RUN apk add --upgrade --no-cache \
         build-base \
diff --git a/src/sdk/10.0/alpine3.22/amd64/Dockerfile b/src/sdk/10.0/alpine3.22/amd64/Dockerfile
index 473843adb9..a8b86bc67b 100644
--- a/src/sdk/10.0/alpine3.22/amd64/Dockerfile
+++ b/src/sdk/10.0/alpine3.22/amd64/Dockerfile
@@ -1,9 +1,9 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:10.0.1-alpine3.22-amd64 AS installer
+FROM $REPO:10.0.2-alpine3.22-amd64 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=10.0.101 \
+RUN dotnet_sdk_version=10.0.102 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
@@ -16,7 +16,7 @@ RUN dotnet_sdk_version=10.0.101 \
 
 
 # .NET SDK image
-FROM $REPO:10.0.1-alpine3.22-amd64
+FROM $REPO:10.0.2-alpine3.22-amd64
 
 ENV \
     # Do not generate certificate
@@ -24,7 +24,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=10.0.101 \
+    DOTNET_SDK_VERSION=10.0.102 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/10.0/alpine3.22/arm32v7/Dockerfile b/src/sdk/10.0/alpine3.22/arm32v7/Dockerfile
index 8f1cb29456..ea46a40ca8 100644
--- a/src/sdk/10.0/alpine3.22/arm32v7/Dockerfile
+++ b/src/sdk/10.0/alpine3.22/arm32v7/Dockerfile
@@ -1,9 +1,9 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:10.0.1-alpine3.22-arm32v7 AS installer
+FROM $REPO:10.0.2-alpine3.22-arm32v7 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=10.0.101 \
+RUN dotnet_sdk_version=10.0.102 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
@@ -16,7 +16,7 @@ RUN dotnet_sdk_version=10.0.101 \
 
 
 # .NET SDK image
-FROM $REPO:10.0.1-alpine3.22-arm32v7
+FROM $REPO:10.0.2-alpine3.22-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -24,7 +24,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=10.0.101 \
+    DOTNET_SDK_VERSION=10.0.102 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/10.0/alpine3.22/arm64v8/Dockerfile b/src/sdk/10.0/alpine3.22/arm64v8/Dockerfile
index d118e48e69..b13dec6544 100644
--- a/src/sdk/10.0/alpine3.22/arm64v8/Dockerfile
+++ b/src/sdk/10.0/alpine3.22/arm64v8/Dockerfile
@@ -1,9 +1,9 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:10.0.1-alpine3.22-arm64v8 AS installer
+FROM $REPO:10.0.2-alpine3.22-arm64v8 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=10.0.101 \
+RUN dotnet_sdk_version=10.0.102 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
@@ -16,7 +16,7 @@ RUN dotnet_sdk_version=10.0.101 \
 
 
 # .NET SDK image
-FROM $REPO:10.0.1-alpine3.22-arm64v8
+FROM $REPO:10.0.2-alpine3.22-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -24,7 +24,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=10.0.101 \
+    DOTNET_SDK_VERSION=10.0.102 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/10.0/alpine3.23-aot/amd64/Dockerfile b/src/sdk/10.0/alpine3.23-aot/amd64/Dockerfile
index 7dc2e61272..66b175c0eb 100644
--- a/src/sdk/10.0/alpine3.23-aot/amd64/Dockerfile
+++ b/src/sdk/10.0/alpine3.23-aot/amd64/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:10.0.101-alpine3.23-amd64
+FROM $REPO:10.0.102-alpine3.23-amd64
 
 RUN apk add --upgrade --no-cache \
         build-base \
diff --git a/src/sdk/10.0/alpine3.23-aot/arm64v8/Dockerfile b/src/sdk/10.0/alpine3.23-aot/arm64v8/Dockerfile
index 98eca86888..903b07607e 100644
--- a/src/sdk/10.0/alpine3.23-aot/arm64v8/Dockerfile
+++ b/src/sdk/10.0/alpine3.23-aot/arm64v8/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:10.0.101-alpine3.23-arm64v8
+FROM $REPO:10.0.102-alpine3.23-arm64v8
 
 RUN apk add --upgrade --no-cache \
         build-base \
diff --git a/src/sdk/10.0/alpine3.23/amd64/Dockerfile b/src/sdk/10.0/alpine3.23/amd64/Dockerfile
index b22d1aa71c..71f23e6a57 100644
--- a/src/sdk/10.0/alpine3.23/amd64/Dockerfile
+++ b/src/sdk/10.0/alpine3.23/amd64/Dockerfile
@@ -1,9 +1,9 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:10.0.1-alpine3.23-amd64 AS installer
+FROM $REPO:10.0.2-alpine3.23-amd64 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=10.0.101 \
+RUN dotnet_sdk_version=10.0.102 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \
@@ -16,7 +16,7 @@ RUN dotnet_sdk_version=10.0.101 \
 
 
 # .NET SDK image
-FROM $REPO:10.0.1-alpine3.23-amd64
+FROM $REPO:10.0.2-alpine3.23-amd64
 
 ENV \
     # Do not generate certificate
@@ -24,7 +24,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=10.0.101 \
+    DOTNET_SDK_VERSION=10.0.102 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/10.0/alpine3.23/arm32v7/Dockerfile b/src/sdk/10.0/alpine3.23/arm32v7/Dockerfile
index 6ee30f21a4..4dc9693c4b 100644
--- a/src/sdk/10.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/sdk/10.0/alpine3.23/arm32v7/Dockerfile
@@ -1,9 +1,9 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:10.0.1-alpine3.23-arm32v7 AS installer
+FROM $REPO:10.0.2-alpine3.23-arm32v7 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=10.0.101 \
+RUN dotnet_sdk_version=10.0.102 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \
@@ -16,7 +16,7 @@ RUN dotnet_sdk_version=10.0.101 \
 
 
 # .NET SDK image
-FROM $REPO:10.0.1-alpine3.23-arm32v7
+FROM $REPO:10.0.2-alpine3.23-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -24,7 +24,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=10.0.101 \
+    DOTNET_SDK_VERSION=10.0.102 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/10.0/alpine3.23/arm64v8/Dockerfile b/src/sdk/10.0/alpine3.23/arm64v8/Dockerfile
index 0eb646f808..c23a034296 100644
--- a/src/sdk/10.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/sdk/10.0/alpine3.23/arm64v8/Dockerfile
@@ -1,9 +1,9 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:10.0.1-alpine3.23-arm64v8 AS installer
+FROM $REPO:10.0.2-alpine3.23-arm64v8 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=10.0.101 \
+RUN dotnet_sdk_version=10.0.102 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \
@@ -16,7 +16,7 @@ RUN dotnet_sdk_version=10.0.101 \
 
 
 # .NET SDK image
-FROM $REPO:10.0.1-alpine3.23-arm64v8
+FROM $REPO:10.0.2-alpine3.23-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -24,7 +24,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=10.0.101 \
+    DOTNET_SDK_VERSION=10.0.102 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/10.0/azurelinux3.0-aot/amd64/Dockerfile b/src/sdk/10.0/azurelinux3.0-aot/amd64/Dockerfile
index 1c7e848458..ba016d9132 100644
--- a/src/sdk/10.0/azurelinux3.0-aot/amd64/Dockerfile
+++ b/src/sdk/10.0/azurelinux3.0-aot/amd64/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:10.0.101-azurelinux3.0-amd64
+FROM $REPO:10.0.102-azurelinux3.0-amd64
 
 RUN tdnf install -y \
         build-essential \
diff --git a/src/sdk/10.0/azurelinux3.0-aot/arm64v8/Dockerfile b/src/sdk/10.0/azurelinux3.0-aot/arm64v8/Dockerfile
index 5b088f9a1e..8457da2eff 100644
--- a/src/sdk/10.0/azurelinux3.0-aot/arm64v8/Dockerfile
+++ b/src/sdk/10.0/azurelinux3.0-aot/arm64v8/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:10.0.101-azurelinux3.0-arm64v8
+FROM $REPO:10.0.102-azurelinux3.0-arm64v8
 
 RUN tdnf install -y \
         build-essential \
diff --git a/src/sdk/10.0/azurelinux3.0/amd64/Dockerfile b/src/sdk/10.0/azurelinux3.0/amd64/Dockerfile
index e388785138..02cba4b1df 100644
--- a/src/sdk/10.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/sdk/10.0/azurelinux3.0/amd64/Dockerfile
@@ -1,13 +1,13 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:10.0.1-azurelinux3.0-amd64 AS installer
+FROM $REPO:10.0.2-azurelinux3.0-amd64 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Install .NET SDK
-RUN dotnet_sdk_version=10.0.101 \
+RUN dotnet_sdk_version=10.0.102 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
@@ -20,7 +20,7 @@ RUN dotnet_sdk_version=10.0.101 \
 
 
 # .NET SDK image
-FROM $REPO:10.0.1-azurelinux3.0-amd64
+FROM $REPO:10.0.2-azurelinux3.0-amd64
 
 ENV \
     # Do not generate certificate
@@ -28,7 +28,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=10.0.101 \
+    DOTNET_SDK_VERSION=10.0.102 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile b/src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile
index 4ac572246d..a6ff4ad182 100644
--- a/src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile
@@ -1,13 +1,13 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:10.0.1-azurelinux3.0-arm64v8 AS installer
+FROM $REPO:10.0.2-azurelinux3.0-arm64v8 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Install .NET SDK
-RUN dotnet_sdk_version=10.0.101 \
+RUN dotnet_sdk_version=10.0.102 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
@@ -20,7 +20,7 @@ RUN dotnet_sdk_version=10.0.101 \
 
 
 # .NET SDK image
-FROM $REPO:10.0.1-azurelinux3.0-arm64v8
+FROM $REPO:10.0.2-azurelinux3.0-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -28,7 +28,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=10.0.101 \
+    DOTNET_SDK_VERSION=10.0.102 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile
index 3946cf8dab..cd899870ca 100644
--- a/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile
+++ b/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile
@@ -25,7 +25,7 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '10.0.101'; `
+        $dotnet_sdk_version = '10.0.102'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; `
         `
@@ -64,7 +64,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:10.0.1-nanoserver-ltsc2022
+FROM $REPO:10.0.2-nanoserver-ltsc2022
 
 ENV `
     # Do not generate certificate
@@ -72,7 +72,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=10.0.101 `
+    DOTNET_SDK_VERSION=10.0.102 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile
index 2caf450bba..bff29bdf10 100644
--- a/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -25,7 +25,7 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '10.0.101'; `
+        $dotnet_sdk_version = '10.0.102'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; `
         `
@@ -64,7 +64,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:10.0.1-nanoserver-ltsc2025
+FROM $REPO:10.0.2-nanoserver-ltsc2025
 
 ENV `
     # Do not generate certificate
@@ -72,7 +72,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=10.0.101 `
+    DOTNET_SDK_VERSION=10.0.102 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/10.0/noble-aot/amd64/Dockerfile b/src/sdk/10.0/noble-aot/amd64/Dockerfile
index 8ba30f5c48..7ffc175572 100644
--- a/src/sdk/10.0/noble-aot/amd64/Dockerfile
+++ b/src/sdk/10.0/noble-aot/amd64/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:10.0.101-noble-amd64
+FROM $REPO:10.0.102-noble-amd64
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
diff --git a/src/sdk/10.0/noble-aot/arm64v8/Dockerfile b/src/sdk/10.0/noble-aot/arm64v8/Dockerfile
index 321805287e..d042b56109 100644
--- a/src/sdk/10.0/noble-aot/arm64v8/Dockerfile
+++ b/src/sdk/10.0/noble-aot/arm64v8/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG REPO=mcr.microsoft.com/dotnet/sdk
-FROM $REPO:10.0.101-noble-arm64v8
+FROM $REPO:10.0.102-noble-arm64v8
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
diff --git a/src/sdk/10.0/noble/amd64/Dockerfile b/src/sdk/10.0/noble/amd64/Dockerfile
index ee6455cc25..b0e9b34660 100644
--- a/src/sdk/10.0/noble/amd64/Dockerfile
+++ b/src/sdk/10.0/noble/amd64/Dockerfile
@@ -3,7 +3,7 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=10.0.101 \
+RUN dotnet_sdk_version=10.0.102 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \
@@ -16,7 +16,7 @@ RUN dotnet_sdk_version=10.0.101 \
 
 
 # .NET SDK image
-FROM $REPO:10.0.1-noble-amd64
+FROM $REPO:10.0.2-noble-amd64
 
 ENV \
     # Do not generate certificate
@@ -24,7 +24,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=10.0.101 \
+    DOTNET_SDK_VERSION=10.0.102 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/10.0/noble/arm32v7/Dockerfile b/src/sdk/10.0/noble/arm32v7/Dockerfile
index b68060deda..793e19a1df 100644
--- a/src/sdk/10.0/noble/arm32v7/Dockerfile
+++ b/src/sdk/10.0/noble/arm32v7/Dockerfile
@@ -3,7 +3,7 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=10.0.101 \
+RUN dotnet_sdk_version=10.0.102 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \
@@ -16,7 +16,7 @@ RUN dotnet_sdk_version=10.0.101 \
 
 
 # .NET SDK image
-FROM $REPO:10.0.1-noble-arm32v7
+FROM $REPO:10.0.2-noble-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -24,7 +24,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=10.0.101 \
+    DOTNET_SDK_VERSION=10.0.102 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/10.0/noble/arm64v8/Dockerfile b/src/sdk/10.0/noble/arm64v8/Dockerfile
index 3ae7b424be..0a95ea6634 100644
--- a/src/sdk/10.0/noble/arm64v8/Dockerfile
+++ b/src/sdk/10.0/noble/arm64v8/Dockerfile
@@ -3,7 +3,7 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=10.0.101 \
+RUN dotnet_sdk_version=10.0.102 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \
@@ -16,7 +16,7 @@ RUN dotnet_sdk_version=10.0.101 \
 
 
 # .NET SDK image
-FROM $REPO:10.0.1-noble-arm64v8
+FROM $REPO:10.0.2-noble-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -24,7 +24,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=10.0.101 \
+    DOTNET_SDK_VERSION=10.0.102 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile
index 3cc7cbc495..18f892e5cd 100644
--- a/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile
+++ b/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile
@@ -25,7 +25,7 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '10.0.101'; `
+        $dotnet_sdk_version = '10.0.102'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; `
         `
@@ -64,7 +64,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:10.0.1-windowsservercore-ltsc2022
+FROM $REPO:10.0.2-windowsservercore-ltsc2022
 
 ENV `
     # Do not generate certificate
@@ -72,7 +72,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=10.0.101 `
+    DOTNET_SDK_VERSION=10.0.102 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile
index 97b79c0e81..15403dd5ed 100644
--- a/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -25,7 +25,7 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '10.0.101'; `
+        $dotnet_sdk_version = '10.0.102'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; `
         `
@@ -64,7 +64,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:10.0.1-windowsservercore-ltsc2025
+FROM $REPO:10.0.2-windowsservercore-ltsc2025
 
 ENV `
     # Do not generate certificate
@@ -72,7 +72,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=10.0.101 `
+    DOTNET_SDK_VERSION=10.0.102 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/alpine3.22/amd64/Dockerfile b/src/sdk/8.0/alpine3.22/amd64/Dockerfile
index 339095bcd2..3e4082afff 100644
--- a/src/sdk/8.0/alpine3.22/amd64/Dockerfile
+++ b/src/sdk/8.0/alpine3.22/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:8.0.22-alpine3.22-amd64 AS installer
+FROM $REPO:8.0.23-alpine3.22-amd64 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -17,7 +17,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-alpine3.22-amd64
+FROM $REPO:8.0.23-alpine3.22-amd64
 
 ENV \
     # Do not generate certificate
@@ -25,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/8.0/alpine3.22/arm32v7/Dockerfile b/src/sdk/8.0/alpine3.22/arm32v7/Dockerfile
index 766a29310d..43f6846bf9 100644
--- a/src/sdk/8.0/alpine3.22/arm32v7/Dockerfile
+++ b/src/sdk/8.0/alpine3.22/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:8.0.22-alpine3.22-arm32v7 AS installer
+FROM $REPO:8.0.23-alpine3.22-arm32v7 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -17,7 +17,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-alpine3.22-arm32v7
+FROM $REPO:8.0.23-alpine3.22-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -25,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/8.0/alpine3.22/arm64v8/Dockerfile b/src/sdk/8.0/alpine3.22/arm64v8/Dockerfile
index ffbefaf03c..beb6390f20 100644
--- a/src/sdk/8.0/alpine3.22/arm64v8/Dockerfile
+++ b/src/sdk/8.0/alpine3.22/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:8.0.22-alpine3.22-arm64v8 AS installer
+FROM $REPO:8.0.23-alpine3.22-arm64v8 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -17,7 +17,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-alpine3.22-arm64v8
+FROM $REPO:8.0.23-alpine3.22-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -25,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/8.0/alpine3.23/amd64/Dockerfile b/src/sdk/8.0/alpine3.23/amd64/Dockerfile
index 7318927591..78a0c75972 100644
--- a/src/sdk/8.0/alpine3.23/amd64/Dockerfile
+++ b/src/sdk/8.0/alpine3.23/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:8.0.22-alpine3.23-amd64 AS installer
+FROM $REPO:8.0.23-alpine3.23-amd64 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -17,7 +17,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-alpine3.23-amd64
+FROM $REPO:8.0.23-alpine3.23-amd64
 
 ENV \
     # Do not generate certificate
@@ -25,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/8.0/alpine3.23/arm32v7/Dockerfile b/src/sdk/8.0/alpine3.23/arm32v7/Dockerfile
index a8ff987efb..b973df08f2 100644
--- a/src/sdk/8.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/sdk/8.0/alpine3.23/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:8.0.22-alpine3.23-arm32v7 AS installer
+FROM $REPO:8.0.23-alpine3.23-arm32v7 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -17,7 +17,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-alpine3.23-arm32v7
+FROM $REPO:8.0.23-alpine3.23-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -25,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/8.0/alpine3.23/arm64v8/Dockerfile b/src/sdk/8.0/alpine3.23/arm64v8/Dockerfile
index 764d600647..d46bd4dcc9 100644
--- a/src/sdk/8.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/sdk/8.0/alpine3.23/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:8.0.22-alpine3.23-arm64v8 AS installer
+FROM $REPO:8.0.23-alpine3.23-arm64v8 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -17,7 +17,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-alpine3.23-arm64v8
+FROM $REPO:8.0.23-alpine3.23-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -25,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/8.0/azurelinux3.0/amd64/Dockerfile b/src/sdk/8.0/azurelinux3.0/amd64/Dockerfile
index bd51c530f5..d3651a4434 100644
--- a/src/sdk/8.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/sdk/8.0/azurelinux3.0/amd64/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:8.0.22-azurelinux3.0-amd64 AS installer
+FROM $REPO:8.0.23-azurelinux3.0-amd64 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -22,7 +22,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-azurelinux3.0-amd64
+FROM $REPO:8.0.23-azurelinux3.0-amd64
 
 ENV \
     # Do not generate certificate
@@ -30,7 +30,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/azurelinux3.0/arm64v8/Dockerfile b/src/sdk/8.0/azurelinux3.0/arm64v8/Dockerfile
index 90e67bc474..6ecbdba4e9 100644
--- a/src/sdk/8.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/sdk/8.0/azurelinux3.0/arm64v8/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:8.0.22-azurelinux3.0-arm64v8 AS installer
+FROM $REPO:8.0.23-azurelinux3.0-arm64v8 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -22,7 +22,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-azurelinux3.0-arm64v8
+FROM $REPO:8.0.23-azurelinux3.0-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -30,7 +30,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/bookworm-slim/amd64/Dockerfile b/src/sdk/8.0/bookworm-slim/amd64/Dockerfile
index 903e06ad4a..b15301409c 100644
--- a/src/sdk/8.0/bookworm-slim/amd64/Dockerfile
+++ b/src/sdk/8.0/bookworm-slim/amd64/Dockerfile
@@ -3,8 +3,8 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM amd64/buildpack-deps:bookworm-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,7 +18,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-bookworm-slim-amd64
+FROM $REPO:8.0.23-bookworm-slim-amd64
 
 ENV \
     # Do not generate certificate
@@ -26,7 +26,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/bookworm-slim/arm32v7/Dockerfile b/src/sdk/8.0/bookworm-slim/arm32v7/Dockerfile
index d4bffe180d..fce8b7daf1 100644
--- a/src/sdk/8.0/bookworm-slim/arm32v7/Dockerfile
+++ b/src/sdk/8.0/bookworm-slim/arm32v7/Dockerfile
@@ -3,8 +3,8 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM arm32v7/buildpack-deps:bookworm-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,7 +18,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-bookworm-slim-arm32v7
+FROM $REPO:8.0.23-bookworm-slim-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -26,7 +26,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/bookworm-slim/arm64v8/Dockerfile b/src/sdk/8.0/bookworm-slim/arm64v8/Dockerfile
index b2a7cf3001..3a98219c32 100644
--- a/src/sdk/8.0/bookworm-slim/arm64v8/Dockerfile
+++ b/src/sdk/8.0/bookworm-slim/arm64v8/Dockerfile
@@ -3,8 +3,8 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM arm64v8/buildpack-deps:bookworm-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,7 +18,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-bookworm-slim-arm64v8
+FROM $REPO:8.0.23-bookworm-slim-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -26,7 +26,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/cbl-mariner2.0/amd64/Dockerfile b/src/sdk/8.0/cbl-mariner2.0/amd64/Dockerfile
index 6ec0b164ad..8b7821707f 100644
--- a/src/sdk/8.0/cbl-mariner2.0/amd64/Dockerfile
+++ b/src/sdk/8.0/cbl-mariner2.0/amd64/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:8.0.22-cbl-mariner2.0-amd64 AS installer
+FROM $REPO:8.0.23-cbl-mariner2.0-amd64 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -22,7 +22,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-cbl-mariner2.0-amd64
+FROM $REPO:8.0.23-cbl-mariner2.0-amd64
 
 ENV \
     # Do not generate certificate
@@ -30,7 +30,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/cbl-mariner2.0/arm64v8/Dockerfile b/src/sdk/8.0/cbl-mariner2.0/arm64v8/Dockerfile
index 57e1ab0d53..a712707dc4 100644
--- a/src/sdk/8.0/cbl-mariner2.0/arm64v8/Dockerfile
+++ b/src/sdk/8.0/cbl-mariner2.0/arm64v8/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:8.0.22-cbl-mariner2.0-arm64v8 AS installer
+FROM $REPO:8.0.23-cbl-mariner2.0-arm64v8 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -22,7 +22,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-cbl-mariner2.0-arm64v8
+FROM $REPO:8.0.23-cbl-mariner2.0-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -30,7 +30,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/jammy/amd64/Dockerfile b/src/sdk/8.0/jammy/amd64/Dockerfile
index 45f86aef80..0bbf3760d5 100644
--- a/src/sdk/8.0/jammy/amd64/Dockerfile
+++ b/src/sdk/8.0/jammy/amd64/Dockerfile
@@ -3,8 +3,8 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM amd64/buildpack-deps:jammy-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,7 +18,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-jammy-amd64
+FROM $REPO:8.0.23-jammy-amd64
 
 ENV \
     # Do not generate certificate
@@ -26,7 +26,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/jammy/arm32v7/Dockerfile b/src/sdk/8.0/jammy/arm32v7/Dockerfile
index b1199ea011..6b9021f3d2 100644
--- a/src/sdk/8.0/jammy/arm32v7/Dockerfile
+++ b/src/sdk/8.0/jammy/arm32v7/Dockerfile
@@ -3,8 +3,8 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,7 +18,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-jammy-arm32v7
+FROM $REPO:8.0.23-jammy-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -26,7 +26,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/jammy/arm64v8/Dockerfile b/src/sdk/8.0/jammy/arm64v8/Dockerfile
index aada8db4eb..fe6488da64 100644
--- a/src/sdk/8.0/jammy/arm64v8/Dockerfile
+++ b/src/sdk/8.0/jammy/arm64v8/Dockerfile
@@ -3,8 +3,8 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM arm64v8/buildpack-deps:jammy-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,7 +18,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-jammy-arm64v8
+FROM $REPO:8.0.23-jammy-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -26,7 +26,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/nanoserver-1809/amd64/Dockerfile b/src/sdk/8.0/nanoserver-1809/amd64/Dockerfile
index 5a939cf98f..48566bcc21 100644
--- a/src/sdk/8.0/nanoserver-1809/amd64/Dockerfile
+++ b/src/sdk/8.0/nanoserver-1809/amd64/Dockerfile
@@ -25,8 +25,8 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '8.0.416'; `
-        $dotnet_version = '8.0.22'; `
+        $dotnet_sdk_version = '8.0.417'; `
+        $dotnet_version = '8.0.23'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -74,7 +74,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:8.0.22-nanoserver-1809
+FROM $REPO:8.0.23-nanoserver-1809
 
 ENV `
     # Do not generate certificate
@@ -82,7 +82,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 `
+    DOTNET_SDK_VERSION=8.0.417 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/sdk/8.0/nanoserver-ltsc2022/amd64/Dockerfile
index 43183e947a..9db02bd7f0 100644
--- a/src/sdk/8.0/nanoserver-ltsc2022/amd64/Dockerfile
+++ b/src/sdk/8.0/nanoserver-ltsc2022/amd64/Dockerfile
@@ -25,8 +25,8 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '8.0.416'; `
-        $dotnet_version = '8.0.22'; `
+        $dotnet_sdk_version = '8.0.417'; `
+        $dotnet_version = '8.0.23'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -74,7 +74,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:8.0.22-nanoserver-ltsc2022
+FROM $REPO:8.0.23-nanoserver-ltsc2022
 
 ENV `
     # Do not generate certificate
@@ -82,7 +82,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 `
+    DOTNET_SDK_VERSION=8.0.417 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile
index e14ffcfc58..b771c52bb7 100644
--- a/src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -25,8 +25,8 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '8.0.416'; `
-        $dotnet_version = '8.0.22'; `
+        $dotnet_sdk_version = '8.0.417'; `
+        $dotnet_version = '8.0.23'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -74,7 +74,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:8.0.22-nanoserver-ltsc2025
+FROM $REPO:8.0.23-nanoserver-ltsc2025
 
 ENV `
     # Do not generate certificate
@@ -82,7 +82,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 `
+    DOTNET_SDK_VERSION=8.0.417 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/noble/amd64/Dockerfile b/src/sdk/8.0/noble/amd64/Dockerfile
index 53e6aac518..f1c059d1db 100644
--- a/src/sdk/8.0/noble/amd64/Dockerfile
+++ b/src/sdk/8.0/noble/amd64/Dockerfile
@@ -3,8 +3,8 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,7 +18,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-noble-amd64
+FROM $REPO:8.0.23-noble-amd64
 
 ENV \
     # Do not generate certificate
@@ -26,7 +26,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/noble/arm64v8/Dockerfile b/src/sdk/8.0/noble/arm64v8/Dockerfile
index f566070969..f192575ba9 100644
--- a/src/sdk/8.0/noble/arm64v8/Dockerfile
+++ b/src/sdk/8.0/noble/arm64v8/Dockerfile
@@ -3,8 +3,8 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=8.0.416 \
-    && dotnet_version=8.0.22 \
+RUN dotnet_sdk_version=8.0.417 \
+    && dotnet_version=8.0.23 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,7 +18,7 @@ RUN dotnet_sdk_version=8.0.416 \
 
 
 # .NET SDK image
-FROM $REPO:8.0.22-noble-arm64v8
+FROM $REPO:8.0.23-noble-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -26,7 +26,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 \
+    DOTNET_SDK_VERSION=8.0.417 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/windowsservercore-ltsc2019/amd64/Dockerfile b/src/sdk/8.0/windowsservercore-ltsc2019/amd64/Dockerfile
index 8631986bae..92dfa22637 100644
--- a/src/sdk/8.0/windowsservercore-ltsc2019/amd64/Dockerfile
+++ b/src/sdk/8.0/windowsservercore-ltsc2019/amd64/Dockerfile
@@ -25,8 +25,8 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '8.0.416'; `
-        $dotnet_version = '8.0.22'; `
+        $dotnet_sdk_version = '8.0.417'; `
+        $dotnet_version = '8.0.23'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -74,7 +74,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:8.0.22-windowsservercore-ltsc2019
+FROM $REPO:8.0.23-windowsservercore-ltsc2019
 
 ENV `
     # Do not generate certificate
@@ -82,7 +82,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 `
+    DOTNET_SDK_VERSION=8.0.417 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/sdk/8.0/windowsservercore-ltsc2022/amd64/Dockerfile
index df75ba7d35..0830fec8bc 100644
--- a/src/sdk/8.0/windowsservercore-ltsc2022/amd64/Dockerfile
+++ b/src/sdk/8.0/windowsservercore-ltsc2022/amd64/Dockerfile
@@ -25,8 +25,8 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '8.0.416'; `
-        $dotnet_version = '8.0.22'; `
+        $dotnet_sdk_version = '8.0.417'; `
+        $dotnet_version = '8.0.23'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -74,7 +74,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:8.0.22-windowsservercore-ltsc2022
+FROM $REPO:8.0.23-windowsservercore-ltsc2022
 
 ENV `
     # Do not generate certificate
@@ -82,7 +82,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 `
+    DOTNET_SDK_VERSION=8.0.417 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile
index 16050db203..49654a360a 100644
--- a/src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -25,8 +25,8 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '8.0.416'; `
-        $dotnet_version = '8.0.22'; `
+        $dotnet_sdk_version = '8.0.417'; `
+        $dotnet_version = '8.0.23'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -74,7 +74,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:8.0.22-windowsservercore-ltsc2025
+FROM $REPO:8.0.23-windowsservercore-ltsc2025
 
 ENV `
     # Do not generate certificate
@@ -82,7 +82,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=8.0.416 `
+    DOTNET_SDK_VERSION=8.0.417 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/9.0/alpine3.22/amd64/Dockerfile b/src/sdk/9.0/alpine3.22/amd64/Dockerfile
index dc3d46a714..4d3be40bc5 100644
--- a/src/sdk/9.0/alpine3.22/amd64/Dockerfile
+++ b/src/sdk/9.0/alpine3.22/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:9.0.11-alpine3.22-amd64 AS installer
+FROM $REPO:9.0.12-alpine3.22-amd64 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=9.0.308 \
-    && dotnet_version=9.0.11 \
+RUN dotnet_sdk_version=9.0.309 \
+    && dotnet_version=9.0.12 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -17,7 +17,7 @@ RUN dotnet_sdk_version=9.0.308 \
 
 
 # .NET SDK image
-FROM $REPO:9.0.11-alpine3.22-amd64
+FROM $REPO:9.0.12-alpine3.22-amd64
 
 ENV \
     # Do not generate certificate
@@ -25,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 \
+    DOTNET_SDK_VERSION=9.0.309 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/9.0/alpine3.22/arm32v7/Dockerfile b/src/sdk/9.0/alpine3.22/arm32v7/Dockerfile
index 864fd0c191..f67b10f365 100644
--- a/src/sdk/9.0/alpine3.22/arm32v7/Dockerfile
+++ b/src/sdk/9.0/alpine3.22/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:9.0.11-alpine3.22-arm32v7 AS installer
+FROM $REPO:9.0.12-alpine3.22-arm32v7 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=9.0.308 \
-    && dotnet_version=9.0.11 \
+RUN dotnet_sdk_version=9.0.309 \
+    && dotnet_version=9.0.12 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -17,7 +17,7 @@ RUN dotnet_sdk_version=9.0.308 \
 
 
 # .NET SDK image
-FROM $REPO:9.0.11-alpine3.22-arm32v7
+FROM $REPO:9.0.12-alpine3.22-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -25,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 \
+    DOTNET_SDK_VERSION=9.0.309 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/9.0/alpine3.22/arm64v8/Dockerfile b/src/sdk/9.0/alpine3.22/arm64v8/Dockerfile
index a6b2eda67e..883e1fc84c 100644
--- a/src/sdk/9.0/alpine3.22/arm64v8/Dockerfile
+++ b/src/sdk/9.0/alpine3.22/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:9.0.11-alpine3.22-arm64v8 AS installer
+FROM $REPO:9.0.12-alpine3.22-arm64v8 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=9.0.308 \
-    && dotnet_version=9.0.11 \
+RUN dotnet_sdk_version=9.0.309 \
+    && dotnet_version=9.0.12 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -17,7 +17,7 @@ RUN dotnet_sdk_version=9.0.308 \
 
 
 # .NET SDK image
-FROM $REPO:9.0.11-alpine3.22-arm64v8
+FROM $REPO:9.0.12-alpine3.22-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -25,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 \
+    DOTNET_SDK_VERSION=9.0.309 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/9.0/alpine3.23/amd64/Dockerfile b/src/sdk/9.0/alpine3.23/amd64/Dockerfile
index f9ade6adde..8026a5fdc9 100644
--- a/src/sdk/9.0/alpine3.23/amd64/Dockerfile
+++ b/src/sdk/9.0/alpine3.23/amd64/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:9.0.11-alpine3.23-amd64 AS installer
+FROM $REPO:9.0.12-alpine3.23-amd64 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=9.0.308 \
-    && dotnet_version=9.0.11 \
+RUN dotnet_sdk_version=9.0.309 \
+    && dotnet_version=9.0.12 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -17,7 +17,7 @@ RUN dotnet_sdk_version=9.0.308 \
 
 
 # .NET SDK image
-FROM $REPO:9.0.11-alpine3.23-amd64
+FROM $REPO:9.0.12-alpine3.23-amd64
 
 ENV \
     # Do not generate certificate
@@ -25,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 \
+    DOTNET_SDK_VERSION=9.0.309 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/9.0/alpine3.23/arm32v7/Dockerfile b/src/sdk/9.0/alpine3.23/arm32v7/Dockerfile
index d5fdb67686..8badf7df33 100644
--- a/src/sdk/9.0/alpine3.23/arm32v7/Dockerfile
+++ b/src/sdk/9.0/alpine3.23/arm32v7/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:9.0.11-alpine3.23-arm32v7 AS installer
+FROM $REPO:9.0.12-alpine3.23-arm32v7 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=9.0.308 \
-    && dotnet_version=9.0.11 \
+RUN dotnet_sdk_version=9.0.309 \
+    && dotnet_version=9.0.12 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -17,7 +17,7 @@ RUN dotnet_sdk_version=9.0.308 \
 
 
 # .NET SDK image
-FROM $REPO:9.0.11-alpine3.23-arm32v7
+FROM $REPO:9.0.12-alpine3.23-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -25,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 \
+    DOTNET_SDK_VERSION=9.0.309 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/9.0/alpine3.23/arm64v8/Dockerfile b/src/sdk/9.0/alpine3.23/arm64v8/Dockerfile
index 1a0641f112..767b0d7e5a 100644
--- a/src/sdk/9.0/alpine3.23/arm64v8/Dockerfile
+++ b/src/sdk/9.0/alpine3.23/arm64v8/Dockerfile
@@ -1,10 +1,10 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:9.0.11-alpine3.23-arm64v8 AS installer
+FROM $REPO:9.0.12-alpine3.23-arm64v8 AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=9.0.308 \
-    && dotnet_version=9.0.11 \
+RUN dotnet_sdk_version=9.0.309 \
+    && dotnet_version=9.0.12 \
     && wget \
         https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \
         https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -17,7 +17,7 @@ RUN dotnet_sdk_version=9.0.308 \
 
 
 # .NET SDK image
-FROM $REPO:9.0.11-alpine3.23-arm64v8
+FROM $REPO:9.0.12-alpine3.23-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -25,7 +25,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 \
+    DOTNET_SDK_VERSION=9.0.309 \
     # Disable the invariant mode (set in base image)
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     # Enable correct mode for dotnet watch (only mode supported in a container)
diff --git a/src/sdk/9.0/azurelinux3.0/amd64/Dockerfile b/src/sdk/9.0/azurelinux3.0/amd64/Dockerfile
index e320427ca0..eeadea71af 100644
--- a/src/sdk/9.0/azurelinux3.0/amd64/Dockerfile
+++ b/src/sdk/9.0/azurelinux3.0/amd64/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:9.0.11-azurelinux3.0-amd64 AS installer
+FROM $REPO:9.0.12-azurelinux3.0-amd64 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Install .NET SDK
-RUN dotnet_sdk_version=9.0.308 \
-    && dotnet_version=9.0.11 \
+RUN dotnet_sdk_version=9.0.309 \
+    && dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -22,7 +22,7 @@ RUN dotnet_sdk_version=9.0.308 \
 
 
 # .NET SDK image
-FROM $REPO:9.0.11-azurelinux3.0-amd64
+FROM $REPO:9.0.12-azurelinux3.0-amd64
 
 ENV \
     # Do not generate certificate
@@ -30,7 +30,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 \
+    DOTNET_SDK_VERSION=9.0.309 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/9.0/azurelinux3.0/arm64v8/Dockerfile b/src/sdk/9.0/azurelinux3.0/arm64v8/Dockerfile
index 631778d992..e407e32b99 100644
--- a/src/sdk/9.0/azurelinux3.0/arm64v8/Dockerfile
+++ b/src/sdk/9.0/azurelinux3.0/arm64v8/Dockerfile
@@ -1,14 +1,14 @@
 ARG REPO=mcr.microsoft.com/dotnet/aspnet
 # Installer image
-FROM $REPO:9.0.11-azurelinux3.0-arm64v8 AS installer
+FROM $REPO:9.0.12-azurelinux3.0-arm64v8 AS installer
 
 RUN tdnf install -y \
         tar \
     && tdnf clean all
 
 # Install .NET SDK
-RUN dotnet_sdk_version=9.0.308 \
-    && dotnet_version=9.0.11 \
+RUN dotnet_sdk_version=9.0.309 \
+    && dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -22,7 +22,7 @@ RUN dotnet_sdk_version=9.0.308 \
 
 
 # .NET SDK image
-FROM $REPO:9.0.11-azurelinux3.0-arm64v8
+FROM $REPO:9.0.12-azurelinux3.0-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -30,7 +30,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 \
+    DOTNET_SDK_VERSION=9.0.309 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/9.0/bookworm-slim/amd64/Dockerfile b/src/sdk/9.0/bookworm-slim/amd64/Dockerfile
index f147629bc4..5bcb2aa9a2 100644
--- a/src/sdk/9.0/bookworm-slim/amd64/Dockerfile
+++ b/src/sdk/9.0/bookworm-slim/amd64/Dockerfile
@@ -3,8 +3,8 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM amd64/buildpack-deps:bookworm-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=9.0.308 \
-    && dotnet_version=9.0.11 \
+RUN dotnet_sdk_version=9.0.309 \
+    && dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,7 +18,7 @@ RUN dotnet_sdk_version=9.0.308 \
 
 
 # .NET SDK image
-FROM $REPO:9.0.11-bookworm-slim-amd64
+FROM $REPO:9.0.12-bookworm-slim-amd64
 
 ENV \
     # Do not generate certificate
@@ -26,7 +26,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 \
+    DOTNET_SDK_VERSION=9.0.309 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/9.0/bookworm-slim/arm32v7/Dockerfile b/src/sdk/9.0/bookworm-slim/arm32v7/Dockerfile
index 5807cef6d7..62839d4192 100644
--- a/src/sdk/9.0/bookworm-slim/arm32v7/Dockerfile
+++ b/src/sdk/9.0/bookworm-slim/arm32v7/Dockerfile
@@ -3,8 +3,8 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM arm32v7/buildpack-deps:bookworm-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=9.0.308 \
-    && dotnet_version=9.0.11 \
+RUN dotnet_sdk_version=9.0.309 \
+    && dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,7 +18,7 @@ RUN dotnet_sdk_version=9.0.308 \
 
 
 # .NET SDK image
-FROM $REPO:9.0.11-bookworm-slim-arm32v7
+FROM $REPO:9.0.12-bookworm-slim-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -26,7 +26,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 \
+    DOTNET_SDK_VERSION=9.0.309 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/9.0/bookworm-slim/arm64v8/Dockerfile b/src/sdk/9.0/bookworm-slim/arm64v8/Dockerfile
index 9d46384358..1a38f4dea9 100644
--- a/src/sdk/9.0/bookworm-slim/arm64v8/Dockerfile
+++ b/src/sdk/9.0/bookworm-slim/arm64v8/Dockerfile
@@ -3,8 +3,8 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM arm64v8/buildpack-deps:bookworm-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=9.0.308 \
-    && dotnet_version=9.0.11 \
+RUN dotnet_sdk_version=9.0.309 \
+    && dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,7 +18,7 @@ RUN dotnet_sdk_version=9.0.308 \
 
 
 # .NET SDK image
-FROM $REPO:9.0.11-bookworm-slim-arm64v8
+FROM $REPO:9.0.12-bookworm-slim-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -26,7 +26,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 \
+    DOTNET_SDK_VERSION=9.0.309 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/9.0/nanoserver-1809/amd64/Dockerfile b/src/sdk/9.0/nanoserver-1809/amd64/Dockerfile
index 34ef34e005..21ed8ee3cc 100644
--- a/src/sdk/9.0/nanoserver-1809/amd64/Dockerfile
+++ b/src/sdk/9.0/nanoserver-1809/amd64/Dockerfile
@@ -25,8 +25,8 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '9.0.308'; `
-        $dotnet_version = '9.0.11'; `
+        $dotnet_sdk_version = '9.0.309'; `
+        $dotnet_version = '9.0.12'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -74,7 +74,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:9.0.11-nanoserver-1809
+FROM $REPO:9.0.12-nanoserver-1809
 
 ENV `
     # Do not generate certificate
@@ -82,7 +82,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 `
+    DOTNET_SDK_VERSION=9.0.309 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile
index 73da3fd238..b1473674cb 100644
--- a/src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile
+++ b/src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile
@@ -25,8 +25,8 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '9.0.308'; `
-        $dotnet_version = '9.0.11'; `
+        $dotnet_sdk_version = '9.0.309'; `
+        $dotnet_version = '9.0.12'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -74,7 +74,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:9.0.11-nanoserver-ltsc2022
+FROM $REPO:9.0.12-nanoserver-ltsc2022
 
 ENV `
     # Do not generate certificate
@@ -82,7 +82,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 `
+    DOTNET_SDK_VERSION=9.0.309 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile
index ead822db8c..9880b46ade 100644
--- a/src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile
+++ b/src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile
@@ -25,8 +25,8 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '9.0.308'; `
-        $dotnet_version = '9.0.11'; `
+        $dotnet_sdk_version = '9.0.309'; `
+        $dotnet_version = '9.0.12'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -74,7 +74,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:9.0.11-nanoserver-ltsc2025
+FROM $REPO:9.0.12-nanoserver-ltsc2025
 
 ENV `
     # Do not generate certificate
@@ -82,7 +82,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 `
+    DOTNET_SDK_VERSION=9.0.309 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/9.0/noble/amd64/Dockerfile b/src/sdk/9.0/noble/amd64/Dockerfile
index fb0cac468c..07565eb770 100644
--- a/src/sdk/9.0/noble/amd64/Dockerfile
+++ b/src/sdk/9.0/noble/amd64/Dockerfile
@@ -3,8 +3,8 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM amd64/buildpack-deps:noble-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=9.0.308 \
-    && dotnet_version=9.0.11 \
+RUN dotnet_sdk_version=9.0.309 \
+    && dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,7 +18,7 @@ RUN dotnet_sdk_version=9.0.308 \
 
 
 # .NET SDK image
-FROM $REPO:9.0.11-noble-amd64
+FROM $REPO:9.0.12-noble-amd64
 
 ENV \
     # Do not generate certificate
@@ -26,7 +26,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 \
+    DOTNET_SDK_VERSION=9.0.309 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/9.0/noble/arm32v7/Dockerfile b/src/sdk/9.0/noble/arm32v7/Dockerfile
index 3296e70248..96dea1d276 100644
--- a/src/sdk/9.0/noble/arm32v7/Dockerfile
+++ b/src/sdk/9.0/noble/arm32v7/Dockerfile
@@ -3,8 +3,8 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM arm32v7/buildpack-deps:jammy-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=9.0.308 \
-    && dotnet_version=9.0.11 \
+RUN dotnet_sdk_version=9.0.309 \
+    && dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,7 +18,7 @@ RUN dotnet_sdk_version=9.0.308 \
 
 
 # .NET SDK image
-FROM $REPO:9.0.11-noble-arm32v7
+FROM $REPO:9.0.12-noble-arm32v7
 
 ENV \
     # Do not generate certificate
@@ -26,7 +26,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 \
+    DOTNET_SDK_VERSION=9.0.309 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/9.0/noble/arm64v8/Dockerfile b/src/sdk/9.0/noble/arm64v8/Dockerfile
index b1d8d916bf..f2effa920a 100644
--- a/src/sdk/9.0/noble/arm64v8/Dockerfile
+++ b/src/sdk/9.0/noble/arm64v8/Dockerfile
@@ -3,8 +3,8 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
 FROM arm64v8/buildpack-deps:noble-curl AS installer
 
 # Install .NET SDK
-RUN dotnet_sdk_version=9.0.308 \
-    && dotnet_version=9.0.11 \
+RUN dotnet_sdk_version=9.0.309 \
+    && dotnet_version=9.0.12 \
     && curl --fail --show-error --location \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \
         --remote-name https://builds.dotnet.microsoft.com/dotnet/checksums/$dotnet_version-sha.txt \
@@ -18,7 +18,7 @@ RUN dotnet_sdk_version=9.0.308 \
 
 
 # .NET SDK image
-FROM $REPO:9.0.11-noble-arm64v8
+FROM $REPO:9.0.12-noble-arm64v8
 
 ENV \
     # Do not generate certificate
@@ -26,7 +26,7 @@ ENV \
     # Do not show first run text
     DOTNET_NOLOGO=true \
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 \
+    DOTNET_SDK_VERSION=9.0.309 \
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/9.0/windowsservercore-ltsc2019/amd64/Dockerfile b/src/sdk/9.0/windowsservercore-ltsc2019/amd64/Dockerfile
index 9c22646212..27898a2808 100644
--- a/src/sdk/9.0/windowsservercore-ltsc2019/amd64/Dockerfile
+++ b/src/sdk/9.0/windowsservercore-ltsc2019/amd64/Dockerfile
@@ -25,8 +25,8 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '9.0.308'; `
-        $dotnet_version = '9.0.11'; `
+        $dotnet_sdk_version = '9.0.309'; `
+        $dotnet_version = '9.0.12'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -74,7 +74,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:9.0.11-windowsservercore-ltsc2019
+FROM $REPO:9.0.12-windowsservercore-ltsc2019
 
 ENV `
     # Do not generate certificate
@@ -82,7 +82,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 `
+    DOTNET_SDK_VERSION=9.0.309 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile
index 6d5ea31500..847e69ba68 100644
--- a/src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile
+++ b/src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile
@@ -25,8 +25,8 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '9.0.308'; `
-        $dotnet_version = '9.0.11'; `
+        $dotnet_sdk_version = '9.0.309'; `
+        $dotnet_version = '9.0.12'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -74,7 +74,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:9.0.11-windowsservercore-ltsc2022
+FROM $REPO:9.0.12-windowsservercore-ltsc2022
 
 ENV `
     # Do not generate certificate
@@ -82,7 +82,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 `
+    DOTNET_SDK_VERSION=9.0.309 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile
index 1ee00fd2da..ff6faef9d6 100644
--- a/src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile
+++ b/src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile
@@ -25,8 +25,8 @@ RUN powershell -Command " `
         $ProgressPreference = 'SilentlyContinue'; `
         `
         # Retrieve .NET SDK
-        $dotnet_sdk_version = '9.0.308'; `
-        $dotnet_version = '9.0.11'; `
+        $dotnet_sdk_version = '9.0.309'; `
+        $dotnet_version = '9.0.12'; `
         $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; `
         $dotnet_checksums_file = $dotnet_version + '-sha.txt'; `
         `
@@ -74,7 +74,7 @@ RUN powershell -Command " `
 
 
 # SDK image
-FROM $REPO:9.0.11-windowsservercore-ltsc2025
+FROM $REPO:9.0.12-windowsservercore-ltsc2025
 
 ENV `
     # Do not generate certificate
@@ -82,7 +82,7 @@ ENV `
     # Do not show first run text
     DOTNET_NOLOGO=true `
     # SDK version
-    DOTNET_SDK_VERSION=9.0.308 `
+    DOTNET_SDK_VERSION=9.0.309 `
     # Enable correct mode for dotnet watch (only mode supported in a container)
     DOTNET_USE_POLLING_FILE_WATCHER=true `
     # Skip extraction of XML docs - generally not useful within an image/container - helps performance
diff --git a/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs
index 48e6a0e147..2db43d9996 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs
@@ -32,7 +32,7 @@ public async Task VerifyFxDependentAppScenario(ProductImageData imageData)
                 return;
             }
 
-            using WebScenario scenario = new WebScenario.FxDependent(imageData, DockerHelper, OutputHelper);
+            WebScenario scenario = new WebScenario.FxDependent(imageData, DockerHelper, OutputHelper);
             await scenario.ExecuteAsync();
         }
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/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/GeneratedArtifactTests.cs b/tests/Microsoft.DotNet.Docker.Tests/GeneratedArtifactTests.cs
index bf27afcb9c..5f7d141ff8 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/GeneratedArtifactTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/GeneratedArtifactTests.cs
@@ -72,8 +72,10 @@ public void VerifyInternalDockerfilesOutput()
             $" --var 'base-url|public|maintenance|nightly={InternalBaseUrl}'" +
             $" --var 'base-url|public|preview|main={InternalBaseUrl}'" +
             $" --var 'base-url|public|preview|nightly={InternalBaseUrl}'" +
-            $" --var 'base-url|public-checksums|main={InternalBaseUrl}'" +
-            $" --var 'base-url|public-checksums|nightly={InternalBaseUrl}'";
+            $" --var 'base-url|public-checksums|maintenance|main={InternalBaseUrl}'" +
+            $" --var 'base-url|public-checksums|maintenance|nightly={InternalBaseUrl}'" +
+            $" --var 'base-url|public-checksums|preview|main={InternalBaseUrl}'" +
+            $" --var 'base-url|public-checksums|preview|nightly={InternalBaseUrl}'";
 
         // Generate internal Dockerfiles
         ExecuteScript(
diff --git a/tests/Microsoft.DotNet.Docker.Tests/ImageData.cs b/tests/Microsoft.DotNet.Docker.Tests/ImageData.cs
index 856bd27a20..9dedc1e7a9 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/ImageData.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/ImageData.cs
@@ -20,8 +20,8 @@ public abstract record ImageData
 
         public Arch Arch { get; set; }
         public bool IsArm => Arch == Arch.Arm || Arch == Arch.Arm64;
-        public string OS { get; set; }
-        public bool IsDistroless => OS.Contains(Tests.OS.DistrolessSuffix) || OS.Contains(Tests.OS.ChiseledSuffix);
+        public OSInfo OS { get; set; }
+        public bool IsDistroless => OS.IsDistroless;
         public virtual int DefaultPort => 8080;
         public virtual int? NonRootUID => IsWindows ? null : 1654;
 
@@ -66,7 +66,7 @@ public string Platform
                 _ => throw new NotImplementedException()
             };
 
-        public bool IsWindows => OS.StartsWith(Tests.OS.NanoServer) || OS.StartsWith(Tests.OS.ServerCore);
+        public bool IsWindows => OS.IsWindows;
 
         public string Rid
         {
@@ -87,7 +87,7 @@ public string Rid
                         Arch.Amd64 => "x64",
                         _ => throw new NotImplementedException()
                     };
-                    string modifier = OS.StartsWith(Tests.OS.Alpine) ? "musl-" : "";
+                    string modifier = OS.Family == OSFamily.Alpine ? "musl-" : "";
                     rid = $"linux-{modifier}{arch}";
                 }
 
@@ -162,7 +162,7 @@ protected string GetArchLabel() =>
                 Arch.Amd64 => "amd64",
                 Arch.Arm => "arm32v7",
                 Arch.Arm64 => "arm64v8",
-                _ => throw new NotSupportedException()
+                _ => throw new NotSupportedException($"Unsupported architecture '{Arch}'")
             };
 
         private static string GetRegistryName(string repo, string tag)
diff --git a/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs b/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs
index 5304c4ad80..76b987b93d 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs
@@ -17,6 +17,7 @@ public readonly record struct ImageVersion
         public static readonly ImageVersion V13_1 = new(new Version(13, 1), isPreview: false);
         public static readonly ImageVersion V9_2_Preview = new(new Version(9, 2), isPreview: true);
         public static readonly ImageVersion V10_0 = new(new Version(10, 0), isPreview: false);
+        public static readonly ImageVersion V11_0 = new(new Version(11, 0), isPreview: true);
 
         public ImageVersion(Version version, bool isPreview)
         {
diff --git a/tests/Microsoft.DotNet.Docker.Tests/OS.cs b/tests/Microsoft.DotNet.Docker.Tests/OS.cs
index 79f9c718d2..67302bb02a 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/OS.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/OS.cs
@@ -2,52 +2,49 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.DotNet.Docker.Tests
+#nullable enable
+
+namespace Microsoft.DotNet.Docker.Tests;
+
+internal static class OS
 {
-    public static class OS
-    {
-        // Alpine
-        public const string Alpine = "alpine";
-        public const string Alpine321 = $"{Alpine}3.21";
-        public const string Alpine322 = $"{Alpine}3.22";
-        public const string Alpine323 = $"{Alpine}3.23";
-
-        // AzureLinux
-        public const string AzureLinux = "azurelinux";
-        public const string AzureLinuxDistroless = $"{AzureLinux}-distroless";
-        public const string AzureLinux30 = $"{AzureLinux}3.0";
-        public const string AzureLinux30Distroless = $"{AzureLinux30}-distroless";
-
-        // Debian
-        public const string Bookworm = "bookworm";
-        public const string BookwormSlim = $"{Bookworm}{SlimSuffix}";
-
-        // Mariner
-        public const string Mariner = "cbl-mariner";
-        public const string MarinerDistroless = $"{Mariner}-distroless";
-        public const string Mariner20 = $"{Mariner}2.0";
-        public const string Mariner20Distroless = $"{Mariner20}-distroless";
-
-        // Ubuntu
-        public const string Jammy = "jammy";
-        public const string JammyChiseled = $"{Jammy}{ChiseledSuffix}";
-        public const string Noble = "noble";
-        public const string NobleChiseled = $"{Noble}{ChiseledSuffix}";
-        public const string UbuntuChiseled = $"ubuntu{ChiseledSuffix}";
-
-        // Windows
-        public const string NanoServer = "nanoserver";
-        public const string NanoServer1809 = $"{NanoServer}-1809";
-        public const string NanoServerLtsc2022 = $"{NanoServer}-ltsc2022";
-        public const string NanoServerLtsc2025 = $"{NanoServer}-ltsc2025";
-        public const string ServerCore = "windowsservercore";
-        public const string ServerCoreLtsc2019 = $"{ServerCore}-ltsc2019";
-        public const string ServerCoreLtsc2022 = $"{ServerCore}-ltsc2022";
-        public const string ServerCoreLtsc2025 = $"{ServerCore}-ltsc2025";
-
-        // Helpers
-        public const string DistrolessSuffix = "-distroless";
-        public const string ChiseledSuffix = "-chiseled";
-        public const string SlimSuffix = "-slim";
-    }
+    // String constants for special tagging cases (appliance images)
+    public const string Alpine = "alpine";
+    public const string AzureLinuxDistroless = "azurelinux-distroless";
+    public const string MarinerDistroless = "cbl-mariner-distroless";
+    public const string UbuntuChiseled = "ubuntu-chiseled";
+
+    // Alpine
+    public static OSInfo AlpineFloating { get; } = new(OSType.Linux, OSFamily.Alpine, "");
+    public static OSInfo Alpine322 { get; } = AlpineFloating with { Version = "3.22" };
+    public static OSInfo Alpine323 { get; } = AlpineFloating with { Version = "3.23" };
+
+    // Azure Linux
+    public static OSInfo AzureLinux30 { get; } = new(OSType.Linux, OSFamily.AzureLinux, "3.0");
+    public static OSInfo AzureLinux30Distroless { get; } = AzureLinux30 with { IsDistroless = true };
+
+    // Debian
+    public static OSInfo BookwormSlim { get; } = new(OSType.Linux, OSFamily.Debian, "12");
+
+    // Mariner (CBL-Mariner)
+    public static OSInfo Mariner20 { get; } = new(OSType.Linux, OSFamily.Mariner, "2.0");
+    public static OSInfo Mariner20Distroless { get; } = Mariner20 with { IsDistroless = true };
+
+    // Ubuntu
+    public static OSInfo Jammy { get; } = new(OSType.Linux, OSFamily.Ubuntu, "22.04");
+    public static OSInfo JammyChiseled { get; } = Jammy with { IsDistroless = true };
+    public static OSInfo Noble { get; } = new(OSType.Linux, OSFamily.Ubuntu, "24.04");
+    public static OSInfo NobleChiseled { get; } = Noble with { IsDistroless = true };
+    public static OSInfo Resolute { get; } = new(OSType.Linux, OSFamily.Ubuntu, "26.04", IsUnstable: true);
+    public static OSInfo ResoluteChiseled { get; } = Resolute with { IsDistroless = true };
+
+    // Windows - Nano Server
+    public static OSInfo NanoServer1809 { get; } = new(OSType.Windows, OSFamily.NanoServer, "1809");
+    public static OSInfo NanoServerLtsc2022 { get; } = NanoServer1809 with { Version = "LTSC 2022" };
+    public static OSInfo NanoServerLtsc2025 { get; } = NanoServer1809 with { Version = "LTSC 2025" };
+
+    // Windows - Server Core
+    public static OSInfo ServerCoreLtsc2019 { get; } = new(OSType.Windows, OSFamily.WindowsServerCore, "LTSC 2019");
+    public static OSInfo ServerCoreLtsc2022 { get; } = ServerCoreLtsc2019 with { Version = "LTSC 2022" };
+    public static OSInfo ServerCoreLtsc2025 { get; } = ServerCoreLtsc2019 with { Version = "LTSC 2025" };
 }
diff --git a/tests/Microsoft.DotNet.Docker.Tests/OSInfo.cs b/tests/Microsoft.DotNet.Docker.Tests/OSInfo.cs
new file mode 100644
index 0000000000..479799dd65
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/OSInfo.cs
@@ -0,0 +1,139 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+#nullable enable
+
+namespace Microsoft.DotNet.Docker.Tests;
+
+/// <summary>
+/// Represents the type of operating system.
+/// </summary>
+public enum OSType
+{
+    Linux,
+    Windows
+}
+
+/// <summary>
+/// Represents the family or distribution of an operating system.
+/// </summary>
+public enum OSFamily
+{
+    Alpine,
+    AzureLinux,
+    Debian,
+    Mariner,
+    Ubuntu,
+    NanoServer,
+    WindowsServerCore
+}
+
+/// <summary>
+/// Operating system used in .NET container images.
+/// </summary>
+/// <param name="Type">The type of operating system (Linux or Windows).</param>
+/// <param name="Family">The family or distribution of the operating system.</param>
+/// <param name="Version">
+/// The version of the operating system. Do not use codenames here. Use the
+/// version exactly as it appears in the OS's own documentation. Examples:
+/// "3.23" for Alpine, "26.04" for Ubuntu, "LTSC 2025" for Windows Server Core.
+/// </param>
+/// <param name="IsDistroless">Whether the OS is distroless.</param>
+/// <param name="IsUnstable">
+/// Whether the OS version is unstable (pre-release or not yet generally
+/// available).
+/// </param>
+public sealed record OSInfo(
+    OSType Type,
+    OSFamily Family,
+    string Version,
+    bool IsDistroless = false,
+    bool IsUnstable = false)
+{
+    /// <summary>
+    /// Gets the tag name for this OS, used in Docker image tags.
+    /// </summary>
+    public string TagName
+    {
+        get
+        {
+            static string GetCodename(OSFamily family, string version) => (family, version) switch
+            {
+                (OSFamily.Debian, "12") => "bookworm",
+                (OSFamily.Ubuntu, "22.04") => "jammy",
+                (OSFamily.Ubuntu, "24.04") => "noble",
+                (OSFamily.Ubuntu, "26.04") => "resolute",
+                _ => throw new InvalidOperationException($"Unknown {family} version: {version}")
+            };
+
+            string baseTag = Family switch
+            {
+                OSFamily.Alpine => string.IsNullOrEmpty(Version) ? "alpine" : $"alpine{Version}",
+                OSFamily.AzureLinux => $"azurelinux{Version}",
+                OSFamily.Debian => $"{GetCodename(Family, Version)}-slim",
+                OSFamily.Mariner => $"cbl-mariner{Version}",
+                OSFamily.Ubuntu => GetCodename(Family, Version),
+                OSFamily.NanoServer => $"nanoserver-{Version.ToLowerInvariant().Replace(" ", "")}",
+                OSFamily.WindowsServerCore => $"windowsservercore-{Version.ToLowerInvariant().Replace(" ", "")}",
+                _ => throw new InvalidOperationException($"Unknown OS family: {Family}")
+            };
+
+            return (Family, IsDistroless) switch
+            {
+                (OSFamily.Ubuntu, true) => $"{baseTag}-chiseled",
+                (_, true) => $"{baseTag}-distroless",
+                _ => baseTag
+            };
+        }
+    }
+
+    /// <summary>
+    /// Gets the display name for this OS, combining family and version.
+    /// </summary>
+    public string DisplayName
+    {
+        get
+        {
+            string familyName = Family switch
+            {
+                OSFamily.Alpine => "Alpine",
+                OSFamily.AzureLinux => "Azure Linux",
+                OSFamily.Debian => "Debian",
+                OSFamily.Mariner => "CBL-Mariner",
+                OSFamily.Ubuntu => "Ubuntu",
+                OSFamily.NanoServer => "Nano Server",
+                OSFamily.WindowsServerCore => "Windows Server Core",
+                _ => Family.ToString()
+            };
+
+            return string.IsNullOrEmpty(Version) ? familyName : $"{familyName} {Version}";
+        }
+    }
+
+    /// <summary>
+    /// Gets a value indicating whether this OS is Windows-based.
+    /// </summary>
+    public bool IsWindows => Type == OSType.Windows;
+
+    /// <summary>
+    /// Checks if the TagName contains the specified value.
+    /// Provides backward compatibility with string-based OS checks.
+    /// </summary>
+    public bool Contains(string value) => TagName.Contains(value);
+
+    /// <summary>
+    /// Checks if the TagName starts with the specified value.
+    /// Provides backward compatibility with string-based OS checks.
+    /// </summary>
+    public bool StartsWith(string value) => TagName.StartsWith(value);
+
+    /// <summary>
+    /// Implicit conversion to string for backward compatibility with existing code.
+    /// </summary>
+    public static implicit operator string(OSInfo os) => os.TagName;
+
+    public override string ToString() => TagName;
+}
diff --git a/tests/Microsoft.DotNet.Docker.Tests/PowerShellTests.cs b/tests/Microsoft.DotNet.Docker.Tests/PowerShellTests.cs
new file mode 100644
index 0000000000..9564c9a3ba
--- /dev/null
+++ b/tests/Microsoft.DotNet.Docker.Tests/PowerShellTests.cs
@@ -0,0 +1,118 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Reflection;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+using Polly;
+using Polly.Retry;
+using SharpCompress.Common;
+using SharpCompress.Readers;
+using Xunit;
+using Xunit.Abstractions;
+
+#nullable enable
+namespace Microsoft.DotNet.Docker.Tests;
+
+[Trait("Category", "sdk")]
+public class PowerShellTests : ProductImageTests
+{
+    public PowerShellTests(ITestOutputHelper outputHelper)
+        : base(outputHelper)
+    {
+    }
+
+    protected override DotNetImageRepo ImageRepo => DotNetImageRepo.SDK;
+
+    public static IEnumerable<object[]> GetImageData()
+    {
+        return TestData.GetImageData(DotNetImageRepo.SDK)
+            .Where(imageData => imageData.SupportsPowerShell)
+            .Select(imageData => new object[] { imageData });
+    }
+
+    [DotNetTheory]
+    [MemberData(nameof(GetImageData))]
+    public void VerifyPowerShellScenario_DefaultUser(ProductImageData imageData)
+    {
+        // An arbitrary command to validate PS is functional
+        string command = "(Get-Childitem env:DOTNET_RUNNING_IN_CONTAINER).Value";
+        string output = PowerShellScenario_Execute(imageData, command, string.Empty);
+        Assert.Equal(output, bool.TrueString, ignoreCase: true);
+    }
+
+    [DotNetTheory]
+    [MemberData(nameof(GetImageData))]
+    public void VerifyPowerShellScenario_NonDefaultUser(ProductImageData imageData)
+    {
+        // An arbitrary command to validate PS is functional
+        string command = "(Get-Childitem env:DOTNET_RUNNING_IN_CONTAINER).Value";
+        string optRunArgs = "-u 12345:12345"; // Linux containers test as non-root user
+
+        if (!DockerHelper.IsLinuxContainerModeEnabled)
+        {
+            // windows containers test as Admin, default execution is as ContainerUser
+            optRunArgs = "-u ContainerAdministrator ";
+        }
+
+        string output = PowerShellScenario_Execute(imageData, command, optRunArgs);
+        Assert.Equal(output, bool.TrueString, ignoreCase: true);
+    }
+
+    [DotNetTheory]
+    [MemberData(nameof(GetImageData))]
+    public void VerifyPowerShellScenario_PSVersion(ProductImageData imageData)
+    {
+        string command = "$PSVersionTable.PSVersion.ToString()";
+        string output = PowerShellScenario_Execute(imageData, command, string.Empty);
+
+        Assert.StartsWith("7", output, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [DotNetTheory]
+    [MemberData(nameof(GetImageData))]
+    public void VerifyPowerShellScenario_InvokeWebRequest(ProductImageData imageData)
+    {
+        string command = "(Invoke-WebRequest -Uri 'https://graph.microsoft.com').StatusCode";
+        string output = PowerShellScenario_Execute(imageData, command, string.Empty);
+
+        Assert.Equal("200", output);
+    }
+
+    [DotNetTheory]
+    [MemberData(nameof(GetImageData))]
+    public void VerifyPowerShellScenario_PSDistributionEnvVar(ProductImageData imageData)
+    {
+        string imageName = imageData.GetImage(ImageRepo, DockerHelper);
+        IDictionary<string, string> envVars = DockerHelper.GetEnvironmentVariables(imageName);
+        string powershellEnvVar = "POWERSHELL_DISTRIBUTION_CHANNEL";
+        Assert.True(envVars.ContainsKey(powershellEnvVar));
+        envVars.TryGetValue(powershellEnvVar, out string? envVarValue);
+        Assert.NotNull(envVarValue);
+        Assert.StartsWith("PSDocker-", envVarValue, StringComparison.OrdinalIgnoreCase);
+    }
+
+    private string PowerShellScenario_Execute(ProductImageData imageData, string command, string? optionalArgs = null)
+    {
+        string image = imageData.GetImage(DotNetImageRepo.SDK, DockerHelper);
+
+        // The test executes a provided command to validate PS functionality
+        string output = DockerHelper.Run(
+            image: image,
+            name: imageData.GetIdentifier($"pwsh"),
+            optionalRunArgs: optionalArgs,
+            command: $"pwsh -nologo -noprofile -c {command}"
+        );
+
+        return output;
+    }
+}
diff --git a/tests/Microsoft.DotNet.Docker.Tests/ProductImageData.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageData.cs
index 4549a4570e..bd28a99e00 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/ProductImageData.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/ProductImageData.cs
@@ -11,17 +11,17 @@ namespace Microsoft.DotNet.Docker.Tests
 {
     public record ProductImageData : ImageData
     {
-        private string _sdkOS;
+        private OSInfo _sdkOS;
         private string _osTag;
         private string _osDir;
         private ImageVersion? _versionFamily;
 
-        public bool HasCustomSdk => _sdkOS != null;
+        public bool HasCustomSdk => _sdkOS is not null;
 
         public bool GlobalizationInvariantMode => !SupportsGlobalization;
 
         // PowerShell does not support Arm-based Alpine
-        public bool SupportsPowerShell => !(OS.Contains("alpine") && IsArm);
+        public bool SupportsPowerShell => !(OS.Family == OSFamily.Alpine && IsArm);
 
         /// <summary>
         /// Indicates whether the SDK version of the image supports `dnx` and
@@ -29,7 +29,7 @@ public record ProductImageData : ImageData
         /// </summary>
         public bool SupportsDnx => VersionFamily != ImageVersion.V8_0 && VersionFamily != ImageVersion.V9_0;
 
-        public string SdkOS
+        public OSInfo SdkOS
         {
             get => HasCustomSdk ? _sdkOS : OS;
             init => _sdkOS = value;
@@ -70,7 +70,7 @@ private bool SupportsGlobalization
         {
             get
             {
-                bool isSizeFocusedImage = IsDistroless || OS.Contains(Tests.OS.Alpine);
+                bool isSizeFocusedImage = IsDistroless || OS.Family == OSFamily.Alpine;
                 return ImageVariant.HasFlag(DotNetImageVariant.Extra) || !isSizeFocusedImage;
             }
         }
diff --git a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
index 616f765062..e49d92bbfe 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
@@ -109,7 +109,7 @@ protected void VerifyCommonDefaultUser(ProductImageData imageData)
             string expectedUser;
             if (imageData.IsDistroless && ImageRepo != DotNetImageRepo.SDK)
             {
-                if (imageData.OS.StartsWith(OS.Mariner))
+                if (imageData.OS.Family == OSFamily.Mariner)
                 {
                     expectedUser = "app";
                 }
@@ -120,7 +120,7 @@ protected void VerifyCommonDefaultUser(ProductImageData imageData)
             }
             // For Windows, only Nano Server defines a user, which seems wrong.
             // I've logged https://dev.azure.com/microsoft/OS/_workitems/edit/40146885 for this.
-            else if (imageData.OS.StartsWith(OS.NanoServer))
+            else if (imageData.OS.Family == OSFamily.NanoServer)
             {
                 expectedUser = "ContainerUser";
             }
@@ -181,6 +181,12 @@ internal void VerifyInstalledPackagesBase(
             DotNetImageRepo imageRepo,
             IEnumerable<string> extraExcludePaths = null)
         {
+            if (imageData.OS.IsUnstable)
+            {
+                OutputHelper.WriteLine("Skipping package verification for unstable OS");
+                return;
+            }
+
             IEnumerable<string> expectedPackages = GetExpectedPackages(imageData, imageRepo);
             IEnumerable<string> actualPackages = GetInstalledPackages(imageData, imageRepo, extraExcludePaths);
 
@@ -256,7 +262,7 @@ internal static IEnumerable<string> GetExpectedPackages(ProductImageData imageDa
 
         private static IEnumerable<string> GetDistrolessBasePackages(ProductImageData imageData) => imageData switch
             {
-                { OS: string os } when os.Contains(OS.AzureLinux) => new[]
+                { OS.Family: OSFamily.AzureLinux } => new[]
                     {
                         "SymCrypt",
                         "SymCrypt-OpenSSL",
@@ -266,7 +272,7 @@ internal static IEnumerable<string> GetExpectedPackages(ProductImageData imageDa
                         "prebuilt-ca-certificates",
                         "tzdata"
                     },
-                { OS: string os } when os.Contains(OS.Mariner) => new[]
+                { OS.Family: OSFamily.Mariner } => new[]
                     {
                         "distroless-packages-minimal",
                         "filesystem",
@@ -274,17 +280,17 @@ internal static IEnumerable<string> GetExpectedPackages(ProductImageData imageDa
                         "prebuilt-ca-certificates",
                         "tzdata"
                     },
-                { OS: string os } when os.Contains(OS.ChiseledSuffix) => new[]
+                { OS.Family: OSFamily.Ubuntu } => new[]
                     {
                         "base-files"
                     },
-                _ => throw new NotSupportedException()
+                _ => throw new NotSupportedException($"Unsupported distroless OS '{imageData.OS}'")
             };
 
         private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData imageData) {
             IEnumerable<string> packages = imageData switch
             {
-                { OS: string os } when os.Contains(OS.Mariner) || os.Contains(OS.AzureLinux) =>
+                { OS.Family: OSFamily.Mariner or OSFamily.AzureLinux } =>
                     [
                         "glibc",
                         "libgcc",
@@ -292,7 +298,7 @@ private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData image
                         "openssl-libs",
                         "libstdc++"
                     ],
-                { OS: string os } when os.Contains(OS.Jammy) =>
+                { OS: { Family: OSFamily.Ubuntu, Version: "22.04"} } =>
                     [
                         "ca-certificates",
                         "gcc-12-base",
@@ -302,7 +308,7 @@ private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData image
                         "openssl",
                         "libstdc++6"
                     ],
-                { OS: OS.NobleChiseled } =>
+                { OS: var os } when os == OS.NobleChiseled =>
                     [
                         "ca-certificates",
                         "gcc-14-base",
@@ -313,7 +319,7 @@ private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData image
                         "openssl",
                         "libstdc++6"
                     ],
-                { OS: string os } when os.Contains(OS.Noble) =>
+                { OS: { Family: OSFamily.Ubuntu, Version: "24.04" } } =>
                     [
                         "ca-certificates",
                         "gcc-14-base",
@@ -323,14 +329,14 @@ private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData image
                         "openssl",
                         "libstdc++6"
                     ],
-                { OS: string os } when os.Contains(OS.Alpine) =>
+                { OS.Family: OSFamily.Alpine } =>
                     [
                         "ca-certificates-bundle",
                         "libgcc",
                         "libssl3",
                         "libstdc++"
                     ],
-                { OS: OS.BookwormSlim } =>
+                { OS: var os } when os == OS.BookwormSlim =>
                     [
                         "ca-certificates",
                         "libc6",
@@ -340,11 +346,11 @@ private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData image
                         "tzdata",
                         "libstdc++6"
                     ],
-                _ => throw new NotSupportedException()
+                _ => throw new NotSupportedException($"Unknown runtime-deps packages for OS '{imageData.OS}'")
             };
 
             // zlib is not required for .NET 9+
-            // https://github.com/dotnet/dotnet-docker/issues/5687
+            // - https://github.com/dotnet/dotnet-docker/issues/5687
             if (imageData.Version.Major == 8)
             {
                 packages = [..packages, GetZLibPackage(imageData.OS)];
@@ -353,31 +359,31 @@ private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData image
             return packages;
         }
 
-        private static string GetZLibPackage(string os)
+        private static string GetZLibPackage(OSInfo os)
         {
-            string[] unversionedZLibOSes = [OS.Alpine, OS.AzureLinux, OS.Mariner];
-            return unversionedZLibOSes.Where(os.Contains).Any() ? "zlib" : "zlib1g";
+            OSFamily[] unversionedZLibOSFamilies = [OSFamily.Alpine, OSFamily.AzureLinux, OSFamily.Mariner];
+            return unversionedZLibOSFamilies.Contains(os.Family) ? "zlib" : "zlib1g";
         }
 
         private static IEnumerable<string> GetExtraPackages(ProductImageData imageData) => imageData switch
             {
-                { IsDistroless: true, OS: string os } when os.Contains(OS.Mariner) || os.Contains(OS.AzureLinux) => new[]
+                { IsDistroless: true, OS.Family: OSFamily.Mariner or OSFamily.AzureLinux } => new[]
                     {
                         "icu",
                         "tzdata"
                     },
-                { OS: OS.NobleChiseled } => new[]
+                { OS: var os } when os == OS.NobleChiseled => new[]
                     {
                         "libicu74",
                         "tzdata-legacy",
                         "tzdata"
                     },
-                { OS: OS.JammyChiseled } => new[]
+                { OS: var os } when os == OS.JammyChiseled => new[]
                     {
                         "libicu70",
                         "tzdata"
                     },
-                { OS: string os } when os.Contains(OS.Alpine) => new[]
+                { OS.Family: OSFamily.Alpine } => new[]
                     {
                         "icu-data-full",
                         "icu-libs",
diff --git a/tests/Microsoft.DotNet.Docker.Tests/RuntimeDepsImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/RuntimeDepsImageTests.cs
index 7d38f05bdb..4903389b32 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/RuntimeDepsImageTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/RuntimeDepsImageTests.cs
@@ -38,7 +38,7 @@ public async Task VerifySelfContainedConsoleScenario(ProductImageData imageData)
                 return;
             }
 
-            using ConsoleAppScenario testScenario =
+            ConsoleAppScenario testScenario =
                 new ConsoleAppScenario.SelfContained(imageData, DockerHelper, OutputHelper);
             await testScenario.ExecuteAsync();
         }
@@ -54,8 +54,7 @@ public async Task VerifySelfContainedWebScenario(ProductImageData imageData)
                 return;
             }
 
-            using WebScenario testScenario =
-                new WebScenario.SelfContained(imageData, DockerHelper, OutputHelper);
+            WebScenario testScenario = new WebScenario.SelfContained(imageData, DockerHelper, OutputHelper);
             await testScenario.ExecuteAsync();
         }
 
@@ -71,7 +70,7 @@ public async Task VerifyAotWebScenario(ProductImageData imageData)
                 return;
             }
 
-            using WebScenario scenario = new WebScenario.Aot(imageData, DockerHelper, OutputHelper);
+            WebScenario scenario = new WebScenario.Aot(imageData, DockerHelper, OutputHelper);
             await scenario.ExecuteAsync();
         }
 
@@ -133,7 +132,7 @@ public void VerifyDistrolessOSReleaseInfo(ProductImageData imageData)
         [MemberData(nameof(GetImageData))]
         public void VerifyChiselManifest(ProductImageData imageData)
         {
-            if (!imageData.OS.Contains(OS.ChiseledSuffix))
+            if (!(imageData.OS.Family == OSFamily.Ubuntu && imageData.IsDistroless))
             {
                 OutputHelper.WriteLine("Test is only relevant to Ubuntu Chiseled images");
                 return;
diff --git a/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs
index db792e75de..d370b96dd9 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs
@@ -28,8 +28,7 @@ public RuntimeImageTests(ITestOutputHelper outputHelper)
         [MemberData(nameof(GetImageData))]
         public async Task VerifyFxDependentAppScenario(ProductImageData imageData)
         {
-            using ConsoleAppScenario testScenario =
-                new ConsoleAppScenario.FxDependent(imageData, DockerHelper, OutputHelper);
+            ConsoleAppScenario testScenario = new ConsoleAppScenario.FxDependent(imageData, DockerHelper, OutputHelper);
             await testScenario.ExecuteAsync();
         }
 
@@ -37,8 +36,7 @@ public async Task VerifyFxDependentAppScenario(ProductImageData imageData)
         [MemberData(nameof(GetImageData))]
         public async Task VerifyTestProjectScenario(ProductImageData imageData)
         {
-            using ConsoleAppScenario testScenario =
-                new ConsoleAppScenario.TestProject(imageData, DockerHelper, OutputHelper);
+            ConsoleAppScenario testScenario = new ConsoleAppScenario.TestProject(imageData, DockerHelper, OutputHelper);
             await testScenario.ExecuteAsync();
         }
 
diff --git a/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs
index da515ca2d5..1b386433dc 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs
@@ -70,7 +70,7 @@ public async void VerifyBlazorWasmScenario(ProductImageData imageData)
             }
 
             // `wasm-tools` is not supported on Alpine for .NET < 9 due to https://github.com/dotnet/sdk/issues/32327
-            if (imageData.OS.StartsWith(OS.Alpine) && imageData.Version.Major == 8)
+            if (imageData.OS.Family == OSFamily.Alpine && imageData.Version.Major == 8)
             {
                 useWasmTools = false;
             }
@@ -82,7 +82,7 @@ public async void VerifyBlazorWasmScenario(ProductImageData imageData)
                 useWasmTools = false;
             }
 
-            using BlazorWasmScenario testScenario = new(imageData, DockerHelper, OutputHelper, useWasmTools);
+            BlazorWasmScenario testScenario = new(imageData, DockerHelper, OutputHelper, useWasmTools);
             await testScenario.ExecuteAsync();
         }
 
@@ -122,14 +122,7 @@ public void VerifyEnvironmentVariables(ProductImageData imageData)
                 ..GetCommonEnvironmentVariables(),
             ];
 
-            if (imageData.SupportsPowerShell
-                || imageData.Version == ImageVersion.V8_0
-                || imageData.Version == ImageVersion.V9_0)
-            {
-                variables.Add(new EnvironmentVariableInfo("POWERSHELL_DISTRIBUTION_CHANNEL", allowAnyValue: true));
-            }
-
-            if (imageData.SdkOS.StartsWith(OS.Alpine))
+            if (imageData.SdkOS.Family == OSFamily.Alpine)
             {
                 variables.Add(new EnvironmentVariableInfo("DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "false"));
             }
@@ -137,27 +130,6 @@ public void VerifyEnvironmentVariables(ProductImageData imageData)
             EnvironmentVariableInfo.Validate(variables, imageName, imageData, DockerHelper);
         }
 
-        [DotNetTheory]
-        [MemberData(nameof(GetImageData))]
-        public void VerifyPowerShellScenario_DefaultUser(ProductImageData imageData)
-        {
-            PowerShellScenario_Execute(imageData, string.Empty);
-        }
-
-        [DotNetTheory]
-        [MemberData(nameof(GetImageData))]
-        public void VerifyPowerShellScenario_NonDefaultUser(ProductImageData imageData)
-        {
-            string optRunArgs = "-u 12345:12345"; // Linux containers test as non-root user
-            if (!DockerHelper.IsLinuxContainerModeEnabled)
-            {
-                // windows containers test as Admin, default execution is as ContainerUser
-                optRunArgs = "-u ContainerAdministrator ";
-            }
-
-            PowerShellScenario_Execute(imageData, optRunArgs);
-        }
-
         /// <summary>
         /// Verifies that the dotnet folder contents of an SDK container match the contents in the official SDK archive file.
         /// </summary>
@@ -374,7 +346,7 @@ private string GetSdkUrl(ProductImageData imageData)
                 : GetSdkVersionFileLabel(sdkBuildVersion, imageData.VersionString);
 
             string osType = DockerHelper.IsLinuxContainerModeEnabled ? "linux" : "win";
-            if (imageData.SdkOS.StartsWith(OS.Alpine))
+            if (imageData.SdkOS.Family == OSFamily.Alpine)
             {
                 osType += "-musl";
             }
@@ -394,27 +366,6 @@ private string GetSdkUrl(ProductImageData imageData)
             return url;
         }
 
-        private void PowerShellScenario_Execute(ProductImageData imageData, string? optionalArgs = null)
-        {
-            string image = imageData.GetImage(DotNetImageRepo.SDK, DockerHelper);
-
-            if (!imageData.SupportsPowerShell)
-            {
-                OutputHelper.WriteLine($"PowerShell is not supproted on {image}");
-                return;
-            }
-
-            // A basic test which executes an arbitrary command to validate PS is functional
-            string output = DockerHelper.Run(
-                image: image,
-                name: imageData.GetIdentifier($"pwsh"),
-                optionalRunArgs: optionalArgs,
-                command: $"pwsh -c (Get-Childitem env:DOTNET_RUNNING_IN_CONTAINER).Value"
-            );
-
-            Assert.Equal(output, bool.TrueString, ignoreCase: true);
-        }
-
         private record SdkContentFileInfo
         {
             public string Path { get; init; }
diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
index 98677d9a6d..8e2c4b9578 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,
@@ -311,9 +347,9 @@ public static class TestData
 
         private static readonly SampleImageData[] s_linuxSampleTestData =
         {
-            new SampleImageData { OS = OS.Alpine,           Arch = Arch.Amd64, DockerfileSuffix = "alpine",   IsPublished = true },
-            new SampleImageData { OS = OS.Alpine,           Arch = Arch.Arm,   DockerfileSuffix = "alpine",   IsPublished = true },
-            new SampleImageData { OS = OS.Alpine,           Arch = Arch.Arm64, DockerfileSuffix = "alpine",   IsPublished = true },
+            new SampleImageData { OS = OS.AlpineFloating,   Arch = Arch.Amd64, DockerfileSuffix = "alpine",   IsPublished = true },
+            new SampleImageData { OS = OS.AlpineFloating,   Arch = Arch.Arm,   DockerfileSuffix = "alpine",   IsPublished = true },
+            new SampleImageData { OS = OS.AlpineFloating,   Arch = Arch.Arm64, DockerfileSuffix = "alpine",   IsPublished = true },
             new SampleImageData { OS = OS.JammyChiseled,    Arch = Arch.Arm,   DockerfileSuffix = "chiseled", IsPublished = true },
             new SampleImageData { OS = OS.JammyChiseled,    Arch = Arch.Arm64, DockerfileSuffix = "chiseled", IsPublished = true },
             new SampleImageData { OS = OS.JammyChiseled,    Arch = Arch.Amd64, DockerfileSuffix = "chiseled", IsPublished = true },
@@ -321,10 +357,10 @@ public static class TestData
             new SampleImageData { OS = OS.BookwormSlim,     Arch = Arch.Amd64 },
             new SampleImageData { OS = OS.BookwormSlim,     Arch = Arch.Arm },
             new SampleImageData { OS = OS.BookwormSlim,     Arch = Arch.Arm64 },
-            new SampleImageData { OS = OS.Alpine,           Arch = Arch.Arm64, DockerfileSuffix = "alpine" },
-            new SampleImageData { OS = OS.Alpine,           Arch = Arch.Amd64, DockerfileSuffix = "alpine" },
-            new SampleImageData { OS = OS.Alpine,           Arch = Arch.Arm64, DockerfileSuffix = "alpine-icu" },
-            new SampleImageData { OS = OS.Alpine,           Arch = Arch.Amd64, DockerfileSuffix = "alpine-icu" },
+            new SampleImageData { OS = OS.AlpineFloating,   Arch = Arch.Arm64, DockerfileSuffix = "alpine" },
+            new SampleImageData { OS = OS.AlpineFloating,   Arch = Arch.Amd64, DockerfileSuffix = "alpine" },
+            new SampleImageData { OS = OS.AlpineFloating,   Arch = Arch.Arm64, DockerfileSuffix = "alpine-icu" },
+            new SampleImageData { OS = OS.AlpineFloating,   Arch = Arch.Amd64, DockerfileSuffix = "alpine-icu" },
             new SampleImageData { OS = OS.BookwormSlim,     Arch = Arch.Arm,   DockerfileSuffix = "debian" },
             new SampleImageData { OS = OS.BookwormSlim,     Arch = Arch.Arm64, DockerfileSuffix = "debian" },
             new SampleImageData { OS = OS.BookwormSlim,     Arch = Arch.Amd64, DockerfileSuffix = "debian" },
diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/NlsScenario.cs b/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/NlsScenario.cs
index 853caf3371..a67f3f82a4 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/NlsScenario.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/NlsScenario.cs
@@ -35,7 +35,7 @@ public NlsScenario(
     }
 
     // ICU is not supported on Nano Server
-    private bool IsIcuSupported => _imageData.OS.Contains(OS.ServerCore);
+    private bool IsIcuSupported => _imageData.OS.Family == OSFamily.WindowsServerCore;
 
     public Task ExecuteAsync()
     {
diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ProjectTemplateTestScenario.cs b/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ProjectTemplateTestScenario.cs
index ed7688593b..cc271f9e71 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ProjectTemplateTestScenario.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ProjectTemplateTestScenario.cs
@@ -12,17 +12,15 @@
 
 namespace Microsoft.DotNet.Docker.Tests;
 
-public abstract class ProjectTemplateTestScenario : ITestScenario, IDisposable
+public abstract class ProjectTemplateTestScenario : ITestScenario
 {
-    private bool _disposed;
-
+    protected static string OSDockerfileSuffix { get; } = DockerHelper.IsLinuxContainerModeEnabled ? "linux" : "windows";
     protected static string? AdminUser { get; } = DockerHelper.IsLinuxContainerModeEnabled ? "root" : null;
     protected static string? NonRootUser { get; } = DockerHelper.IsLinuxContainerModeEnabled ? "app" : "ContainerUser";
 
     protected DockerHelper DockerHelper { get; }
     protected ProductImageData ImageData { get; }
     protected ITestOutputHelper OutputHelper { get; }
-    protected TestSolution TestSolution { get; }
 
     protected virtual bool NonRootUserSupported => DockerHelper.IsLinuxContainerModeEnabled;
 
@@ -43,11 +41,9 @@ public ProjectTemplateTestScenario(
         DockerHelper = dockerHelper;
         ImageData = imageData;
         OutputHelper = outputHelper;
-
-        TestSolution = new(imageData, SampleName, dockerHelper, injectCustomTestCode: InjectCustomTestCode);
     }
 
-    protected string Build(string stageTarget, string[]? customBuildArgs)
+    private string Build(TestSolution testSolution, string stageTarget, string[]? customBuildArgs)
     {
         const string DockerfileName = "Dockerfile";
         string dockerfilePath = Path.Combine(DockerHelper.TestArtifactsDir, DockerfileName);
@@ -99,7 +95,7 @@ protected string Build(string stageTarget, string[]? customBuildArgs)
                 tag: tag,
                 dockerfile: dockerfilePath,
                 target: stageTarget,
-                contextDir: TestSolution.SolutionDir,
+                contextDir: testSolution.SolutionDir,
                 platform: ImageData.Platform,
                 buildArgs: buildArgs.ToArray());
         }
@@ -116,10 +112,20 @@ protected string Build(string stageTarget, string[]? customBuildArgs)
 
     public async Task ExecuteAsync()
     {
+        if (ImageData.Version.Major == 11)
+        {
+            OutputHelper.WriteLine("Skipping project template test scenario for .NET 11 since project templates are"
+                + " not updated yet. Re-enable when https://github.com/dotnet/sdk/issues/50295 is resolved.");
+            return;
+        }
+
         List<string> tags = [];
+        TestSolution? testSolution = null;
 
         try
         {
+            testSolution = new TestSolution(ImageData, SampleName, DockerHelper, InjectCustomTestCode);
+
             OutputHelper.WriteLine(
                 $"""
 
@@ -136,12 +142,12 @@ public async Task ExecuteAsync()
             string[] customBuildArgs = [ ..CustomDockerBuildArgs, $"rid={ImageData.Rid}" ];
 
             // Build and run app on SDK image
-            string buildTag = Build(TestDockerfile.BuildStageName, customBuildArgs);
+            string buildTag = Build(testSolution, TestDockerfile.BuildStageName, customBuildArgs);
             tags.Add(buildTag);
             await RunAsync(buildTag, command: "dotnet run --no-restore");
 
             // Build and run app stage
-            string tag = Build(TestDockerfile.AppStageName, customBuildArgs);
+            string tag = Build(testSolution, TestDockerfile.AppStageName, customBuildArgs);
             tags.Add(tag);
 
             // Don't run the app if the build output is not executable
@@ -157,27 +163,9 @@ public async Task ExecuteAsync()
         finally
         {
             tags.ForEach(DockerHelper.DeleteImage);
+            testSolution?.Dispose();
         }
     }
 
     protected abstract Task RunAsync(string image, string? user = null, string? command = null);
-
-    protected virtual void Dispose(bool disposing)
-    {
-        if (!_disposed)
-        {
-            if (disposing)
-            {
-                TestSolution.Dispose();
-            }
-
-            _disposed = true;
-        }
-    }
-
-    public void Dispose()
-    {
-        Dispose(disposing: true);
-        GC.SuppressFinalize(this);
-    }
 }