diff --git a/src/azurelinux/3.0/net10.0/source-build-test/amd64/Dockerfile b/src/azurelinux/3.0/net8.0/source-build-test/amd64/Dockerfile
similarity index 78%
rename from src/azurelinux/3.0/net10.0/source-build-test/amd64/Dockerfile
rename to src/azurelinux/3.0/net8.0/source-build-test/amd64/Dockerfile
index 0ead5cb5..4c524389 100644
--- a/src/azurelinux/3.0/net10.0/source-build-test/amd64/Dockerfile
+++ b/src/azurelinux/3.0/net8.0/source-build-test/amd64/Dockerfile
@@ -1,4 +1,5 @@
-FROM mcr.microsoft.com/dotnet/sdk:10.0-azurelinux3.0-amd64 AS installer
+ARG DOTNET_VERSION
+FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION}-azurelinux3.0-amd64 AS installer
 
 # Install dependencies for building pyicu wheel from source (dependency of scancode-toolkit)
 RUN tdnf update -y \
@@ -17,10 +18,11 @@ RUN tdnf update -y \
 RUN SCANCODE_VERSION="32.4.1" \
     && python3 -m venv /venv \
     && source /venv/bin/activate \
-    && pip install scancode-toolkit==$SCANCODE_VERSION
+    && pip install scancode-toolkit==$SCANCODE_VERSION \
+    && pip install click==8.2.2
 
 
-FROM mcr.microsoft.com/dotnet/sdk:10.0-azurelinux3.0-amd64
+FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION}-azurelinux3.0-amd64
 
 COPY --from=installer /venv /venv
 
diff --git a/src/azurelinux/3.0/net10.0/source-build-test/amd64/run-scancode.sh b/src/azurelinux/3.0/net8.0/source-build-test/amd64/run-scancode.sh
similarity index 100%
rename from src/azurelinux/3.0/net10.0/source-build-test/amd64/run-scancode.sh
rename to src/azurelinux/3.0/net8.0/source-build-test/amd64/run-scancode.sh
diff --git a/src/azurelinux/manifest.json b/src/azurelinux/manifest.json
index f7bcbadb..9bf9813e 100644
--- a/src/azurelinux/manifest.json
+++ b/src/azurelinux/manifest.json
@@ -33,11 +33,12 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net8.0/crossdeps/amd64",
+              "architecture": "amd64",
+              "dockerfile": "src/azurelinux/3.0/helix",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-crossdeps-amd64": {}
+                "azurelinux-3.0-helix-amd64": {}
               }
             }
           ]
@@ -45,23 +46,25 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/crossdeps/amd64",
+              "architecture": "arm64",
+              "dockerfile": "src/azurelinux/3.0/helix",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-crossdeps-amd64": {}
-              }
+                "azurelinux-3.0-helix-arm64v8": {}
+              },
+              "variant": "v8"
             }
           ]
         },
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/crossdeps/amd64",
+              "dockerfile": "src/azurelinux/3.0/net8.0/android/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-crossdeps-amd64": {}
+                "azurelinux-3.0-net8.0-android-amd64": {}
               }
             }
           ]
@@ -69,11 +72,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net8.0/crossdeps-builder/amd64",
+              "dockerfile": "src/azurelinux/3.0/net8.0/android/docker/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-crossdeps-builder-amd64": {}
+                "azurelinux-3.0-net8.0-android-docker-amd64": {}
               }
             }
           ]
@@ -81,11 +84,12 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net8.0/crossdeps-llvm/amd64",
+              "architecture": "amd64",
+              "dockerfile": "src/azurelinux/3.0/net8.0/build/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-crossdeps-llvm-amd64": {}
+                "azurelinux-3.0-net8.0-build-amd64": {}
               }
             }
           ]
@@ -115,6 +119,31 @@
             }
           ]
         },
+        {
+          "platforms": [
+            {
+              "dockerfile": "src/azurelinux/3.0/net8.0/cross/android/amd64",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
+              "tags": {
+                "azurelinux-3.0-net8.0-cross-android-amd64": {}
+              }
+            }
+          ]
+        },
+        {
+          "platforms": [
+            {
+              "dockerfile": "src/azurelinux/3.0/net8.0/cross/android/openssl/amd64",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
+              "tags": {
+                "azurelinux-3.0-net8.0-android-openssl": {},
+                "azurelinux-3.0-net8.0-cross-android-openssl-amd64": {}
+              }
+            }
+          ]
+        },
         {
           "platforms": [
             {
@@ -168,11 +197,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net8.0/cross/x86",
+              "dockerfile": "src/azurelinux/3.0/net8.0/cross/freebsd/14/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-cross-x86": {}
+                "azurelinux-3.0-net8.0-cross-freebsd-14-amd64": {}
               }
             }
           ]
