diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
index d745377a17ee67..dc63aef0771c33 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -23,8 +23,8 @@
     <_generateRuntimeGraphTask>$([MSBuild]::NormalizePath('$(BaseOutputPath)', $(Configuration), '$(_generateRuntimeGraphTargetFramework)', '$(AssemblyName).dll'))</_generateRuntimeGraphTask>
     <!-- When building from source, ensure the RID we're building for is part of the RID graph -->
     <AdditionalRuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' == 'true'">$(AdditionalRuntimeIdentifiers);$(OutputRID)</AdditionalRuntimeIdentifiers>
-    <ServicingVersion>1</ServicingVersion>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <ServicingVersion>2</ServicingVersion>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
index d94a5eab84a57a..d6676d4e0f57fc 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
@@ -19,18 +19,6 @@
     "any",
     "base"
   ],
-  "alpine-armv6": [
-    "alpine-armv6",
-    "alpine",
-    "linux-musl-armv6",
-    "linux-musl",
-    "linux-armv6",
-    "linux",
-    "unix-armv6",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine-arm64": [
     "alpine-arm64",
     "alpine",
@@ -43,26 +31,26 @@
     "any",
     "base"
   ],
-  "alpine-x64": [
-    "alpine-x64",
+  "alpine-armv6": [
+    "alpine-armv6",
     "alpine",
-    "linux-musl-x64",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-x64",
+    "linux-armv6",
     "linux",
-    "unix-x64",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine-x86": [
-    "alpine-x86",
+  "alpine-ppc64le": [
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-x86",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-x86",
+    "linux-ppc64le",
     "linux",
-    "unix-x86",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
@@ -79,14 +67,26 @@
     "any",
     "base"
   ],
-  "alpine-ppc64le": [
-    "alpine-ppc64le",
+  "alpine-x64": [
+    "alpine-x64",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-x64",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-x64",
     "linux",
-    "unix-ppc64le",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "alpine-x86": [
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
     "unix",
     "any",
     "base"
@@ -126,28 +126,6 @@
     "any",
     "base"
   ],
-  "alpine.3.10-armv6": [
-    "alpine.3.10-armv6",
-    "alpine.3.10",
-    "alpine.3.9-armv6",
-    "alpine.3.9",
-    "alpine.3.8-armv6",
-    "alpine.3.8",
-    "alpine.3.7-armv6",
-    "alpine.3.7",
-    "alpine.3.6-armv6",
-    "alpine.3.6",
-    "alpine-armv6",
-    "alpine",
-    "linux-musl-armv6",
-    "linux-musl",
-    "linux-armv6",
-    "linux",
-    "unix-armv6",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.10-arm64": [
     "alpine.3.10-arm64",
     "alpine.3.10",
@@ -170,46 +148,46 @@
     "any",
     "base"
   ],
-  "alpine.3.10-x64": [
-    "alpine.3.10-x64",
+  "alpine.3.10-armv6": [
+    "alpine.3.10-armv6",
     "alpine.3.10",
-    "alpine.3.9-x64",
+    "alpine.3.9-armv6",
     "alpine.3.9",
-    "alpine.3.8-x64",
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-x64",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-x64",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-x64",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-x64",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-x64",
+    "linux-armv6",
     "linux",
-    "unix-x64",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.10-x86": [
-    "alpine.3.10-x86",
+  "alpine.3.10-ppc64le": [
+    "alpine.3.10-ppc64le",
     "alpine.3.10",
-    "alpine.3.9-x86",
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-x86",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-x86",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-x86",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-x86",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-x86",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-x86",
+    "linux-ppc64le",
     "linux",
-    "unix-x86",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
@@ -236,24 +214,46 @@
     "any",
     "base"
   ],
-  "alpine.3.10-ppc64le": [
-    "alpine.3.10-ppc64le",
+  "alpine.3.10-x64": [
+    "alpine.3.10-x64",
     "alpine.3.10",
-    "alpine.3.9-ppc64le",
+    "alpine.3.9-x64",
     "alpine.3.9",
-    "alpine.3.8-ppc64le",
+    "alpine.3.8-x64",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-x64",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-x64",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-x64",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-x64",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-x64",
     "linux",
-    "unix-ppc64le",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "alpine.3.10-x86": [
+    "alpine.3.10-x86",
+    "alpine.3.10",
+    "alpine.3.9-x86",
+    "alpine.3.9",
+    "alpine.3.8-x86",
+    "alpine.3.8",
+    "alpine.3.7-x86",
+    "alpine.3.7",
+    "alpine.3.6-x86",
+    "alpine.3.6",
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
     "unix",
     "any",
     "base"
@@ -296,6 +296,30 @@
     "any",
     "base"
   ],
+  "alpine.3.11-arm64": [
+    "alpine.3.11-arm64",
+    "alpine.3.11",
+    "alpine.3.10-arm64",
+    "alpine.3.10",
+    "alpine.3.9-arm64",
+    "alpine.3.9",
+    "alpine.3.8-arm64",
+    "alpine.3.8",
+    "alpine.3.7-arm64",
+    "alpine.3.7",
+    "alpine.3.6-arm64",
+    "alpine.3.6",
+    "alpine-arm64",
+    "alpine",
+    "linux-musl-arm64",
+    "linux-musl",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.11-armv6": [
     "alpine.3.11-armv6",
     "alpine.3.11",
@@ -320,26 +344,50 @@
     "any",
     "base"
   ],
-  "alpine.3.11-arm64": [
-    "alpine.3.11-arm64",
+  "alpine.3.11-ppc64le": [
+    "alpine.3.11-ppc64le",
     "alpine.3.11",
-    "alpine.3.10-arm64",
+    "alpine.3.10-ppc64le",
     "alpine.3.10",
-    "alpine.3.9-arm64",
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-arm64",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-arm64",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-arm64",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-arm64",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-arm64",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-arm64",
+    "linux-ppc64le",
     "linux",
-    "unix-arm64",
+    "unix-ppc64le",
+    "unix",
+    "any",
+    "base"
+  ],
+  "alpine.3.11-s390x": [
+    "alpine.3.11-s390x",
+    "alpine.3.11",
+    "alpine.3.10-s390x",
+    "alpine.3.10",
+    "alpine.3.9-s390x",
+    "alpine.3.9",
+    "alpine.3.8-s390x",
+    "alpine.3.8",
+    "alpine.3.7-s390x",
+    "alpine.3.7",
+    "alpine.3.6-s390x",
+    "alpine.3.6",
+    "alpine-s390x",
+    "alpine",
+    "linux-musl-s390x",
+    "linux-musl",
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
     "unix",
     "any",
     "base"
@@ -392,143 +440,147 @@
     "any",
     "base"
   ],
-  "alpine.3.11-s390x": [
-    "alpine.3.11-s390x",
+  "alpine.3.12": [
+    "alpine.3.12",
     "alpine.3.11",
-    "alpine.3.10-s390x",
     "alpine.3.10",
-    "alpine.3.9-s390x",
     "alpine.3.9",
-    "alpine.3.8-s390x",
     "alpine.3.8",
-    "alpine.3.7-s390x",
     "alpine.3.7",
-    "alpine.3.6-s390x",
     "alpine.3.6",
-    "alpine-s390x",
     "alpine",
-    "linux-musl-s390x",
     "linux-musl",
-    "linux-s390x",
     "linux",
-    "unix-s390x",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.11-ppc64le": [
-    "alpine.3.11-ppc64le",
+  "alpine.3.12-arm": [
+    "alpine.3.12-arm",
+    "alpine.3.12",
+    "alpine.3.11-arm",
     "alpine.3.11",
-    "alpine.3.10-ppc64le",
+    "alpine.3.10-arm",
     "alpine.3.10",
-    "alpine.3.9-ppc64le",
+    "alpine.3.9-arm",
     "alpine.3.9",
-    "alpine.3.8-ppc64le",
+    "alpine.3.8-arm",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-arm",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-arm",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-arm",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-arm",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-arm",
     "linux",
-    "unix-ppc64le",
+    "unix-arm",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.12": [
+  "alpine.3.12-arm64": [
+    "alpine.3.12-arm64",
     "alpine.3.12",
+    "alpine.3.11-arm64",
     "alpine.3.11",
+    "alpine.3.10-arm64",
     "alpine.3.10",
+    "alpine.3.9-arm64",
     "alpine.3.9",
+    "alpine.3.8-arm64",
     "alpine.3.8",
+    "alpine.3.7-arm64",
     "alpine.3.7",
+    "alpine.3.6-arm64",
     "alpine.3.6",
+    "alpine-arm64",
     "alpine",
+    "linux-musl-arm64",
     "linux-musl",
+    "linux-arm64",
     "linux",
+    "unix-arm64",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.12-arm": [
-    "alpine.3.12-arm",
+  "alpine.3.12-armv6": [
+    "alpine.3.12-armv6",
     "alpine.3.12",
-    "alpine.3.11-arm",
+    "alpine.3.11-armv6",
     "alpine.3.11",
-    "alpine.3.10-arm",
+    "alpine.3.10-armv6",
     "alpine.3.10",
-    "alpine.3.9-arm",
+    "alpine.3.9-armv6",
     "alpine.3.9",
-    "alpine.3.8-arm",
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-arm",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-arm",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-arm",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-arm",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-arm",
+    "linux-armv6",
     "linux",
-    "unix-arm",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.12-armv6": [
-    "alpine.3.12-armv6",
+  "alpine.3.12-ppc64le": [
+    "alpine.3.12-ppc64le",
     "alpine.3.12",
-    "alpine.3.11-armv6",
+    "alpine.3.11-ppc64le",
     "alpine.3.11",
-    "alpine.3.10-armv6",
+    "alpine.3.10-ppc64le",
     "alpine.3.10",
-    "alpine.3.9-armv6",
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-armv6",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-armv6",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-armv6",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-armv6",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-armv6",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-armv6",
+    "linux-ppc64le",
     "linux",
-    "unix-armv6",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.12-arm64": [
-    "alpine.3.12-arm64",
+  "alpine.3.12-s390x": [
+    "alpine.3.12-s390x",
     "alpine.3.12",
-    "alpine.3.11-arm64",
+    "alpine.3.11-s390x",
     "alpine.3.11",
-    "alpine.3.10-arm64",
+    "alpine.3.10-s390x",
     "alpine.3.10",
-    "alpine.3.9-arm64",
+    "alpine.3.9-s390x",
     "alpine.3.9",
-    "alpine.3.8-arm64",
+    "alpine.3.8-s390x",
     "alpine.3.8",
-    "alpine.3.7-arm64",
+    "alpine.3.7-s390x",
     "alpine.3.7",
-    "alpine.3.6-arm64",
+    "alpine.3.6-s390x",
     "alpine.3.6",
-    "alpine-arm64",
+    "alpine-s390x",
     "alpine",
-    "linux-musl-arm64",
+    "linux-musl-s390x",
     "linux-musl",
-    "linux-arm64",
+    "linux-s390x",
     "linux",
-    "unix-arm64",
+    "unix-s390x",
     "unix",
     "any",
     "base"
@@ -585,154 +637,158 @@
     "any",
     "base"
   ],
-  "alpine.3.12-s390x": [
-    "alpine.3.12-s390x",
+  "alpine.3.13": [
+    "alpine.3.13",
     "alpine.3.12",
-    "alpine.3.11-s390x",
     "alpine.3.11",
-    "alpine.3.10-s390x",
     "alpine.3.10",
-    "alpine.3.9-s390x",
     "alpine.3.9",
-    "alpine.3.8-s390x",
     "alpine.3.8",
-    "alpine.3.7-s390x",
     "alpine.3.7",
-    "alpine.3.6-s390x",
     "alpine.3.6",
-    "alpine-s390x",
     "alpine",
-    "linux-musl-s390x",
     "linux-musl",
-    "linux-s390x",
     "linux",
-    "unix-s390x",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.12-ppc64le": [
-    "alpine.3.12-ppc64le",
+  "alpine.3.13-arm": [
+    "alpine.3.13-arm",
+    "alpine.3.13",
+    "alpine.3.12-arm",
     "alpine.3.12",
-    "alpine.3.11-ppc64le",
+    "alpine.3.11-arm",
     "alpine.3.11",
-    "alpine.3.10-ppc64le",
+    "alpine.3.10-arm",
     "alpine.3.10",
-    "alpine.3.9-ppc64le",
+    "alpine.3.9-arm",
     "alpine.3.9",
-    "alpine.3.8-ppc64le",
+    "alpine.3.8-arm",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-arm",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-arm",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-arm",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-arm",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-arm",
     "linux",
-    "unix-ppc64le",
+    "unix-arm",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.13": [
+  "alpine.3.13-arm64": [
+    "alpine.3.13-arm64",
     "alpine.3.13",
+    "alpine.3.12-arm64",
     "alpine.3.12",
+    "alpine.3.11-arm64",
     "alpine.3.11",
+    "alpine.3.10-arm64",
     "alpine.3.10",
+    "alpine.3.9-arm64",
     "alpine.3.9",
+    "alpine.3.8-arm64",
     "alpine.3.8",
+    "alpine.3.7-arm64",
     "alpine.3.7",
+    "alpine.3.6-arm64",
     "alpine.3.6",
+    "alpine-arm64",
     "alpine",
+    "linux-musl-arm64",
     "linux-musl",
+    "linux-arm64",
     "linux",
+    "unix-arm64",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.13-arm": [
-    "alpine.3.13-arm",
+  "alpine.3.13-armv6": [
+    "alpine.3.13-armv6",
     "alpine.3.13",
-    "alpine.3.12-arm",
+    "alpine.3.12-armv6",
     "alpine.3.12",
-    "alpine.3.11-arm",
+    "alpine.3.11-armv6",
     "alpine.3.11",
-    "alpine.3.10-arm",
+    "alpine.3.10-armv6",
     "alpine.3.10",
-    "alpine.3.9-arm",
+    "alpine.3.9-armv6",
     "alpine.3.9",
-    "alpine.3.8-arm",
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-arm",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-arm",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-arm",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-arm",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-arm",
+    "linux-armv6",
     "linux",
-    "unix-arm",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.13-armv6": [
-    "alpine.3.13-armv6",
+  "alpine.3.13-ppc64le": [
+    "alpine.3.13-ppc64le",
     "alpine.3.13",
-    "alpine.3.12-armv6",
+    "alpine.3.12-ppc64le",
     "alpine.3.12",
-    "alpine.3.11-armv6",
+    "alpine.3.11-ppc64le",
     "alpine.3.11",
-    "alpine.3.10-armv6",
+    "alpine.3.10-ppc64le",
     "alpine.3.10",
-    "alpine.3.9-armv6",
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-armv6",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-armv6",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-armv6",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-armv6",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-armv6",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-armv6",
+    "linux-ppc64le",
     "linux",
-    "unix-armv6",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.13-arm64": [
-    "alpine.3.13-arm64",
+  "alpine.3.13-s390x": [
+    "alpine.3.13-s390x",
     "alpine.3.13",
-    "alpine.3.12-arm64",
+    "alpine.3.12-s390x",
     "alpine.3.12",
-    "alpine.3.11-arm64",
+    "alpine.3.11-s390x",
     "alpine.3.11",
-    "alpine.3.10-arm64",
+    "alpine.3.10-s390x",
     "alpine.3.10",
-    "alpine.3.9-arm64",
+    "alpine.3.9-s390x",
     "alpine.3.9",
-    "alpine.3.8-arm64",
+    "alpine.3.8-s390x",
     "alpine.3.8",
-    "alpine.3.7-arm64",
+    "alpine.3.7-s390x",
     "alpine.3.7",
-    "alpine.3.6-arm64",
+    "alpine.3.6-s390x",
     "alpine.3.6",
-    "alpine-arm64",
+    "alpine-s390x",
     "alpine",
-    "linux-musl-arm64",
+    "linux-musl-s390x",
     "linux-musl",
-    "linux-arm64",
+    "linux-s390x",
     "linux",
-    "unix-arm64",
+    "unix-s390x",
     "unix",
     "any",
     "base"
@@ -793,165 +849,169 @@
     "any",
     "base"
   ],
-  "alpine.3.13-s390x": [
-    "alpine.3.13-s390x",
+  "alpine.3.14": [
+    "alpine.3.14",
     "alpine.3.13",
-    "alpine.3.12-s390x",
     "alpine.3.12",
-    "alpine.3.11-s390x",
     "alpine.3.11",
-    "alpine.3.10-s390x",
     "alpine.3.10",
-    "alpine.3.9-s390x",
     "alpine.3.9",
-    "alpine.3.8-s390x",
     "alpine.3.8",
-    "alpine.3.7-s390x",
     "alpine.3.7",
-    "alpine.3.6-s390x",
     "alpine.3.6",
-    "alpine-s390x",
     "alpine",
-    "linux-musl-s390x",
     "linux-musl",
-    "linux-s390x",
     "linux",
-    "unix-s390x",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.13-ppc64le": [
-    "alpine.3.13-ppc64le",
+  "alpine.3.14-arm": [
+    "alpine.3.14-arm",
+    "alpine.3.14",
+    "alpine.3.13-arm",
     "alpine.3.13",
-    "alpine.3.12-ppc64le",
+    "alpine.3.12-arm",
     "alpine.3.12",
-    "alpine.3.11-ppc64le",
+    "alpine.3.11-arm",
     "alpine.3.11",
-    "alpine.3.10-ppc64le",
+    "alpine.3.10-arm",
     "alpine.3.10",
-    "alpine.3.9-ppc64le",
+    "alpine.3.9-arm",
     "alpine.3.9",
-    "alpine.3.8-ppc64le",
+    "alpine.3.8-arm",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-arm",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-arm",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-arm",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-arm",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-arm",
     "linux",
-    "unix-ppc64le",
+    "unix-arm",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.14": [
+  "alpine.3.14-arm64": [
+    "alpine.3.14-arm64",
     "alpine.3.14",
+    "alpine.3.13-arm64",
     "alpine.3.13",
+    "alpine.3.12-arm64",
     "alpine.3.12",
+    "alpine.3.11-arm64",
     "alpine.3.11",
+    "alpine.3.10-arm64",
     "alpine.3.10",
+    "alpine.3.9-arm64",
     "alpine.3.9",
+    "alpine.3.8-arm64",
     "alpine.3.8",
+    "alpine.3.7-arm64",
     "alpine.3.7",
+    "alpine.3.6-arm64",
     "alpine.3.6",
+    "alpine-arm64",
     "alpine",
+    "linux-musl-arm64",
     "linux-musl",
+    "linux-arm64",
     "linux",
+    "unix-arm64",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.14-arm": [
-    "alpine.3.14-arm",
+  "alpine.3.14-armv6": [
+    "alpine.3.14-armv6",
     "alpine.3.14",
-    "alpine.3.13-arm",
+    "alpine.3.13-armv6",
     "alpine.3.13",
-    "alpine.3.12-arm",
+    "alpine.3.12-armv6",
     "alpine.3.12",
-    "alpine.3.11-arm",
+    "alpine.3.11-armv6",
     "alpine.3.11",
-    "alpine.3.10-arm",
+    "alpine.3.10-armv6",
     "alpine.3.10",
-    "alpine.3.9-arm",
+    "alpine.3.9-armv6",
     "alpine.3.9",
-    "alpine.3.8-arm",
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-arm",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-arm",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-arm",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-arm",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-arm",
+    "linux-armv6",
     "linux",
-    "unix-arm",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.14-armv6": [
-    "alpine.3.14-armv6",
+  "alpine.3.14-ppc64le": [
+    "alpine.3.14-ppc64le",
     "alpine.3.14",
-    "alpine.3.13-armv6",
+    "alpine.3.13-ppc64le",
     "alpine.3.13",
-    "alpine.3.12-armv6",
+    "alpine.3.12-ppc64le",
     "alpine.3.12",
-    "alpine.3.11-armv6",
+    "alpine.3.11-ppc64le",
     "alpine.3.11",
-    "alpine.3.10-armv6",
+    "alpine.3.10-ppc64le",
     "alpine.3.10",
-    "alpine.3.9-armv6",
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-armv6",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-armv6",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-armv6",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-armv6",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-armv6",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-armv6",
+    "linux-ppc64le",
     "linux",
-    "unix-armv6",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.14-arm64": [
-    "alpine.3.14-arm64",
+  "alpine.3.14-s390x": [
+    "alpine.3.14-s390x",
     "alpine.3.14",
-    "alpine.3.13-arm64",
+    "alpine.3.13-s390x",
     "alpine.3.13",
-    "alpine.3.12-arm64",
+    "alpine.3.12-s390x",
     "alpine.3.12",
-    "alpine.3.11-arm64",
+    "alpine.3.11-s390x",
     "alpine.3.11",
-    "alpine.3.10-arm64",
+    "alpine.3.10-s390x",
     "alpine.3.10",
-    "alpine.3.9-arm64",
+    "alpine.3.9-s390x",
     "alpine.3.9",
-    "alpine.3.8-arm64",
+    "alpine.3.8-s390x",
     "alpine.3.8",
-    "alpine.3.7-arm64",
+    "alpine.3.7-s390x",
     "alpine.3.7",
-    "alpine.3.6-arm64",
+    "alpine.3.6-s390x",
     "alpine.3.6",
-    "alpine-arm64",
+    "alpine-s390x",
     "alpine",
-    "linux-musl-arm64",
+    "linux-musl-s390x",
     "linux-musl",
-    "linux-arm64",
+    "linux-s390x",
     "linux",
-    "unix-arm64",
+    "unix-s390x",
     "unix",
     "any",
     "base"
@@ -1016,66 +1076,6 @@
     "any",
     "base"
   ],
-  "alpine.3.14-s390x": [
-    "alpine.3.14-s390x",
-    "alpine.3.14",
-    "alpine.3.13-s390x",
-    "alpine.3.13",
-    "alpine.3.12-s390x",
-    "alpine.3.12",
-    "alpine.3.11-s390x",
-    "alpine.3.11",
-    "alpine.3.10-s390x",
-    "alpine.3.10",
-    "alpine.3.9-s390x",
-    "alpine.3.9",
-    "alpine.3.8-s390x",
-    "alpine.3.8",
-    "alpine.3.7-s390x",
-    "alpine.3.7",
-    "alpine.3.6-s390x",
-    "alpine.3.6",
-    "alpine-s390x",
-    "alpine",
-    "linux-musl-s390x",
-    "linux-musl",
-    "linux-s390x",
-    "linux",
-    "unix-s390x",
-    "unix",
-    "any",
-    "base"
-  ],
-  "alpine.3.14-ppc64le": [
-    "alpine.3.14-ppc64le",
-    "alpine.3.14",
-    "alpine.3.13-ppc64le",
-    "alpine.3.13",
-    "alpine.3.12-ppc64le",
-    "alpine.3.12",
-    "alpine.3.11-ppc64le",
-    "alpine.3.11",
-    "alpine.3.10-ppc64le",
-    "alpine.3.10",
-    "alpine.3.9-ppc64le",
-    "alpine.3.9",
-    "alpine.3.8-ppc64le",
-    "alpine.3.8",
-    "alpine.3.7-ppc64le",
-    "alpine.3.7",
-    "alpine.3.6-ppc64le",
-    "alpine.3.6",
-    "alpine-ppc64le",
-    "alpine",
-    "linux-musl-ppc64le",
-    "linux-musl",
-    "linux-ppc64le",
-    "linux",
-    "unix-ppc64le",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.15": [
     "alpine.3.15",
     "alpine.3.14",
@@ -1126,38 +1126,6 @@
     "any",
     "base"
   ],
-  "alpine.3.15-armv6": [
-    "alpine.3.15-armv6",
-    "alpine.3.15",
-    "alpine.3.14-armv6",
-    "alpine.3.14",
-    "alpine.3.13-armv6",
-    "alpine.3.13",
-    "alpine.3.12-armv6",
-    "alpine.3.12",
-    "alpine.3.11-armv6",
-    "alpine.3.11",
-    "alpine.3.10-armv6",
-    "alpine.3.10",
-    "alpine.3.9-armv6",
-    "alpine.3.9",
-    "alpine.3.8-armv6",
-    "alpine.3.8",
-    "alpine.3.7-armv6",
-    "alpine.3.7",
-    "alpine.3.6-armv6",
-    "alpine.3.6",
-    "alpine-armv6",
-    "alpine",
-    "linux-musl-armv6",
-    "linux-musl",
-    "linux-armv6",
-    "linux",
-    "unix-armv6",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.15-arm64": [
     "alpine.3.15-arm64",
     "alpine.3.15",
@@ -1190,66 +1158,66 @@
     "any",
     "base"
   ],
-  "alpine.3.15-x64": [
-    "alpine.3.15-x64",
+  "alpine.3.15-armv6": [
+    "alpine.3.15-armv6",
     "alpine.3.15",
-    "alpine.3.14-x64",
+    "alpine.3.14-armv6",
     "alpine.3.14",
-    "alpine.3.13-x64",
+    "alpine.3.13-armv6",
     "alpine.3.13",
-    "alpine.3.12-x64",
+    "alpine.3.12-armv6",
     "alpine.3.12",
-    "alpine.3.11-x64",
+    "alpine.3.11-armv6",
     "alpine.3.11",
-    "alpine.3.10-x64",
+    "alpine.3.10-armv6",
     "alpine.3.10",
-    "alpine.3.9-x64",
+    "alpine.3.9-armv6",
     "alpine.3.9",
-    "alpine.3.8-x64",
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-x64",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-x64",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-x64",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-x64",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-x64",
+    "linux-armv6",
     "linux",
-    "unix-x64",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.15-x86": [
-    "alpine.3.15-x86",
+  "alpine.3.15-ppc64le": [
+    "alpine.3.15-ppc64le",
     "alpine.3.15",
-    "alpine.3.14-x86",
+    "alpine.3.14-ppc64le",
     "alpine.3.14",
-    "alpine.3.13-x86",
+    "alpine.3.13-ppc64le",
     "alpine.3.13",
-    "alpine.3.12-x86",
+    "alpine.3.12-ppc64le",
     "alpine.3.12",
-    "alpine.3.11-x86",
+    "alpine.3.11-ppc64le",
     "alpine.3.11",
-    "alpine.3.10-x86",
+    "alpine.3.10-ppc64le",
     "alpine.3.10",
-    "alpine.3.9-x86",
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-x86",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-x86",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-x86",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-x86",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-x86",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-x86",
+    "linux-ppc64le",
     "linux",
-    "unix-x86",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
@@ -1286,34 +1254,66 @@
     "any",
     "base"
   ],
-  "alpine.3.15-ppc64le": [
-    "alpine.3.15-ppc64le",
+  "alpine.3.15-x64": [
+    "alpine.3.15-x64",
     "alpine.3.15",
-    "alpine.3.14-ppc64le",
+    "alpine.3.14-x64",
     "alpine.3.14",
-    "alpine.3.13-ppc64le",
+    "alpine.3.13-x64",
     "alpine.3.13",
-    "alpine.3.12-ppc64le",
+    "alpine.3.12-x64",
+    "alpine.3.12",
+    "alpine.3.11-x64",
+    "alpine.3.11",
+    "alpine.3.10-x64",
+    "alpine.3.10",
+    "alpine.3.9-x64",
+    "alpine.3.9",
+    "alpine.3.8-x64",
+    "alpine.3.8",
+    "alpine.3.7-x64",
+    "alpine.3.7",
+    "alpine.3.6-x64",
+    "alpine.3.6",
+    "alpine-x64",
+    "alpine",
+    "linux-musl-x64",
+    "linux-musl",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "alpine.3.15-x86": [
+    "alpine.3.15-x86",
+    "alpine.3.15",
+    "alpine.3.14-x86",
+    "alpine.3.14",
+    "alpine.3.13-x86",
+    "alpine.3.13",
+    "alpine.3.12-x86",
     "alpine.3.12",
-    "alpine.3.11-ppc64le",
+    "alpine.3.11-x86",
     "alpine.3.11",
-    "alpine.3.10-ppc64le",
+    "alpine.3.10-x86",
     "alpine.3.10",
-    "alpine.3.9-ppc64le",
+    "alpine.3.9-x86",
     "alpine.3.9",
-    "alpine.3.8-ppc64le",
+    "alpine.3.8-x86",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-x86",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-x86",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-x86",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-x86",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-x86",
     "linux",
-    "unix-ppc64le",
+    "unix-x86",
     "unix",
     "any",
     "base"
@@ -1371,40 +1371,6 @@
     "any",
     "base"
   ],
-  "alpine.3.16-armv6": [
-    "alpine.3.16-armv6",
-    "alpine.3.16",
-    "alpine.3.15-armv6",
-    "alpine.3.15",
-    "alpine.3.14-armv6",
-    "alpine.3.14",
-    "alpine.3.13-armv6",
-    "alpine.3.13",
-    "alpine.3.12-armv6",
-    "alpine.3.12",
-    "alpine.3.11-armv6",
-    "alpine.3.11",
-    "alpine.3.10-armv6",
-    "alpine.3.10",
-    "alpine.3.9-armv6",
-    "alpine.3.9",
-    "alpine.3.8-armv6",
-    "alpine.3.8",
-    "alpine.3.7-armv6",
-    "alpine.3.7",
-    "alpine.3.6-armv6",
-    "alpine.3.6",
-    "alpine-armv6",
-    "alpine",
-    "linux-musl-armv6",
-    "linux-musl",
-    "linux-armv6",
-    "linux",
-    "unix-armv6",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.16-arm64": [
     "alpine.3.16-arm64",
     "alpine.3.16",
@@ -1439,70 +1405,70 @@
     "any",
     "base"
   ],
-  "alpine.3.16-x64": [
-    "alpine.3.16-x64",
+  "alpine.3.16-armv6": [
+    "alpine.3.16-armv6",
     "alpine.3.16",
-    "alpine.3.15-x64",
+    "alpine.3.15-armv6",
     "alpine.3.15",
-    "alpine.3.14-x64",
+    "alpine.3.14-armv6",
     "alpine.3.14",
-    "alpine.3.13-x64",
+    "alpine.3.13-armv6",
     "alpine.3.13",
-    "alpine.3.12-x64",
+    "alpine.3.12-armv6",
     "alpine.3.12",
-    "alpine.3.11-x64",
+    "alpine.3.11-armv6",
     "alpine.3.11",
-    "alpine.3.10-x64",
+    "alpine.3.10-armv6",
     "alpine.3.10",
-    "alpine.3.9-x64",
+    "alpine.3.9-armv6",
     "alpine.3.9",
-    "alpine.3.8-x64",
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-x64",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-x64",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-x64",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-x64",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-x64",
+    "linux-armv6",
     "linux",
-    "unix-x64",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.16-x86": [
-    "alpine.3.16-x86",
+  "alpine.3.16-ppc64le": [
+    "alpine.3.16-ppc64le",
     "alpine.3.16",
-    "alpine.3.15-x86",
+    "alpine.3.15-ppc64le",
     "alpine.3.15",
-    "alpine.3.14-x86",
+    "alpine.3.14-ppc64le",
     "alpine.3.14",
-    "alpine.3.13-x86",
+    "alpine.3.13-ppc64le",
     "alpine.3.13",
-    "alpine.3.12-x86",
+    "alpine.3.12-ppc64le",
     "alpine.3.12",
-    "alpine.3.11-x86",
+    "alpine.3.11-ppc64le",
     "alpine.3.11",
-    "alpine.3.10-x86",
+    "alpine.3.10-ppc64le",
     "alpine.3.10",
-    "alpine.3.9-x86",
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-x86",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-x86",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-x86",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-x86",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-x86",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-x86",
+    "linux-ppc64le",
     "linux",
-    "unix-x86",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
@@ -1541,36 +1507,70 @@
     "any",
     "base"
   ],
-  "alpine.3.16-ppc64le": [
-    "alpine.3.16-ppc64le",
+  "alpine.3.16-x64": [
+    "alpine.3.16-x64",
     "alpine.3.16",
-    "alpine.3.15-ppc64le",
+    "alpine.3.15-x64",
     "alpine.3.15",
-    "alpine.3.14-ppc64le",
+    "alpine.3.14-x64",
     "alpine.3.14",
-    "alpine.3.13-ppc64le",
+    "alpine.3.13-x64",
     "alpine.3.13",
-    "alpine.3.12-ppc64le",
+    "alpine.3.12-x64",
     "alpine.3.12",
-    "alpine.3.11-ppc64le",
+    "alpine.3.11-x64",
     "alpine.3.11",
-    "alpine.3.10-ppc64le",
+    "alpine.3.10-x64",
     "alpine.3.10",
-    "alpine.3.9-ppc64le",
+    "alpine.3.9-x64",
     "alpine.3.9",
-    "alpine.3.8-ppc64le",
+    "alpine.3.8-x64",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-x64",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-x64",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-x64",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-x64",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-x64",
     "linux",
-    "unix-ppc64le",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "alpine.3.16-x86": [
+    "alpine.3.16-x86",
+    "alpine.3.16",
+    "alpine.3.15-x86",
+    "alpine.3.15",
+    "alpine.3.14-x86",
+    "alpine.3.14",
+    "alpine.3.13-x86",
+    "alpine.3.13",
+    "alpine.3.12-x86",
+    "alpine.3.12",
+    "alpine.3.11-x86",
+    "alpine.3.11",
+    "alpine.3.10-x86",
+    "alpine.3.10",
+    "alpine.3.9-x86",
+    "alpine.3.9",
+    "alpine.3.8-x86",
+    "alpine.3.8",
+    "alpine.3.7-x86",
+    "alpine.3.7",
+    "alpine.3.6-x86",
+    "alpine.3.6",
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
     "unix",
     "any",
     "base"
@@ -1631,6 +1631,42 @@
     "any",
     "base"
   ],
+  "alpine.3.17-arm64": [
+    "alpine.3.17-arm64",
+    "alpine.3.17",
+    "alpine.3.16-arm64",
+    "alpine.3.16",
+    "alpine.3.15-arm64",
+    "alpine.3.15",
+    "alpine.3.14-arm64",
+    "alpine.3.14",
+    "alpine.3.13-arm64",
+    "alpine.3.13",
+    "alpine.3.12-arm64",
+    "alpine.3.12",
+    "alpine.3.11-arm64",
+    "alpine.3.11",
+    "alpine.3.10-arm64",
+    "alpine.3.10",
+    "alpine.3.9-arm64",
+    "alpine.3.9",
+    "alpine.3.8-arm64",
+    "alpine.3.8",
+    "alpine.3.7-arm64",
+    "alpine.3.7",
+    "alpine.3.6-arm64",
+    "alpine.3.6",
+    "alpine-arm64",
+    "alpine",
+    "linux-musl-arm64",
+    "linux-musl",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.17-armv6": [
     "alpine.3.17-armv6",
     "alpine.3.17",
@@ -1667,38 +1703,74 @@
     "any",
     "base"
   ],
-  "alpine.3.17-arm64": [
-    "alpine.3.17-arm64",
+  "alpine.3.17-ppc64le": [
+    "alpine.3.17-ppc64le",
+    "alpine.3.17",
+    "alpine.3.16-ppc64le",
+    "alpine.3.16",
+    "alpine.3.15-ppc64le",
+    "alpine.3.15",
+    "alpine.3.14-ppc64le",
+    "alpine.3.14",
+    "alpine.3.13-ppc64le",
+    "alpine.3.13",
+    "alpine.3.12-ppc64le",
+    "alpine.3.12",
+    "alpine.3.11-ppc64le",
+    "alpine.3.11",
+    "alpine.3.10-ppc64le",
+    "alpine.3.10",
+    "alpine.3.9-ppc64le",
+    "alpine.3.9",
+    "alpine.3.8-ppc64le",
+    "alpine.3.8",
+    "alpine.3.7-ppc64le",
+    "alpine.3.7",
+    "alpine.3.6-ppc64le",
+    "alpine.3.6",
+    "alpine-ppc64le",
+    "alpine",
+    "linux-musl-ppc64le",
+    "linux-musl",
+    "linux-ppc64le",
+    "linux",
+    "unix-ppc64le",
+    "unix",
+    "any",
+    "base"
+  ],
+  "alpine.3.17-s390x": [
+    "alpine.3.17-s390x",
     "alpine.3.17",
-    "alpine.3.16-arm64",
+    "alpine.3.16-s390x",
     "alpine.3.16",
-    "alpine.3.15-arm64",
+    "alpine.3.15-s390x",
     "alpine.3.15",
-    "alpine.3.14-arm64",
+    "alpine.3.14-s390x",
     "alpine.3.14",
-    "alpine.3.13-arm64",
+    "alpine.3.13-s390x",
     "alpine.3.13",
-    "alpine.3.12-arm64",
+    "alpine.3.12-s390x",
     "alpine.3.12",
-    "alpine.3.11-arm64",
+    "alpine.3.11-s390x",
     "alpine.3.11",
-    "alpine.3.10-arm64",
+    "alpine.3.10-s390x",
     "alpine.3.10",
-    "alpine.3.9-arm64",
+    "alpine.3.9-s390x",
     "alpine.3.9",
-    "alpine.3.8-arm64",
+    "alpine.3.8-s390x",
     "alpine.3.8",
-    "alpine.3.7-arm64",
+    "alpine.3.7-s390x",
     "alpine.3.7",
-    "alpine.3.6-arm64",
+    "alpine.3.6-s390x",
     "alpine.3.6",
-    "alpine-arm64",
+    "alpine-s390x",
     "alpine",
-    "linux-musl-arm64",
+    "linux-musl-s390x",
     "linux-musl",
-    "linux-arm64",
+    "linux-s390x",
     "linux",
-    "unix-arm64",
+    "unix-s390x",
     "unix",
     "any",
     "base"
@@ -1775,125 +1847,81 @@
     "any",
     "base"
   ],
-  "alpine.3.17-s390x": [
-    "alpine.3.17-s390x",
-    "alpine.3.17",
-    "alpine.3.16-s390x",
-    "alpine.3.16",
-    "alpine.3.15-s390x",
-    "alpine.3.15",
-    "alpine.3.14-s390x",
-    "alpine.3.14",
-    "alpine.3.13-s390x",
-    "alpine.3.13",
-    "alpine.3.12-s390x",
-    "alpine.3.12",
-    "alpine.3.11-s390x",
-    "alpine.3.11",
-    "alpine.3.10-s390x",
-    "alpine.3.10",
-    "alpine.3.9-s390x",
-    "alpine.3.9",
-    "alpine.3.8-s390x",
-    "alpine.3.8",
-    "alpine.3.7-s390x",
-    "alpine.3.7",
-    "alpine.3.6-s390x",
+  "alpine.3.6": [
     "alpine.3.6",
-    "alpine-s390x",
     "alpine",
-    "linux-musl-s390x",
     "linux-musl",
-    "linux-s390x",
     "linux",
-    "unix-s390x",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.17-ppc64le": [
-    "alpine.3.17-ppc64le",
-    "alpine.3.17",
-    "alpine.3.16-ppc64le",
-    "alpine.3.16",
-    "alpine.3.15-ppc64le",
-    "alpine.3.15",
-    "alpine.3.14-ppc64le",
-    "alpine.3.14",
-    "alpine.3.13-ppc64le",
-    "alpine.3.13",
-    "alpine.3.12-ppc64le",
-    "alpine.3.12",
-    "alpine.3.11-ppc64le",
-    "alpine.3.11",
-    "alpine.3.10-ppc64le",
-    "alpine.3.10",
-    "alpine.3.9-ppc64le",
-    "alpine.3.9",
-    "alpine.3.8-ppc64le",
-    "alpine.3.8",
-    "alpine.3.7-ppc64le",
-    "alpine.3.7",
-    "alpine.3.6-ppc64le",
+  "alpine.3.6-arm": [
+    "alpine.3.6-arm",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-arm",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-arm",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-arm",
     "linux",
-    "unix-ppc64le",
+    "unix-arm",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.6": [
+  "alpine.3.6-arm64": [
+    "alpine.3.6-arm64",
     "alpine.3.6",
+    "alpine-arm64",
     "alpine",
+    "linux-musl-arm64",
     "linux-musl",
+    "linux-arm64",
     "linux",
+    "unix-arm64",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.6-arm": [
-    "alpine.3.6-arm",
+  "alpine.3.6-armv6": [
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-arm",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-arm",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-arm",
+    "linux-armv6",
     "linux",
-    "unix-arm",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.6-armv6": [
-    "alpine.3.6-armv6",
+  "alpine.3.6-ppc64le": [
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-armv6",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-armv6",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-armv6",
+    "linux-ppc64le",
     "linux",
-    "unix-armv6",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.6-arm64": [
-    "alpine.3.6-arm64",
+  "alpine.3.6-s390x": [
+    "alpine.3.6-s390x",
     "alpine.3.6",
-    "alpine-arm64",
+    "alpine-s390x",
     "alpine",
-    "linux-musl-arm64",
+    "linux-musl-s390x",
     "linux-musl",
-    "linux-arm64",
+    "linux-s390x",
     "linux",
-    "unix-arm64",
+    "unix-s390x",
     "unix",
     "any",
     "base"
@@ -1926,34 +1954,6 @@
     "any",
     "base"
   ],
-  "alpine.3.6-s390x": [
-    "alpine.3.6-s390x",
-    "alpine.3.6",
-    "alpine-s390x",
-    "alpine",
-    "linux-musl-s390x",
-    "linux-musl",
-    "linux-s390x",
-    "linux",
-    "unix-s390x",
-    "unix",
-    "any",
-    "base"
-  ],
-  "alpine.3.6-ppc64le": [
-    "alpine.3.6-ppc64le",
-    "alpine.3.6",
-    "alpine-ppc64le",
-    "alpine",
-    "linux-musl-ppc64le",
-    "linux-musl",
-    "linux-ppc64le",
-    "linux",
-    "unix-ppc64le",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.7": [
     "alpine.3.7",
     "alpine.3.6",
@@ -1980,22 +1980,6 @@
     "any",
     "base"
   ],
-  "alpine.3.7-armv6": [
-    "alpine.3.7-armv6",
-    "alpine.3.7",
-    "alpine.3.6-armv6",
-    "alpine.3.6",
-    "alpine-armv6",
-    "alpine",
-    "linux-musl-armv6",
-    "linux-musl",
-    "linux-armv6",
-    "linux",
-    "unix-armv6",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.7-arm64": [
     "alpine.3.7-arm64",
     "alpine.3.7",
@@ -2012,34 +1996,34 @@
     "any",
     "base"
   ],
-  "alpine.3.7-x64": [
-    "alpine.3.7-x64",
+  "alpine.3.7-armv6": [
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-x64",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-x64",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-x64",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-x64",
+    "linux-armv6",
     "linux",
-    "unix-x64",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.7-x86": [
-    "alpine.3.7-x86",
+  "alpine.3.7-ppc64le": [
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-x86",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-x86",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-x86",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-x86",
+    "linux-ppc64le",
     "linux",
-    "unix-x86",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
@@ -2060,65 +2044,63 @@
     "any",
     "base"
   ],
-  "alpine.3.7-ppc64le": [
-    "alpine.3.7-ppc64le",
+  "alpine.3.7-x64": [
+    "alpine.3.7-x64",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-x64",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-x64",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-x64",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-x64",
     "linux",
-    "unix-ppc64le",
+    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.8": [
-    "alpine.3.8",
+  "alpine.3.7-x86": [
+    "alpine.3.7-x86",
     "alpine.3.7",
+    "alpine.3.6-x86",
     "alpine.3.6",
+    "alpine-x86",
     "alpine",
+    "linux-musl-x86",
     "linux-musl",
+    "linux-x86",
     "linux",
+    "unix-x86",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.8-arm": [
-    "alpine.3.8-arm",
+  "alpine.3.8": [
     "alpine.3.8",
-    "alpine.3.7-arm",
     "alpine.3.7",
-    "alpine.3.6-arm",
     "alpine.3.6",
-    "alpine-arm",
     "alpine",
-    "linux-musl-arm",
     "linux-musl",
-    "linux-arm",
     "linux",
-    "unix-arm",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.8-armv6": [
-    "alpine.3.8-armv6",
+  "alpine.3.8-arm": [
+    "alpine.3.8-arm",
     "alpine.3.8",
-    "alpine.3.7-armv6",
+    "alpine.3.7-arm",
     "alpine.3.7",
-    "alpine.3.6-armv6",
+    "alpine.3.6-arm",
     "alpine.3.6",
-    "alpine-armv6",
+    "alpine-arm",
     "alpine",
-    "linux-musl-armv6",
+    "linux-musl-arm",
     "linux-musl",
-    "linux-armv6",
+    "linux-arm",
     "linux",
-    "unix-armv6",
+    "unix-arm",
     "unix",
     "any",
     "base"
@@ -2141,38 +2123,38 @@
     "any",
     "base"
   ],
-  "alpine.3.8-x64": [
-    "alpine.3.8-x64",
+  "alpine.3.8-armv6": [
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-x64",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-x64",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-x64",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-x64",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-x64",
+    "linux-armv6",
     "linux",
-    "unix-x64",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.8-x86": [
-    "alpine.3.8-x86",
+  "alpine.3.8-ppc64le": [
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-x86",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-x86",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-x86",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-x86",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-x86",
+    "linux-ppc64le",
     "linux",
-    "unix-x86",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
@@ -2195,72 +2177,70 @@
     "any",
     "base"
   ],
-  "alpine.3.8-ppc64le": [
-    "alpine.3.8-ppc64le",
+  "alpine.3.8-x64": [
+    "alpine.3.8-x64",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-x64",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-x64",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-x64",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-x64",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-x64",
     "linux",
-    "unix-ppc64le",
+    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.9": [
-    "alpine.3.9",
+  "alpine.3.8-x86": [
+    "alpine.3.8-x86",
     "alpine.3.8",
+    "alpine.3.7-x86",
     "alpine.3.7",
+    "alpine.3.6-x86",
     "alpine.3.6",
+    "alpine-x86",
     "alpine",
+    "linux-musl-x86",
     "linux-musl",
+    "linux-x86",
     "linux",
+    "unix-x86",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.9-arm": [
-    "alpine.3.9-arm",
+  "alpine.3.9": [
     "alpine.3.9",
-    "alpine.3.8-arm",
     "alpine.3.8",
-    "alpine.3.7-arm",
     "alpine.3.7",
-    "alpine.3.6-arm",
     "alpine.3.6",
-    "alpine-arm",
     "alpine",
-    "linux-musl-arm",
     "linux-musl",
-    "linux-arm",
     "linux",
-    "unix-arm",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.9-armv6": [
-    "alpine.3.9-armv6",
+  "alpine.3.9-arm": [
+    "alpine.3.9-arm",
     "alpine.3.9",
-    "alpine.3.8-armv6",
+    "alpine.3.8-arm",
     "alpine.3.8",
-    "alpine.3.7-armv6",
+    "alpine.3.7-arm",
     "alpine.3.7",
-    "alpine.3.6-armv6",
+    "alpine.3.6-arm",
     "alpine.3.6",
-    "alpine-armv6",
+    "alpine-arm",
     "alpine",
-    "linux-musl-armv6",
+    "linux-musl-arm",
     "linux-musl",
-    "linux-armv6",
+    "linux-arm",
     "linux",
-    "unix-armv6",
+    "unix-arm",
     "unix",
     "any",
     "base"
@@ -2285,42 +2265,42 @@
     "any",
     "base"
   ],
-  "alpine.3.9-x64": [
-    "alpine.3.9-x64",
+  "alpine.3.9-armv6": [
+    "alpine.3.9-armv6",
     "alpine.3.9",
-    "alpine.3.8-x64",
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-x64",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-x64",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-x64",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-x64",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-x64",
+    "linux-armv6",
     "linux",
-    "unix-x64",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.9-x86": [
-    "alpine.3.9-x86",
+  "alpine.3.9-ppc64le": [
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-x86",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-x86",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-x86",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-x86",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-x86",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-x86",
+    "linux-ppc64le",
     "linux",
-    "unix-x86",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
@@ -2345,22 +2325,42 @@
     "any",
     "base"
   ],
-  "alpine.3.9-ppc64le": [
-    "alpine.3.9-ppc64le",
+  "alpine.3.9-x64": [
+    "alpine.3.9-x64",
     "alpine.3.9",
-    "alpine.3.8-ppc64le",
+    "alpine.3.8-x64",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-x64",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-x64",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-x64",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-x64",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-x64",
     "linux",
-    "unix-ppc64le",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "alpine.3.9-x86": [
+    "alpine.3.9-x86",
+    "alpine.3.9",
+    "alpine.3.8-x86",
+    "alpine.3.8",
+    "alpine.3.7-x86",
+    "alpine.3.7",
+    "alpine.3.6-x86",
+    "alpine.3.6",
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
     "unix",
     "any",
     "base"
@@ -4862,6 +4862,38 @@
     "any",
     "base"
   ],
+  "fedora.39": [
+    "fedora.39",
+    "fedora",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "fedora.39-arm64": [
+    "fedora.39-arm64",
+    "fedora.39",
+    "fedora-arm64",
+    "fedora",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "fedora.39-x64": [
+    "fedora.39-x64",
+    "fedora.39",
+    "fedora-x64",
+    "fedora",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "freebsd": [
     "freebsd",
     "unix",
@@ -5673,16 +5705,6 @@
     "any",
     "base"
   ],
-  "linux-musl-armv6": [
-    "linux-musl-armv6",
-    "linux-musl",
-    "linux-armv6",
-    "linux",
-    "unix-armv6",
-    "unix",
-    "any",
-    "base"
-  ],
   "linux-musl-arm64": [
     "linux-musl-arm64",
     "linux-musl",
@@ -5703,6 +5725,16 @@
     "any",
     "base"
   ],
+  "linux-musl-armv6": [
+    "linux-musl-armv6",
+    "linux-musl",
+    "linux-armv6",
+    "linux",
+    "unix-armv6",
+    "unix",
+    "any",
+    "base"
+  ],
   "linux-musl-ppc64le": [
     "linux-musl-ppc64le",
     "linux-musl",
@@ -10423,70 +10455,70 @@
     "any",
     "base"
   ],
- "ubuntu.23.04": [
-     "ubuntu.23.04",
-     "ubuntu",
-     "debian",
-     "linux",
-     "unix",
-     "any",
-     "base"
-   ],
-   "ubuntu.23.04-arm": [
-     "ubuntu.23.04-arm",
-     "ubuntu.23.04",
-     "ubuntu-arm",
-     "ubuntu",
-     "debian-arm",
-     "debian",
-     "linux-arm",
-     "linux",
-     "unix-arm",
-     "unix",
-     "any",
-     "base"
-   ],
-   "ubuntu.23.04-arm64": [
-     "ubuntu.23.04-arm64",
-     "ubuntu.23.04",
-     "ubuntu-arm64",
-      "ubuntu",
-     "debian-arm64",
-     "debian",
-     "linux-arm64",
-     "linux",
-     "unix-arm64",
-     "unix",
-     "any",
-     "base"
+  "ubuntu.23.04": [
+    "ubuntu.23.04",
+    "ubuntu",
+    "debian",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.23.04-arm": [
+    "ubuntu.23.04-arm",
+    "ubuntu.23.04",
+    "ubuntu-arm",
+    "ubuntu",
+    "debian-arm",
+    "debian",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.23.04-arm64": [
+    "ubuntu.23.04-arm64",
+    "ubuntu.23.04",
+    "ubuntu-arm64",
+    "ubuntu",
+    "debian-arm64",
+    "debian",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
   ],
   "ubuntu.23.04-x64": [
-     "ubuntu.23.04-x64",
-     "ubuntu.23.04",
-     "ubuntu-x64",
-     "ubuntu",
-     "debian-x64",
-     "debian",
-     "linux-x64",
-     "linux",
-     "unix-x64",
-     "unix",
-     "any",
-     "base"
+    "ubuntu.23.04-x64",
+    "ubuntu.23.04",
+    "ubuntu-x64",
+    "ubuntu",
+    "debian-x64",
+    "debian",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
   ],
   "ubuntu.23.04-x86": [
-     "ubuntu.23.04-x86",
-     "ubuntu.23.04",
-     "ubuntu-x86",
-     "ubuntu",
-     "debian-x86",
-     "debian",
-     "linux-x86",
-     "linux",
-     "unix-x86",
-     "unix",
-     "any",
-     "base"
+    "ubuntu.23.04-x86",
+    "ubuntu.23.04",
+    "ubuntu-x86",
+    "ubuntu",
+    "debian-x86",
+    "debian",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
   ],
   "unix": [
     "unix",
@@ -11183,4 +11215,4 @@
     "any",
     "base"
   ]
-}
+}
\ No newline at end of file
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
index fa9441aad28019..c9dd91cf953fcb 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -11,28 +11,22 @@
         "linux-musl-arm"
       ]
     },
-    "alpine-armv6": {
-      "#import": [
-        "alpine",
-        "linux-musl-armv6"
-      ]
-    },
     "alpine-arm64": {
       "#import": [
         "alpine",
         "linux-musl-arm64"
       ]
     },
-    "alpine-x64": {
+    "alpine-armv6": {
       "#import": [
         "alpine",
-        "linux-musl-x64"
+        "linux-musl-armv6"
       ]
     },
-    "alpine-x86": {
+    "alpine-ppc64le": {
       "#import": [
         "alpine",
-        "linux-musl-x86"
+        "linux-musl-ppc64le"
       ]
     },
     "alpine-s390x": {
@@ -41,10 +35,16 @@
         "linux-musl-s390x"
       ]
     },
-    "alpine-ppc64le": {
+    "alpine-x64": {
       "#import": [
         "alpine",
-        "linux-musl-ppc64le"
+        "linux-musl-x64"
+      ]
+    },
+    "alpine-x86": {
+      "#import": [
+        "alpine",
+        "linux-musl-x86"
       ]
     },
     "alpine.3.10": {
@@ -58,28 +58,22 @@
         "alpine.3.9-arm"
       ]
     },
-    "alpine.3.10-armv6": {
-      "#import": [
-        "alpine.3.10",
-        "alpine.3.9-armv6"
-      ]
-    },
     "alpine.3.10-arm64": {
       "#import": [
         "alpine.3.10",
         "alpine.3.9-arm64"
       ]
     },
-    "alpine.3.10-x64": {
+    "alpine.3.10-armv6": {
       "#import": [
         "alpine.3.10",
-        "alpine.3.9-x64"
+        "alpine.3.9-armv6"
       ]
     },
-    "alpine.3.10-x86": {
+    "alpine.3.10-ppc64le": {
       "#import": [
         "alpine.3.10",
-        "alpine.3.9-x86"
+        "alpine.3.9-ppc64le"
       ]
     },
     "alpine.3.10-s390x": {
@@ -88,10 +82,16 @@
         "alpine.3.9-s390x"
       ]
     },
-    "alpine.3.10-ppc64le": {
+    "alpine.3.10-x64": {
       "#import": [
         "alpine.3.10",
-        "alpine.3.9-ppc64le"
+        "alpine.3.9-x64"
+      ]
+    },
+    "alpine.3.10-x86": {
+      "#import": [
+        "alpine.3.10",
+        "alpine.3.9-x86"
       ]
     },
     "alpine.3.11": {
@@ -105,28 +105,22 @@
         "alpine.3.10-arm"
       ]
     },
-    "alpine.3.11-armv6": {
-      "#import": [
-        "alpine.3.11",
-        "alpine.3.10-armv6"
-      ]
-    },
     "alpine.3.11-arm64": {
       "#import": [
         "alpine.3.11",
         "alpine.3.10-arm64"
       ]
     },
-    "alpine.3.11-x64": {
+    "alpine.3.11-armv6": {
       "#import": [
         "alpine.3.11",
-        "alpine.3.10-x64"
+        "alpine.3.10-armv6"
       ]
     },
-    "alpine.3.11-x86": {
+    "alpine.3.11-ppc64le": {
       "#import": [
         "alpine.3.11",
-        "alpine.3.10-x86"
+        "alpine.3.10-ppc64le"
       ]
     },
     "alpine.3.11-s390x": {
@@ -135,10 +129,16 @@
         "alpine.3.10-s390x"
       ]
     },
-    "alpine.3.11-ppc64le": {
+    "alpine.3.11-x64": {
       "#import": [
         "alpine.3.11",
-        "alpine.3.10-ppc64le"
+        "alpine.3.10-x64"
+      ]
+    },
+    "alpine.3.11-x86": {
+      "#import": [
+        "alpine.3.11",
+        "alpine.3.10-x86"
       ]
     },
     "alpine.3.12": {
@@ -152,28 +152,22 @@
         "alpine.3.11-arm"
       ]
     },
-    "alpine.3.12-armv6": {
-      "#import": [
-        "alpine.3.12",
-        "alpine.3.11-armv6"
-      ]
-    },
     "alpine.3.12-arm64": {
       "#import": [
         "alpine.3.12",
         "alpine.3.11-arm64"
       ]
     },
-    "alpine.3.12-x64": {
+    "alpine.3.12-armv6": {
       "#import": [
         "alpine.3.12",
-        "alpine.3.11-x64"
+        "alpine.3.11-armv6"
       ]
     },
-    "alpine.3.12-x86": {
+    "alpine.3.12-ppc64le": {
       "#import": [
         "alpine.3.12",
-        "alpine.3.11-x86"
+        "alpine.3.11-ppc64le"
       ]
     },
     "alpine.3.12-s390x": {
@@ -182,10 +176,16 @@
         "alpine.3.11-s390x"
       ]
     },
-    "alpine.3.12-ppc64le": {
+    "alpine.3.12-x64": {
       "#import": [
         "alpine.3.12",
-        "alpine.3.11-ppc64le"
+        "alpine.3.11-x64"
+      ]
+    },
+    "alpine.3.12-x86": {
+      "#import": [
+        "alpine.3.12",
+        "alpine.3.11-x86"
       ]
     },
     "alpine.3.13": {
@@ -199,28 +199,22 @@
         "alpine.3.12-arm"
       ]
     },
-    "alpine.3.13-armv6": {
-      "#import": [
-        "alpine.3.13",
-        "alpine.3.12-armv6"
-      ]
-    },
     "alpine.3.13-arm64": {
       "#import": [
         "alpine.3.13",
         "alpine.3.12-arm64"
       ]
     },
-    "alpine.3.13-x64": {
+    "alpine.3.13-armv6": {
       "#import": [
         "alpine.3.13",
-        "alpine.3.12-x64"
+        "alpine.3.12-armv6"
       ]
     },
-    "alpine.3.13-x86": {
+    "alpine.3.13-ppc64le": {
       "#import": [
         "alpine.3.13",
-        "alpine.3.12-x86"
+        "alpine.3.12-ppc64le"
       ]
     },
     "alpine.3.13-s390x": {
@@ -229,10 +223,16 @@
         "alpine.3.12-s390x"
       ]
     },
-    "alpine.3.13-ppc64le": {
+    "alpine.3.13-x64": {
       "#import": [
         "alpine.3.13",
-        "alpine.3.12-ppc64le"
+        "alpine.3.12-x64"
+      ]
+    },
+    "alpine.3.13-x86": {
+      "#import": [
+        "alpine.3.13",
+        "alpine.3.12-x86"
       ]
     },
     "alpine.3.14": {
@@ -246,28 +246,22 @@
         "alpine.3.13-arm"
       ]
     },
-    "alpine.3.14-armv6": {
-      "#import": [
-        "alpine.3.14",
-        "alpine.3.13-armv6"
-      ]
-	},
     "alpine.3.14-arm64": {
       "#import": [
         "alpine.3.14",
         "alpine.3.13-arm64"
       ]
     },
-    "alpine.3.14-x64": {
+    "alpine.3.14-armv6": {
       "#import": [
         "alpine.3.14",
-        "alpine.3.13-x64"
+        "alpine.3.13-armv6"
       ]
     },
-    "alpine.3.14-x86": {
+    "alpine.3.14-ppc64le": {
       "#import": [
         "alpine.3.14",
-        "alpine.3.13-x86"
+        "alpine.3.13-ppc64le"
       ]
     },
     "alpine.3.14-s390x": {
@@ -276,10 +270,16 @@
         "alpine.3.13-s390x"
       ]
     },
-    "alpine.3.14-ppc64le": {
+    "alpine.3.14-x64": {
       "#import": [
         "alpine.3.14",
-        "alpine.3.13-ppc64le"
+        "alpine.3.13-x64"
+      ]
+    },
+    "alpine.3.14-x86": {
+      "#import": [
+        "alpine.3.14",
+        "alpine.3.13-x86"
       ]
     },
     "alpine.3.15": {
@@ -293,28 +293,22 @@
         "alpine.3.14-arm"
       ]
     },
-    "alpine.3.15-armv6": {
-      "#import": [
-        "alpine.3.15",
-        "alpine.3.14-armv6"
-      ]
-	},
     "alpine.3.15-arm64": {
       "#import": [
         "alpine.3.15",
         "alpine.3.14-arm64"
       ]
     },
-    "alpine.3.15-x64": {
+    "alpine.3.15-armv6": {
       "#import": [
         "alpine.3.15",
-        "alpine.3.14-x64"
+        "alpine.3.14-armv6"
       ]
     },
-    "alpine.3.15-x86": {
+    "alpine.3.15-ppc64le": {
       "#import": [
         "alpine.3.15",
-        "alpine.3.14-x86"
+        "alpine.3.14-ppc64le"
       ]
     },
     "alpine.3.15-s390x": {
@@ -323,10 +317,16 @@
         "alpine.3.14-s390x"
       ]
     },
-    "alpine.3.15-ppc64le": {
+    "alpine.3.15-x64": {
       "#import": [
         "alpine.3.15",
-        "alpine.3.14-ppc64le"
+        "alpine.3.14-x64"
+      ]
+    },
+    "alpine.3.15-x86": {
+      "#import": [
+        "alpine.3.15",
+        "alpine.3.14-x86"
       ]
     },
     "alpine.3.16": {
@@ -340,28 +340,22 @@
         "alpine.3.15-arm"
       ]
     },
-    "alpine.3.16-armv6": {
-      "#import": [
-        "alpine.3.16",
-        "alpine.3.15-armv6"
-      ]
-	},
     "alpine.3.16-arm64": {
       "#import": [
         "alpine.3.16",
         "alpine.3.15-arm64"
       ]
     },
-    "alpine.3.16-x64": {
+    "alpine.3.16-armv6": {
       "#import": [
         "alpine.3.16",
-        "alpine.3.15-x64"
+        "alpine.3.15-armv6"
       ]
     },
-    "alpine.3.16-x86": {
+    "alpine.3.16-ppc64le": {
       "#import": [
         "alpine.3.16",
-        "alpine.3.15-x86"
+        "alpine.3.15-ppc64le"
       ]
     },
     "alpine.3.16-s390x": {
@@ -370,10 +364,16 @@
         "alpine.3.15-s390x"
       ]
     },
-    "alpine.3.16-ppc64le": {
+    "alpine.3.16-x64": {
       "#import": [
         "alpine.3.16",
-        "alpine.3.15-ppc64le"
+        "alpine.3.15-x64"
+      ]
+    },
+    "alpine.3.16-x86": {
+      "#import": [
+        "alpine.3.16",
+        "alpine.3.15-x86"
       ]
     },
     "alpine.3.17": {
@@ -387,28 +387,22 @@
         "alpine.3.16-arm"
       ]
     },
-    "alpine.3.17-armv6": {
-      "#import": [
-        "alpine.3.17",
-        "alpine.3.16-armv6"
-      ]
-    },
     "alpine.3.17-arm64": {
       "#import": [
         "alpine.3.17",
         "alpine.3.16-arm64"
       ]
     },
-    "alpine.3.17-x64": {
+    "alpine.3.17-armv6": {
       "#import": [
         "alpine.3.17",
-        "alpine.3.16-x64"
+        "alpine.3.16-armv6"
       ]
     },
-    "alpine.3.17-x86": {
+    "alpine.3.17-ppc64le": {
       "#import": [
         "alpine.3.17",
-        "alpine.3.16-x86"
+        "alpine.3.16-ppc64le"
       ]
     },
     "alpine.3.17-s390x": {
@@ -417,10 +411,16 @@
         "alpine.3.16-s390x"
       ]
     },
-    "alpine.3.17-ppc64le": {
+    "alpine.3.17-x64": {
       "#import": [
         "alpine.3.17",
-        "alpine.3.16-ppc64le"
+        "alpine.3.16-x64"
+      ]
+    },
+    "alpine.3.17-x86": {
+      "#import": [
+        "alpine.3.17",
+        "alpine.3.16-x86"
       ]
     },
     "alpine.3.6": {
@@ -434,28 +434,22 @@
         "alpine-arm"
       ]
     },
-    "alpine.3.6-armv6": {
-      "#import": [
-        "alpine.3.6",
-        "alpine-armv6"
-      ]
-    },
     "alpine.3.6-arm64": {
       "#import": [
         "alpine.3.6",
         "alpine-arm64"
       ]
     },
-    "alpine.3.6-x64": {
+    "alpine.3.6-armv6": {
       "#import": [
         "alpine.3.6",
-        "alpine-x64"
+        "alpine-armv6"
       ]
     },
-    "alpine.3.6-x86": {
+    "alpine.3.6-ppc64le": {
       "#import": [
         "alpine.3.6",
-        "alpine-x86"
+        "alpine-ppc64le"
       ]
     },
     "alpine.3.6-s390x": {
@@ -464,10 +458,16 @@
         "alpine-s390x"
       ]
     },
-    "alpine.3.6-ppc64le": {
+    "alpine.3.6-x64": {
       "#import": [
         "alpine.3.6",
-        "alpine-ppc64le"
+        "alpine-x64"
+      ]
+    },
+    "alpine.3.6-x86": {
+      "#import": [
+        "alpine.3.6",
+        "alpine-x86"
       ]
     },
     "alpine.3.7": {
@@ -481,28 +481,22 @@
         "alpine.3.6-arm"
       ]
     },
-    "alpine.3.7-armv6": {
-      "#import": [
-        "alpine.3.7",
-        "alpine.3.6-armv6"
-      ]
-    },
     "alpine.3.7-arm64": {
       "#import": [
         "alpine.3.7",
         "alpine.3.6-arm64"
       ]
     },
-    "alpine.3.7-x64": {
+    "alpine.3.7-armv6": {
       "#import": [
         "alpine.3.7",
-        "alpine.3.6-x64"
+        "alpine.3.6-armv6"
       ]
     },
-    "alpine.3.7-x86": {
+    "alpine.3.7-ppc64le": {
       "#import": [
         "alpine.3.7",
-        "alpine.3.6-x86"
+        "alpine.3.6-ppc64le"
       ]
     },
     "alpine.3.7-s390x": {
@@ -511,10 +505,16 @@
         "alpine.3.6-s390x"
       ]
     },
-    "alpine.3.7-ppc64le": {
+    "alpine.3.7-x64": {
       "#import": [
         "alpine.3.7",
-        "alpine.3.6-ppc64le"
+        "alpine.3.6-x64"
+      ]
+    },
+    "alpine.3.7-x86": {
+      "#import": [
+        "alpine.3.7",
+        "alpine.3.6-x86"
       ]
     },
     "alpine.3.8": {
@@ -528,28 +528,22 @@
         "alpine.3.7-arm"
       ]
     },
-    "alpine.3.8-armv6": {
-      "#import": [
-        "alpine.3.8",
-        "alpine.3.7-armv6"
-      ]
-    },
     "alpine.3.8-arm64": {
       "#import": [
         "alpine.3.8",
         "alpine.3.7-arm64"
       ]
     },
-    "alpine.3.8-x64": {
+    "alpine.3.8-armv6": {
       "#import": [
         "alpine.3.8",
-        "alpine.3.7-x64"
+        "alpine.3.7-armv6"
       ]
     },
-    "alpine.3.8-x86": {
+    "alpine.3.8-ppc64le": {
       "#import": [
         "alpine.3.8",
-        "alpine.3.7-x86"
+        "alpine.3.7-ppc64le"
       ]
     },
     "alpine.3.8-s390x": {
@@ -558,10 +552,16 @@
         "alpine.3.7-s390x"
       ]
     },
-    "alpine.3.8-ppc64le": {
+    "alpine.3.8-x64": {
       "#import": [
         "alpine.3.8",
-        "alpine.3.7-ppc64le"
+        "alpine.3.7-x64"
+      ]
+    },
+    "alpine.3.8-x86": {
+      "#import": [
+        "alpine.3.8",
+        "alpine.3.7-x86"
       ]
     },
     "alpine.3.9": {
@@ -575,28 +575,22 @@
         "alpine.3.8-arm"
       ]
     },
-    "alpine.3.9-armv6": {
-      "#import": [
-        "alpine.3.9",
-        "alpine.3.8-armv6"
-      ]
-    },
     "alpine.3.9-arm64": {
       "#import": [
         "alpine.3.9",
         "alpine.3.8-arm64"
       ]
     },
-    "alpine.3.9-x64": {
+    "alpine.3.9-armv6": {
       "#import": [
         "alpine.3.9",
-        "alpine.3.8-x64"
+        "alpine.3.8-armv6"
       ]
     },
-    "alpine.3.9-x86": {
+    "alpine.3.9-ppc64le": {
       "#import": [
         "alpine.3.9",
-        "alpine.3.8-x86"
+        "alpine.3.8-ppc64le"
       ]
     },
     "alpine.3.9-s390x": {
@@ -605,10 +599,16 @@
         "alpine.3.8-s390x"
       ]
     },
-    "alpine.3.9-ppc64le": {
+    "alpine.3.9-x64": {
       "#import": [
         "alpine.3.9",
-        "alpine.3.8-ppc64le"
+        "alpine.3.8-x64"
+      ]
+    },
+    "alpine.3.9-x86": {
+      "#import": [
+        "alpine.3.9",
+        "alpine.3.8-x86"
       ]
     },
     "android": {
@@ -1567,6 +1567,23 @@
         "fedora-x64"
       ]
     },
+    "fedora.39": {
+      "#import": [
+        "fedora"
+      ]
+    },
+    "fedora.39-arm64": {
+      "#import": [
+        "fedora.39",
+        "fedora-arm64"
+      ]
+    },
+    "fedora.39-x64": {
+      "#import": [
+        "fedora.39",
+        "fedora-x64"
+      ]
+    },
     "freebsd": {
       "#import": [
         "unix"
@@ -1977,12 +1994,6 @@
         "linux-arm"
       ]
     },
-    "linux-musl-armv6": {
-      "#import": [
-        "linux-musl",
-        "linux-armv6"
-      ]
-    },
     "linux-musl-arm64": {
       "#import": [
         "linux-musl",
@@ -1995,6 +2006,12 @@
         "linux-armel"
       ]
     },
+    "linux-musl-armv6": {
+      "#import": [
+        "linux-musl",
+        "linux-armv6"
+      ]
+    },
     "linux-musl-ppc64le": {
       "#import": [
         "linux-musl",
@@ -4407,4 +4424,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
index 76bed4c55e6cc3..fed285b6bb2d03 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
@@ -81,7 +81,7 @@
     <RuntimeGroup Include="fedora">
       <Parent>linux</Parent>
       <Architectures>x64;arm64</Architectures>
-      <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38</Versions>
+      <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38;39</Versions>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>