@@ -180,11 +209,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net8.0/fpm/amd64",
+              "dockerfile": "src/azurelinux/3.0/net8.0/cross/ppc64le",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-fpm-amd64": {}
+                "azurelinux-3.0-net8.0-cross-ppc64le": {}
               }
             }
           ]
@@ -192,11 +221,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/fpm/amd64",
+              "dockerfile": "src/azurelinux/3.0/net8.0/cross/riscv64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-fpm-amd64": {}
+                "azurelinux-3.0-net8.0-cross-riscv64": {}
               }
             }
           ]
@@ -204,11 +233,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/crossdeps-builder/amd64",
+              "dockerfile": "src/azurelinux/3.0/net8.0/cross/s390x",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-crossdeps-builder-amd64": {}
+                "azurelinux-3.0-net8.0-cross-s390x": {}
               }
             }
           ]
@@ -216,11 +245,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/crossdeps-llvm/amd64",
+              "dockerfile": "src/azurelinux/3.0/net8.0/cross/x86",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-crossdeps-llvm-amd64": {}
+                "azurelinux-3.0-net8.0-cross-x86": {}
               }
             }
           ]
@@ -228,11 +257,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net8.0/cross/riscv64",
+              "dockerfile": "src/azurelinux/3.0/net8.0/crossdeps-builder/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-cross-riscv64": {}
+                "azurelinux-3.0-net8.0-crossdeps-builder-amd64": {}
               }
             }
           ]
@@ -240,11 +269,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/riscv64",
+              "dockerfile": "src/azurelinux/3.0/net8.0/crossdeps-llvm/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-riscv64": {}
+                "azurelinux-3.0-net8.0-crossdeps-llvm-amd64": {}
               }
             }
           ]
@@ -252,12 +281,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/riscv64-musl",
+              "dockerfile": "src/azurelinux/3.0/net8.0/crossdeps/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-riscv64-alpine": {},
-                "azurelinux-3.0-net9.0-cross-riscv64-musl": {}
+                "azurelinux-3.0-net8.0-crossdeps-amd64": {}
               }
             }
           ]
@@ -265,11 +293,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/amd64",
+              "dockerfile": "src/azurelinux/3.0/net8.0/fpm/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-amd64": {}
+                "azurelinux-3.0-net8.0-fpm-amd64": {}
               }
             }
           ]
@@ -277,11 +305,15 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/amd64-sanitizer",
+              "architecture": "amd64",
+              "dockerfile": "src/azurelinux/3.0/net8.0/source-build-test/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-amd64-sanitizer": {}
+                "azurelinux-3.0-net8.0-source-build-test-amd64": {}
+              },
+              "buildArgs": {
+                "DOTNET_VERSION": "8.0"
               }
             }
           ]
@@ -289,12 +321,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/amd64-musl",
+              "dockerfile": "src/azurelinux/3.0/net8.0/webassembly/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-amd64-alpine": {},
-                "azurelinux-3.0-net9.0-cross-amd64-musl": {}
+                "azurelinux-3.0-net8.0-webassembly-amd64": {}
               }
             }
           ]
@@ -302,11 +333,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/arm",
+              "dockerfile": "src/azurelinux/3.0/net9.0/android/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-arm": {}
+                "azurelinux-3.0-net9.0-android-amd64": {}
               }
             }
           ]
@@ -314,12 +345,12 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/arm-musl",
+              "dockerfile": "src/azurelinux/3.0/net9.0/android/docker/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-arm-alpine": {},
-                "azurelinux-3.0-net9.0-cross-arm-musl": {}
+                "azurelinux-3.0-net9.0-android-docker": {},
+                "azurelinux-3.0-net9.0-android-docker-amd64": {}
               }
             }
           ]
@@ -327,11 +358,12 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/arm64",
+              "architecture": "amd64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/build/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-arm64": {}
+                "azurelinux-3.0-net9.0-build-amd64": {}
               }
             }
           ]
@@ -339,12 +371,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/arm64-musl",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-arm64-alpine": {},
-                "azurelinux-3.0-net9.0-cross-arm64-musl": {}
+                "azurelinux-3.0-net9.0-cross-amd64": {}
               }
             }
           ]
@@ -352,11 +383,12 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/x86",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/amd64-musl",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-x86": {}
+                "azurelinux-3.0-net9.0-cross-amd64-alpine": {},
+                "azurelinux-3.0-net9.0-cross-amd64-musl": {}
               }
             }
           ]
@@ -364,11 +396,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net8.0/webassembly/amd64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/amd64-sanitizer",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-webassembly-amd64": {}
+                "azurelinux-3.0-net9.0-cross-amd64-sanitizer": {}
               }
             }
           ]
@@ -376,11 +408,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/webassembly/amd64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/android/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-webassembly-amd64": {}
+                "azurelinux-3.0-net9.0-cross-android-amd64": {}
               }
             }
           ]
@@ -388,11 +420,12 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net8.0/android/amd64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/android/openssl/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-android-amd64": {}
+                "azurelinux-3.0-net9.0-android-openssl": {},
+                "azurelinux-3.0-net9.0-cross-android-openssl-amd64": {}
               }
             }
           ]
@@ -400,11 +433,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net8.0/cross/android/amd64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/arm",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-cross-android-amd64": {}
+                "azurelinux-3.0-net9.0-cross-arm": {}
               }
             }
           ]
@@ -412,11 +445,12 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net8.0/android/docker/amd64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/arm-musl",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-android-docker-amd64": {}
+                "azurelinux-3.0-net9.0-cross-arm-alpine": {},
+                "azurelinux-3.0-net9.0-cross-arm-musl": {}
               }
             }
           ]
@@ -424,12 +458,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net8.0/cross/android/openssl/amd64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/arm64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-android-openssl": {},
-                "azurelinux-3.0-net8.0-cross-android-openssl-amd64": {}
+                "azurelinux-3.0-net9.0-cross-arm64": {}
               }
             }
           ]
@@ -437,11 +470,12 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/android/amd64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/arm64-musl",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-android-amd64": {}
+                "azurelinux-3.0-net9.0-cross-arm64-alpine": {},
+                "azurelinux-3.0-net9.0-cross-arm64-musl": {}
               }
             }
           ]
@@ -449,11 +483,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/android/amd64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/armv6",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-android-amd64": {}
+                "azurelinux-3.0-net9.0-cross-armv6": {}
               }
             }
           ]
@@ -461,12 +495,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/android/docker/amd64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/freebsd/14/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-android-docker": {},
-                "azurelinux-3.0-net9.0-android-docker-amd64": {}
+                "azurelinux-3.0-net9.0-cross-freebsd-14-amd64": {}
               }
             }
           ]
@@ -474,12 +507,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/android/openssl/amd64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/freebsd/14/arm64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-android-openssl": {},
-                "azurelinux-3.0-net9.0-cross-android-openssl-amd64": {}
+                "azurelinux-3.0-net9.0-cross-freebsd-14-arm64": {}
               }
             }
           ]
@@ -487,11 +519,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net8.0/cross/freebsd/14/amd64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/ppc64le",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-cross-freebsd-14-amd64": {}
+                "azurelinux-3.0-net9.0-cross-ppc64le": {}
               }
             }
           ]
@@ -499,11 +531,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/freebsd/14/amd64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/riscv64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-freebsd-14-amd64": {}
+                "azurelinux-3.0-net9.0-cross-riscv64": {}
               }
             }
           ]
@@ -511,11 +543,12 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/freebsd/14/arm64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/riscv64-musl",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-freebsd-14-arm64": {}
+                "azurelinux-3.0-net9.0-cross-riscv64-alpine": {},
+                "azurelinux-3.0-net9.0-cross-riscv64-musl": {}
               }
             }
           ]
@@ -523,11 +556,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net8.0/cross/s390x",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/s390x",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-cross-s390x": {}
+                "azurelinux-3.0-net9.0-cross-s390x": {}
               }
             }
           ]
@@ -535,11 +568,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/s390x",
+              "dockerfile": "src/azurelinux/3.0/net9.0/cross/x86",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-s390x": {}
+                "azurelinux-3.0-net9.0-cross-x86": {}
               }
             }
           ]
@@ -547,11 +580,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net8.0/cross/ppc64le",
+              "dockerfile": "src/azurelinux/3.0/net9.0/crossdeps-builder/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-cross-ppc64le": {}
+                "azurelinux-3.0-net9.0-crossdeps-builder-amd64": {}
               }
             }
           ]
@@ -559,11 +592,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/ppc64le",
+              "dockerfile": "src/azurelinux/3.0/net9.0/crossdeps-llvm/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-ppc64le": {}
+                "azurelinux-3.0-net9.0-crossdeps-llvm-amd64": {}
               }
             }
           ]
@@ -571,11 +604,23 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net9.0/cross/armv6",
+              "dockerfile": "src/azurelinux/3.0/net9.0/crossdeps/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-cross-armv6": {}
+                "azurelinux-3.0-net9.0-crossdeps-amd64": {}
+              }
+            }
+          ]
+        },
+        {
+          "platforms": [
+            {
+              "dockerfile": "src/azurelinux/3.0/net9.0/fpm/amd64",
+              "os": "linux",
+              "osVersion": "azurelinux3.0",
+              "tags": {
+                "azurelinux-3.0-net9.0-fpm-amd64": {}
               }
             }
           ]
@@ -608,11 +653,15 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/fpm/amd64",
+              "architecture": "amd64",
+              "dockerfile": "src/azurelinux/3.0/net8.0/source-build-test/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-fpm-amd64": {}
+                "azurelinux-3.0-net9.0-source-build-test-amd64": {}
+              },
+              "buildArgs": {
+                "DOTNET_VERSION": "9.0"
               }
             }
           ]
@@ -620,11 +669,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/crossdeps-builder/amd64",
+              "dockerfile": "src/azurelinux/3.0/net9.0/webassembly/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-crossdeps-builder-amd64": {}
+                "azurelinux-3.0-net9.0-webassembly-amd64": {}
               }
             }
           ]
@@ -632,11 +681,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/crossdeps-llvm/amd64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/android/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-crossdeps-llvm-amd64": {}
+                "azurelinux-3.0-net10.0-android-amd64": {}
               }
             }
           ]
@@ -644,11 +693,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/cross/riscv64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/android/docker/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-riscv64": {}
+                "azurelinux-3.0-net10.0-android-docker-amd64": {}
               }
             }
           ]
@@ -656,11 +705,12 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/cross/riscv64-musl",
+              "architecture": "amd64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/build/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-riscv64-musl": {}
+                "azurelinux-3.0-net10.0-build-amd64": {}
               }
             }
           ]
@@ -668,11 +718,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/cross/loongarch64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/cross/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-loongarch64": {}
+                "azurelinux-3.0-net10.0-cross-amd64": {}
               }
             }
           ]
@@ -680,11 +730,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/cross/loongarch64-musl",
+              "dockerfile": "src/azurelinux/3.0/net10.0/cross/amd64-musl",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-loongarch64-musl": {}
+                "azurelinux-3.0-net10.0-cross-amd64-musl": {}
               }
             }
           ]
@@ -692,11 +742,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/cross/amd64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/cross/amd64-sanitizer",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-amd64": {}
+                "azurelinux-3.0-net10.0-cross-amd64-sanitizer": {}
               }
             }
           ]
@@ -704,11 +754,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/cross/amd64-sanitizer",
+              "dockerfile": "src/azurelinux/3.0/net10.0/cross/android/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-amd64-sanitizer": {}
+                "azurelinux-3.0-net10.0-cross-android-amd64": {}
               }
             }
           ]
@@ -716,11 +766,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/cross/amd64-musl",
+              "dockerfile": "src/azurelinux/3.0/net10.0/cross/android/openssl/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-amd64-musl": {}
+                "azurelinux-3.0-net10.0-cross-android-openssl-amd64": {}
               }
             }
           ]
@@ -776,11 +826,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/cross/x86",
+              "dockerfile": "src/azurelinux/3.0/net10.0/cross/armv6",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-x86": {}
+                "azurelinux-3.0-net10.0-cross-armv6": {}
               }
             }
           ]
@@ -788,11 +838,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/webassembly/amd64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/cross/freebsd/14/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-webassembly-amd64": {}
+                "azurelinux-3.0-net10.0-cross-freebsd-14-amd64": {}
               }
             }
           ]
@@ -800,11 +850,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/android/amd64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/cross/freebsd/14/arm64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-android-amd64": {}
+                "azurelinux-3.0-net10.0-cross-freebsd-14-arm64": {}
               }
             }
           ]
@@ -812,11 +862,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/cross/android/amd64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/cross/loongarch64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-android-amd64": {}
+                "azurelinux-3.0-net10.0-cross-loongarch64": {}
               }
             }
           ]
@@ -824,11 +874,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/android/docker/amd64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/cross/loongarch64-musl",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-android-docker-amd64": {}
+                "azurelinux-3.0-net10.0-cross-loongarch64-musl": {}
               }
             }
           ]
@@ -836,11 +886,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/cross/android/openssl/amd64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/cross/ppc64le",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-android-openssl-amd64": {}
+                "azurelinux-3.0-net10.0-cross-ppc64le": {}
               }
             }
           ]
@@ -848,11 +898,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/cross/freebsd/14/amd64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/cross/riscv64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-freebsd-14-amd64": {}
+                "azurelinux-3.0-net10.0-cross-riscv64": {}
               }
             }
           ]
@@ -860,11 +910,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/cross/freebsd/14/arm64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/cross/riscv64-musl",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-freebsd-14-arm64": {}
+                "azurelinux-3.0-net10.0-cross-riscv64-musl": {}
               }
             }
           ]
@@ -884,11 +934,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/cross/ppc64le",
+              "dockerfile": "src/azurelinux/3.0/net10.0/cross/x86",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-ppc64le": {}
+                "azurelinux-3.0-net10.0-cross-x86": {}
               }
             }
           ]
@@ -896,11 +946,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/cross/armv6",
+              "dockerfile": "src/azurelinux/3.0/net10.0/crossdeps-builder/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-armv6": {}
+                "azurelinux-3.0-net10.0-crossdeps-builder-amd64": {}
               }
             }
           ]
@@ -908,11 +958,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/opt",
+              "dockerfile": "src/azurelinux/3.0/net10.0/crossdeps-llvm/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-opt-amd64": {}
+                "azurelinux-3.0-net10.0-crossdeps-llvm-amd64": {}
               }
             }
           ]
@@ -920,12 +970,11 @@
         {
           "platforms": [
             {
-              "architecture": "arm64",
-              "dockerfile": "src/azurelinux/3.0/net10.0/opt",
+              "dockerfile": "src/azurelinux/3.0/net10.0/crossdeps/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-opt-arm64": {}
+                "azurelinux-3.0-net10.0-crossdeps-amd64": {}
               }
             }
           ]
@@ -933,12 +982,11 @@
         {
           "platforms": [
             {
-              "architecture": "amd64",
-              "dockerfile": "src/azurelinux/3.0/helix",
+              "dockerfile": "src/azurelinux/3.0/net10.0/fpm/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-helix-amd64": {}
+                "azurelinux-3.0-net10.0-fpm-amd64": {}
               }
             }
           ]
@@ -946,26 +994,11 @@
         {
           "platforms": [
             {
-              "architecture": "arm64",
-              "dockerfile": "src/azurelinux/3.0/helix",
-              "os": "linux",
-              "osVersion": "azurelinux3.0",
-              "tags": {
-                "azurelinux-3.0-helix-arm64v8": {}
-              },
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "platforms": [
-            {
-              "architecture": "amd64",
-              "dockerfile": "src/azurelinux/3.0/net8.0/build/amd64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/opt",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net8.0-build-amd64": {}
+                "azurelinux-3.0-net10.0-opt-amd64": {}
               }
             }
           ]
@@ -973,12 +1006,12 @@
         {
           "platforms": [
             {
-              "architecture": "amd64",
-              "dockerfile": "src/azurelinux/3.0/net9.0/build/amd64",
+              "architecture": "arm64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/opt",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net9.0-build-amd64": {}
+                "azurelinux-3.0-net10.0-opt-arm64": {}
               }
             }
           ]
@@ -987,11 +1020,14 @@
           "platforms": [
             {
               "architecture": "amd64",
-              "dockerfile": "src/azurelinux/3.0/net10.0/build/amd64",
+              "dockerfile": "src/azurelinux/3.0/net8.0/source-build-test/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-build-amd64": {}
+                "azurelinux-3.0-net10.0-source-build-test-amd64": {}
+              },
+              "buildArgs": {
+                "DOTNET_VERSION": "10.0"
               }
             }
           ]
@@ -999,12 +1035,11 @@
         {
           "platforms": [
             {
-              "architecture": "amd64",
-              "dockerfile": "src/azurelinux/3.0/net10.0/source-build-test/amd64",
+              "dockerfile": "src/azurelinux/3.0/net10.0/webassembly/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-source-build-test-amd64": {}
+                "azurelinux-3.0-net10.0-webassembly-amd64": {}
               }
             }
           ]