diff --git a/eng/packaging.props b/eng/packaging.props
index 46675f87bb3cc4..8beba92566d87a 100644
--- a/eng/packaging.props
+++ b/eng/packaging.props
@@ -23,7 +23,7 @@
     <PackageVersion Condition="'$(PackageVersion)' == ''">$(ProductVersion)</PackageVersion>
     <!-- major.minor.release version of the platforms package we're currently building
          Pre-release will be appended during build -->
-    <PlatformPackageVersion>5.0.4</PlatformPackageVersion>
+    <PlatformPackageVersion>5.0.5</PlatformPackageVersion>
     <SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
     <SkipGenerationCheck>true</SkipGenerationCheck>
   </PropertyGroup>
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index 844590f8022f9d..ef6b3a1d6bde0d 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -3509,6 +3509,18 @@
     "any",
     "base"
   ],
+  "ol-arm64": [
+    "ol-arm64",
+    "ol",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "ol-x64": [
     "ol-x64",
     "ol",
@@ -3617,6 +3629,98 @@
     "any",
     "base"
   ],
+  "ol.7.10": [
+    "ol.7.10",
+    "ol.7.9",
+    "rhel.7.10",
+    "ol.7.8",
+    "rhel.7.9",
+    "ol.7.7",
+    "rhel.7.8",
+    "ol.7.6",
+    "rhel.7.7",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7",
+    "rhel.7.0",
+    "ol",
+    "rhel.7",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.7.10-x64": [
+    "ol.7.10-x64",
+    "ol.7.10",
+    "ol.7.9-x64",
+    "rhel.7.10-x64",
+    "ol.7.9",
+    "rhel.7.10",
+    "ol.7.8-x64",
+    "rhel.7.9-x64",
+    "ol.7.8",
+    "rhel.7.9",
+    "ol.7.7-x64",
+    "rhel.7.8-x64",
+    "ol.7.7",
+    "rhel.7.8",
+    "ol.7.6-x64",
+    "rhel.7.7-x64",
+    "ol.7.6",
+    "rhel.7.7",
+    "ol.7.5-x64",
+    "rhel.7.6-x64",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4-x64",
+    "rhel.7.5-x64",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3-x64",
+    "rhel.7.4-x64",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2-x64",
+    "rhel.7.3-x64",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1-x64",
+    "rhel.7.2-x64",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0-x64",
+    "rhel.7.1-x64",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7-x64",
+    "rhel.7.0-x64",
+    "ol.7",
+    "rhel.7.0",
+    "ol-x64",
+    "rhel.7-x64",
+    "ol",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "ol.7.2": [
     "ol.7.2",
     "ol.7.1",
@@ -3897,23 +4001,71 @@
     "any",
     "base"
   ],
-  "ol.8": [
-    "ol.8",
+  "ol.7.7": [
+    "ol.7.7",
+    "ol.7.6",
+    "rhel.7.7",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7",
+    "rhel.7.0",
     "ol",
-    "rhel.8",
+    "rhel.7",
     "rhel",
     "linux",
     "unix",
     "any",
     "base"
   ],
-  "ol.8-x64": [
-    "ol.8-x64",
-    "ol.8",
+  "ol.7.7-x64": [
+    "ol.7.7-x64",
+    "ol.7.7",
+    "ol.7.6-x64",
+    "rhel.7.7-x64",
+    "ol.7.6",
+    "rhel.7.7",
+    "ol.7.5-x64",
+    "rhel.7.6-x64",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4-x64",
+    "rhel.7.5-x64",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3-x64",
+    "rhel.7.4-x64",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2-x64",
+    "rhel.7.3-x64",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1-x64",
+    "rhel.7.2-x64",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0-x64",
+    "rhel.7.1-x64",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7-x64",
+    "rhel.7.0-x64",
+    "ol.7",
+    "rhel.7.0",
     "ol-x64",
-    "rhel.8-x64",
+    "rhel.7-x64",
     "ol",
-    "rhel.8",
+    "rhel.7",
     "rhel-x64",
     "rhel",
     "linux-x64",
@@ -3923,29 +4075,77 @@
     "any",
     "base"
   ],
-  "ol.8.0": [
-    "ol.8.0",
-    "ol.8",
-    "rhel.8.0",
+  "ol.7.8": [
+    "ol.7.8",
+    "ol.7.7",
+    "rhel.7.8",
+    "ol.7.6",
+    "rhel.7.7",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7",
+    "rhel.7.0",
     "ol",
-    "rhel.8",
+    "rhel.7",
     "rhel",
     "linux",
     "unix",
     "any",
     "base"
   ],
-  "ol.8.0-x64": [
-    "ol.8.0-x64",
-    "ol.8.0",
-    "ol.8-x64",
-    "rhel.8.0-x64",
-    "ol.8",
-    "rhel.8.0",
+  "ol.7.8-x64": [
+    "ol.7.8-x64",
+    "ol.7.8",
+    "ol.7.7-x64",
+    "rhel.7.8-x64",
+    "ol.7.7",
+    "rhel.7.8",
+    "ol.7.6-x64",
+    "rhel.7.7-x64",
+    "ol.7.6",
+    "rhel.7.7",
+    "ol.7.5-x64",
+    "rhel.7.6-x64",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4-x64",
+    "rhel.7.5-x64",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3-x64",
+    "rhel.7.4-x64",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2-x64",
+    "rhel.7.3-x64",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1-x64",
+    "rhel.7.2-x64",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0-x64",
+    "rhel.7.1-x64",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7-x64",
+    "rhel.7.0-x64",
+    "ol.7",
+    "rhel.7.0",
     "ol-x64",
-    "rhel.8-x64",
+    "rhel.7-x64",
     "ol",
-    "rhel.8",
+    "rhel.7",
     "rhel-x64",
     "rhel",
     "linux-x64",
@@ -4009,16 +4209,85 @@
     "any",
     "base"
   ],
-  "opensuse": [
-    "opensuse",
+  "ol.7.9": [
+    "ol.7.9",
+    "ol.7.8",
+    "rhel.7.9",
+    "ol.7.7",
+    "rhel.7.8",
+    "ol.7.6",
+    "rhel.7.7",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7",
+    "rhel.7.0",
+    "ol",
+    "rhel.7",
+    "rhel",
     "linux",
     "unix",
     "any",
     "base"
   ],
-  "opensuse-x64": [
-    "opensuse-x64",
-    "opensuse",
+  "ol.7.9-x64": [
+    "ol.7.9-x64",
+    "ol.7.9",
+    "ol.7.8-x64",
+    "rhel.7.9-x64",
+    "ol.7.8",
+    "rhel.7.9",
+    "ol.7.7-x64",
+    "rhel.7.8-x64",
+    "ol.7.7",
+    "rhel.7.8",
+    "ol.7.6-x64",
+    "rhel.7.7-x64",
+    "ol.7.6",
+    "rhel.7.7",
+    "ol.7.5-x64",
+    "rhel.7.6-x64",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4-x64",
+    "rhel.7.5-x64",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3-x64",
+    "rhel.7.4-x64",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2-x64",
+    "rhel.7.3-x64",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1-x64",
+    "rhel.7.2-x64",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0-x64",
+    "rhel.7.1-x64",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7-x64",
+    "rhel.7.0-x64",
+    "ol.7",
+    "rhel.7.0",
+    "ol-x64",
+    "rhel.7-x64",
+    "ol",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
     "linux-x64",
     "linux",
     "unix-x64",
@@ -4026,9 +4295,768 @@
     "any",
     "base"
   ],
-  "opensuse.13.2": [
-    "opensuse.13.2",
-    "opensuse",
+  "ol.8": [
+    "ol.8",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8-arm64": [
+    "ol.8-arm64",
+    "ol.8",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8-x64": [
+    "ol.8-x64",
+    "ol.8",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.0": [
+    "ol.8.0",
+    "ol.8",
+    "rhel.8.0",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.0-arm64": [
+    "ol.8.0-arm64",
+    "ol.8.0",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.0-x64": [
+    "ol.8.0-x64",
+    "ol.8.0",
+    "ol.8-x64",
+    "rhel.8.0-x64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.1": [
+    "ol.8.1",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8",
+    "rhel.8.0",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.1-arm64": [
+    "ol.8.1-arm64",
+    "ol.8.1",
+    "ol.8.0-arm64",
+    "rhel.8.1-arm64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.1-x64": [
+    "ol.8.1-x64",
+    "ol.8.1",
+    "ol.8.0-x64",
+    "rhel.8.1-x64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-x64",
+    "rhel.8.0-x64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.2": [
+    "ol.8.2",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8",
+    "rhel.8.0",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.2-arm64": [
+    "ol.8.2-arm64",
+    "ol.8.2",
+    "ol.8.1-arm64",
+    "rhel.8.2-arm64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-arm64",
+    "rhel.8.1-arm64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.2-x64": [
+    "ol.8.2-x64",
+    "ol.8.2",
+    "ol.8.1-x64",
+    "rhel.8.2-x64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-x64",
+    "rhel.8.1-x64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-x64",
+    "rhel.8.0-x64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.3": [
+    "ol.8.3",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8",
+    "rhel.8.0",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.3-arm64": [
+    "ol.8.3-arm64",
+    "ol.8.3",
+    "ol.8.2-arm64",
+    "rhel.8.3-arm64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-arm64",
+    "rhel.8.2-arm64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-arm64",
+    "rhel.8.1-arm64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.3-x64": [
+    "ol.8.3-x64",
+    "ol.8.3",
+    "ol.8.2-x64",
+    "rhel.8.3-x64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-x64",
+    "rhel.8.2-x64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-x64",
+    "rhel.8.1-x64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-x64",
+    "rhel.8.0-x64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.4": [
+    "ol.8.4",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8",
+    "rhel.8.0",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.4-arm64": [
+    "ol.8.4-arm64",
+    "ol.8.4",
+    "ol.8.3-arm64",
+    "rhel.8.4-arm64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-arm64",
+    "rhel.8.3-arm64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-arm64",
+    "rhel.8.2-arm64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-arm64",
+    "rhel.8.1-arm64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.4-x64": [
+    "ol.8.4-x64",
+    "ol.8.4",
+    "ol.8.3-x64",
+    "rhel.8.4-x64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-x64",
+    "rhel.8.3-x64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-x64",
+    "rhel.8.2-x64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-x64",
+    "rhel.8.1-x64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-x64",
+    "rhel.8.0-x64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.5": [
+    "ol.8.5",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8",
+    "rhel.8.0",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.5-arm64": [
+    "ol.8.5-arm64",
+    "ol.8.5",
+    "ol.8.4-arm64",
+    "rhel.8.5-arm64",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3-arm64",
+    "rhel.8.4-arm64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-arm64",
+    "rhel.8.3-arm64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-arm64",
+    "rhel.8.2-arm64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-arm64",
+    "rhel.8.1-arm64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.5-x64": [
+    "ol.8.5-x64",
+    "ol.8.5",
+    "ol.8.4-x64",
+    "rhel.8.5-x64",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3-x64",
+    "rhel.8.4-x64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-x64",
+    "rhel.8.3-x64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-x64",
+    "rhel.8.2-x64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-x64",
+    "rhel.8.1-x64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-x64",
+    "rhel.8.0-x64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.6": [
+    "ol.8.6",
+    "ol.8.5",
+    "rhel.8.6",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8",
+    "rhel.8.0",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.6-arm64": [
+    "ol.8.6-arm64",
+    "ol.8.6",
+    "ol.8.5-arm64",
+    "rhel.8.6-arm64",
+    "ol.8.5",
+    "rhel.8.6",
+    "ol.8.4-arm64",
+    "rhel.8.5-arm64",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3-arm64",
+    "rhel.8.4-arm64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-arm64",
+    "rhel.8.3-arm64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-arm64",
+    "rhel.8.2-arm64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-arm64",
+    "rhel.8.1-arm64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.6-x64": [
+    "ol.8.6-x64",
+    "ol.8.6",
+    "ol.8.5-x64",
+    "rhel.8.6-x64",
+    "ol.8.5",
+    "rhel.8.6",
+    "ol.8.4-x64",
+    "rhel.8.5-x64",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3-x64",
+    "rhel.8.4-x64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-x64",
+    "rhel.8.3-x64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-x64",
+    "rhel.8.2-x64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-x64",
+    "rhel.8.1-x64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-x64",
+    "rhel.8.0-x64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9": [
+    "ol.9",
+    "ol",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9-arm64": [
+    "ol.9-arm64",
+    "ol.9",
+    "ol-arm64",
+    "ol",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9-x64": [
+    "ol.9-x64",
+    "ol.9",
+    "ol-x64",
+    "ol",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9.0": [
+    "ol.9.0",
+    "ol.9",
+    "ol",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9.0-arm64": [
+    "ol.9.0-arm64",
+    "ol.9.0",
+    "ol.9-arm64",
+    "ol.9",
+    "ol-arm64",
+    "ol",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9.0-x64": [
+    "ol.9.0-x64",
+    "ol.9.0",
+    "ol.9-x64",
+    "ol.9",
+    "ol-x64",
+    "ol",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9.1": [
+    "ol.9.1",
+    "ol.9.0",
+    "ol.9",
+    "ol",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9.1-arm64": [
+    "ol.9.1-arm64",
+    "ol.9.1",
+    "ol.9.0-arm64",
+    "ol.9.0",
+    "ol.9-arm64",
+    "ol.9",
+    "ol-arm64",
+    "ol",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9.1-x64": [
+    "ol.9.1-x64",
+    "ol.9.1",
+    "ol.9.0-x64",
+    "ol.9.0",
+    "ol.9-x64",
+    "ol.9",
+    "ol-x64",
+    "ol",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "opensuse": [
+    "opensuse",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "opensuse-x64": [
+    "opensuse-x64",
+    "opensuse",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "opensuse.13.2": [
+    "opensuse.13.2",
+    "opensuse",
     "linux",
     "unix",
     "any",
@@ -4421,6 +5449,26 @@
     "any",
     "base"
   ],
+  "rhel.6": [
+    "rhel.6",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.6-x64": [
+    "rhel.6-x64",
+    "rhel.6",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "rhel.7": [
     "rhel.7",
     "rhel",
@@ -4490,6 +5538,59 @@
     "any",
     "base"
   ],
+  "rhel.7.10": [
+    "rhel.7.10",
+    "rhel.7.9",
+    "rhel.7.8",
+    "rhel.7.7",
+    "rhel.7.6",
+    "rhel.7.5",
+    "rhel.7.4",
+    "rhel.7.3",
+    "rhel.7.2",
+    "rhel.7.1",
+    "rhel.7.0",
+    "rhel.7",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.10-x64": [
+    "rhel.7.10-x64",
+    "rhel.7.10",
+    "rhel.7.9-x64",
+    "rhel.7.9",
+    "rhel.7.8-x64",
+    "rhel.7.8",
+    "rhel.7.7-x64",
+    "rhel.7.7",
+    "rhel.7.6-x64",
+    "rhel.7.6",
+    "rhel.7.5-x64",
+    "rhel.7.5",
+    "rhel.7.4-x64",
+    "rhel.7.4",
+    "rhel.7.3-x64",
+    "rhel.7.3",
+    "rhel.7.2-x64",
+    "rhel.7.2",
+    "rhel.7.1-x64",
+    "rhel.7.1",
+    "rhel.7.0-x64",
+    "rhel.7.0",
+    "rhel.7-x64",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "rhel.7.2": [
     "rhel.7.2",
     "rhel.7.1",
@@ -4624,7 +5725,142 @@
     "any",
     "base"
   ],
-  "rhel.7.6": [
+  "rhel.7.6": [
+    "rhel.7.6",
+    "rhel.7.5",
+    "rhel.7.4",
+    "rhel.7.3",
+    "rhel.7.2",
+    "rhel.7.1",
+    "rhel.7.0",
+    "rhel.7",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.6-x64": [
+    "rhel.7.6-x64",
+    "rhel.7.6",
+    "rhel.7.5-x64",
+    "rhel.7.5",
+    "rhel.7.4-x64",
+    "rhel.7.4",
+    "rhel.7.3-x64",
+    "rhel.7.3",
+    "rhel.7.2-x64",
+    "rhel.7.2",
+    "rhel.7.1-x64",
+    "rhel.7.1",
+    "rhel.7.0-x64",
+    "rhel.7.0",
+    "rhel.7-x64",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.7": [
+    "rhel.7.7",
+    "rhel.7.6",
+    "rhel.7.5",
+    "rhel.7.4",
+    "rhel.7.3",
+    "rhel.7.2",
+    "rhel.7.1",
+    "rhel.7.0",
+    "rhel.7",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.7-x64": [
+    "rhel.7.7-x64",
+    "rhel.7.7",
+    "rhel.7.6-x64",
+    "rhel.7.6",
+    "rhel.7.5-x64",
+    "rhel.7.5",
+    "rhel.7.4-x64",
+    "rhel.7.4",
+    "rhel.7.3-x64",
+    "rhel.7.3",
+    "rhel.7.2-x64",
+    "rhel.7.2",
+    "rhel.7.1-x64",
+    "rhel.7.1",
+    "rhel.7.0-x64",
+    "rhel.7.0",
+    "rhel.7-x64",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.8": [
+    "rhel.7.8",
+    "rhel.7.7",
+    "rhel.7.6",
+    "rhel.7.5",
+    "rhel.7.4",
+    "rhel.7.3",
+    "rhel.7.2",
+    "rhel.7.1",
+    "rhel.7.0",
+    "rhel.7",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.8-x64": [
+    "rhel.7.8-x64",
+    "rhel.7.8",
+    "rhel.7.7-x64",
+    "rhel.7.7",
+    "rhel.7.6-x64",
+    "rhel.7.6",
+    "rhel.7.5-x64",
+    "rhel.7.5",
+    "rhel.7.4-x64",
+    "rhel.7.4",
+    "rhel.7.3-x64",
+    "rhel.7.3",
+    "rhel.7.2-x64",
+    "rhel.7.2",
+    "rhel.7.1-x64",
+    "rhel.7.1",
+    "rhel.7.0-x64",
+    "rhel.7.0",
+    "rhel.7-x64",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.9": [
+    "rhel.7.9",
+    "rhel.7.8",
+    "rhel.7.7",
     "rhel.7.6",
     "rhel.7.5",
     "rhel.7.4",
@@ -4639,7 +5875,13 @@
     "any",
     "base"
   ],
-  "rhel.7.6-x64": [
+  "rhel.7.9-x64": [
+    "rhel.7.9-x64",
+    "rhel.7.9",
+    "rhel.7.8-x64",
+    "rhel.7.8",
+    "rhel.7.7-x64",
+    "rhel.7.7",
     "rhel.7.6-x64",
     "rhel.7.6",
     "rhel.7.5-x64",
@@ -4776,6 +6018,291 @@
     "any",
     "base"
   ],
+  "rhel.8.2": [
+    "rhel.8.2",
+    "rhel.8.1",
+    "rhel.8.0",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.2-arm64": [
+    "rhel.8.2-arm64",
+    "rhel.8.2",
+    "rhel.8.1-arm64",
+    "rhel.8.1",
+    "rhel.8.0-arm64",
+    "rhel.8.0",
+    "rhel.8-arm64",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.2-x64": [
+    "rhel.8.2-x64",
+    "rhel.8.2",
+    "rhel.8.1-x64",
+    "rhel.8.1",
+    "rhel.8.0-x64",
+    "rhel.8.0",
+    "rhel.8-x64",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.3": [
+    "rhel.8.3",
+    "rhel.8.2",
+    "rhel.8.1",
+    "rhel.8.0",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.3-arm64": [
+    "rhel.8.3-arm64",
+    "rhel.8.3",
+    "rhel.8.2-arm64",
+    "rhel.8.2",
+    "rhel.8.1-arm64",
+    "rhel.8.1",
+    "rhel.8.0-arm64",
+    "rhel.8.0",
+    "rhel.8-arm64",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.3-x64": [
+    "rhel.8.3-x64",
+    "rhel.8.3",
+    "rhel.8.2-x64",
+    "rhel.8.2",
+    "rhel.8.1-x64",
+    "rhel.8.1",
+    "rhel.8.0-x64",
+    "rhel.8.0",
+    "rhel.8-x64",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.4": [
+    "rhel.8.4",
+    "rhel.8.3",
+    "rhel.8.2",
+    "rhel.8.1",
+    "rhel.8.0",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.4-arm64": [
+    "rhel.8.4-arm64",
+    "rhel.8.4",
+    "rhel.8.3-arm64",
+    "rhel.8.3",
+    "rhel.8.2-arm64",
+    "rhel.8.2",
+    "rhel.8.1-arm64",
+    "rhel.8.1",
+    "rhel.8.0-arm64",
+    "rhel.8.0",
+    "rhel.8-arm64",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.4-x64": [
+    "rhel.8.4-x64",
+    "rhel.8.4",
+    "rhel.8.3-x64",
+    "rhel.8.3",
+    "rhel.8.2-x64",
+    "rhel.8.2",
+    "rhel.8.1-x64",
+    "rhel.8.1",
+    "rhel.8.0-x64",
+    "rhel.8.0",
+    "rhel.8-x64",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.5": [
+    "rhel.8.5",
+    "rhel.8.4",
+    "rhel.8.3",
+    "rhel.8.2",
+    "rhel.8.1",
+    "rhel.8.0",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.5-arm64": [
+    "rhel.8.5-arm64",
+    "rhel.8.5",
+    "rhel.8.4-arm64",
+    "rhel.8.4",
+    "rhel.8.3-arm64",
+    "rhel.8.3",
+    "rhel.8.2-arm64",
+    "rhel.8.2",
+    "rhel.8.1-arm64",
+    "rhel.8.1",
+    "rhel.8.0-arm64",
+    "rhel.8.0",
+    "rhel.8-arm64",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.5-x64": [
+    "rhel.8.5-x64",
+    "rhel.8.5",
+    "rhel.8.4-x64",
+    "rhel.8.4",
+    "rhel.8.3-x64",
+    "rhel.8.3",
+    "rhel.8.2-x64",
+    "rhel.8.2",
+    "rhel.8.1-x64",
+    "rhel.8.1",
+    "rhel.8.0-x64",
+    "rhel.8.0",
+    "rhel.8-x64",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.6": [
+    "rhel.8.6",
+    "rhel.8.5",
+    "rhel.8.4",
+    "rhel.8.3",
+    "rhel.8.2",
+    "rhel.8.1",
+    "rhel.8.0",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.6-arm64": [
+    "rhel.8.6-arm64",
+    "rhel.8.6",
+    "rhel.8.5-arm64",
+    "rhel.8.5",
+    "rhel.8.4-arm64",
+    "rhel.8.4",
+    "rhel.8.3-arm64",
+    "rhel.8.3",
+    "rhel.8.2-arm64",
+    "rhel.8.2",
+    "rhel.8.1-arm64",
+    "rhel.8.1",
+    "rhel.8.0-arm64",
+    "rhel.8.0",
+    "rhel.8-arm64",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.6-x64": [
+    "rhel.8.6-x64",
+    "rhel.8.6",
+    "rhel.8.5-x64",
+    "rhel.8.5",
+    "rhel.8.4-x64",
+    "rhel.8.4",
+    "rhel.8.3-x64",
+    "rhel.8.3",
+    "rhel.8.2-x64",
+    "rhel.8.2",
+    "rhel.8.1-x64",
+    "rhel.8.1",
+    "rhel.8.0-x64",
+    "rhel.8.0",
+    "rhel.8-x64",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "rhel.9": [
     "rhel.9",
     "rhel",
@@ -4808,6 +6335,85 @@
     "any",
     "base"
   ],
+  "rhel.9.0": [
+    "rhel.9.0",
+    "rhel.9",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.9.0-arm64": [
+    "rhel.9.0-arm64",
+    "rhel.9.0",
+    "rhel.9-arm64",
+    "rhel.9",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.9.0-x64": [
+    "rhel.9.0-x64",
+    "rhel.9.0",
+    "rhel.9-x64",
+    "rhel.9",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.9.1": [
+    "rhel.9.1",
+    "rhel.9.0",
+    "rhel.9",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.9.1-arm64": [
+    "rhel.9.1-arm64",
+    "rhel.9.1",
+    "rhel.9.0-arm64",
+    "rhel.9.0",
+    "rhel.9-arm64",
+    "rhel.9",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.9.1-x64": [
+    "rhel.9.1-x64",
+    "rhel.9.1",
+    "rhel.9.0-x64",
+    "rhel.9.0",
+    "rhel.9-x64",
+    "rhel.9",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "sles": [
     "sles",
     "linux",
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
index 7d6aa102b506ea..6a2e8cd5d1899f 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -1483,6 +1483,12 @@
         "rhel"
       ]
     },
+    "ol-arm64": {
+      "#import": [
+        "ol",
+        "rhel-arm64"
+      ]
+    },
     "ol-x64": {
       "#import": [
         "ol",
@@ -1528,6 +1534,19 @@
         "rhel.7.1-x64"
       ]
     },
+    "ol.7.10": {
+      "#import": [
+        "ol.7.9",
+        "rhel.7.10"
+      ]
+    },
+    "ol.7.10-x64": {
+      "#import": [
+        "ol.7.10",
+        "ol.7.9-x64",
+        "rhel.7.10-x64"
+      ]
+    },
     "ol.7.2": {
       "#import": [
         "ol.7.1",
@@ -1593,12 +1612,58 @@
         "rhel.7.6-x64"
       ]
     },
+    "ol.7.7": {
+      "#import": [
+        "ol.7.6",
+        "rhel.7.7"
+      ]
+    },
+    "ol.7.7-x64": {
+      "#import": [
+        "ol.7.7",
+        "ol.7.6-x64",
+        "rhel.7.7-x64"
+      ]
+    },
+    "ol.7.8": {
+      "#import": [
+        "ol.7.7",
+        "rhel.7.8"
+      ]
+    },
+    "ol.7.8-x64": {
+      "#import": [
+        "ol.7.8",
+        "ol.7.7-x64",
+        "rhel.7.8-x64"
+      ]
+    },
+    "ol.7.9": {
+      "#import": [
+        "ol.7.8",
+        "rhel.7.9"
+      ]
+    },
+    "ol.7.9-x64": {
+      "#import": [
+        "ol.7.9",
+        "ol.7.8-x64",
+        "rhel.7.9-x64"
+      ]
+    },
     "ol.8": {
       "#import": [
         "ol",
         "rhel.8"
       ]
     },
+    "ol.8-arm64": {
+      "#import": [
+        "ol.8",
+        "ol-arm64",
+        "rhel.8-arm64"
+      ]
+    },
     "ol.8-x64": {
       "#import": [
         "ol.8",
@@ -1612,6 +1677,13 @@
         "rhel.8.0"
       ]
     },
+    "ol.8.0-arm64": {
+      "#import": [
+        "ol.8.0",
+        "ol.8-arm64",
+        "rhel.8.0-arm64"
+      ]
+    },
     "ol.8.0-x64": {
       "#import": [
         "ol.8.0",
@@ -1652,6 +1724,177 @@
         "illumos-x64"
       ]
     },
+    "ol.8.1": {
+      "#import": [
+        "ol.8.0",
+        "rhel.8.1"
+      ]
+    },
+    "ol.8.1-arm64": {
+      "#import": [
+        "ol.8.1",
+        "ol.8.0-arm64",
+        "rhel.8.1-arm64"
+      ]
+    },
+    "ol.8.1-x64": {
+      "#import": [
+        "ol.8.1",
+        "ol.8.0-x64",
+        "rhel.8.1-x64"
+      ]
+    },
+    "ol.8.2": {
+      "#import": [
+        "ol.8.1",
+        "rhel.8.2"
+      ]
+    },
+    "ol.8.2-arm64": {
+      "#import": [
+        "ol.8.2",
+        "ol.8.1-arm64",
+        "rhel.8.2-arm64"
+      ]
+    },
+    "ol.8.2-x64": {
+      "#import": [
+        "ol.8.2",
+        "ol.8.1-x64",
+        "rhel.8.2-x64"
+      ]
+    },
+    "ol.8.3": {
+      "#import": [
+        "ol.8.2",
+        "rhel.8.3"
+      ]
+    },
+    "ol.8.3-arm64": {
+      "#import": [
+        "ol.8.3",
+        "ol.8.2-arm64",
+        "rhel.8.3-arm64"
+      ]
+    },
+    "ol.8.3-x64": {
+      "#import": [
+        "ol.8.3",
+        "ol.8.2-x64",
+        "rhel.8.3-x64"
+      ]
+    },
+    "ol.8.4": {
+      "#import": [
+        "ol.8.3",
+        "rhel.8.4"
+      ]
+    },
+    "ol.8.4-arm64": {
+      "#import": [
+        "ol.8.4",
+        "ol.8.3-arm64",
+        "rhel.8.4-arm64"
+      ]
+    },
+    "ol.8.4-x64": {
+      "#import": [
+        "ol.8.4",
+        "ol.8.3-x64",
+        "rhel.8.4-x64"
+      ]
+    },
+    "ol.8.5": {
+      "#import": [
+        "ol.8.4",
+        "rhel.8.5"
+      ]
+    },
+    "ol.8.5-arm64": {
+      "#import": [
+        "ol.8.5",
+        "ol.8.4-arm64",
+        "rhel.8.5-arm64"
+      ]
+    },
+    "ol.8.5-x64": {
+      "#import": [
+        "ol.8.5",
+        "ol.8.4-x64",
+        "rhel.8.5-x64"
+      ]
+    },
+    "ol.8.6": {
+      "#import": [
+        "ol.8.5",
+        "rhel.8.6"
+      ]
+    },
+    "ol.8.6-arm64": {
+      "#import": [
+        "ol.8.6",
+        "ol.8.5-arm64",
+        "rhel.8.6-arm64"
+      ]
+    },
+    "ol.8.6-x64": {
+      "#import": [
+        "ol.8.6",
+        "ol.8.5-x64",
+        "rhel.8.6-x64"
+      ]
+    },
+    "ol.9": {
+      "#import": [
+        "ol"
+      ]
+    },
+    "ol.9-arm64": {
+      "#import": [
+        "ol.9",
+        "ol-arm64"
+      ]
+    },
+    "ol.9-x64": {
+      "#import": [
+        "ol.9",
+        "ol-x64"
+      ]
+    },
+    "ol.9.0": {
+      "#import": [
+        "ol.9"
+      ]
+    },
+    "ol.9.0-arm64": {
+      "#import": [
+        "ol.9.0",
+        "ol.9-arm64"
+      ]
+    },
+    "ol.9.0-x64": {
+      "#import": [
+        "ol.9.0",
+        "ol.9-x64"
+      ]
+    },
+    "ol.9.1": {
+      "#import": [
+        "ol.9.0"
+      ]
+    },
+    "ol.9.1-arm64": {
+      "#import": [
+        "ol.9.1",
+        "ol.9.0-arm64"
+      ]
+    },
+    "ol.9.1-x64": {
+      "#import": [
+        "ol.9.1",
+        "ol.9.0-x64"
+      ]
+    },
     "opensuse": {
       "#import": [
         "linux"
@@ -1874,6 +2117,17 @@
         "rhel-x64"
       ]
     },
+    "rhel.6": {
+      "#import": [
+        "rhel"
+      ]
+    },
+    "rhel.6-x64": {
+      "#import": [
+        "rhel.6",
+        "rhel-x64"
+      ]
+    },
     "rhel.7": {
       "#import": [
         "rhel"
@@ -1907,6 +2161,17 @@
         "rhel.7.0-x64"
       ]
     },
+    "rhel.7.10": {
+      "#import": [
+        "rhel.7.9"
+      ]
+    },
+    "rhel.7.10-x64": {
+      "#import": [
+        "rhel.7.10",
+        "rhel.7.9-x64"
+      ]
+    },
     "rhel.7.2": {
       "#import": [
         "rhel.7.1"
@@ -1962,6 +2227,39 @@
         "rhel.7.5-x64"
       ]
     },
+    "rhel.7.7": {
+      "#import": [
+        "rhel.7.6"
+      ]
+    },
+    "rhel.7.7-x64": {
+      "#import": [
+        "rhel.7.7",
+        "rhel.7.6-x64"
+      ]
+    },
+    "rhel.7.8": {
+      "#import": [
+        "rhel.7.7"
+      ]
+    },
+    "rhel.7.8-x64": {
+      "#import": [
+        "rhel.7.8",
+        "rhel.7.7-x64"
+      ]
+    },
+    "rhel.7.9": {
+      "#import": [
+        "rhel.7.8"
+      ]
+    },
+    "rhel.7.9-x64": {
+      "#import": [
+        "rhel.7.9",
+        "rhel.7.8-x64"
+      ]
+    },
     "rhel.8": {
       "#import": [
         "rhel"
@@ -2013,6 +2311,91 @@
         "rhel.8.0-x64"
       ]
     },
+    "rhel.8.2": {
+      "#import": [
+        "rhel.8.1"
+      ]
+    },
+    "rhel.8.2-arm64": {
+      "#import": [
+        "rhel.8.2",
+        "rhel.8.1-arm64"
+      ]
+    },
+    "rhel.8.2-x64": {
+      "#import": [
+        "rhel.8.2",
+        "rhel.8.1-x64"
+      ]
+    },
+    "rhel.8.3": {
+      "#import": [
+        "rhel.8.2"
+      ]
+    },
+    "rhel.8.3-arm64": {
+      "#import": [
+        "rhel.8.3",
+        "rhel.8.2-arm64"
+      ]
+    },
+    "rhel.8.3-x64": {
+      "#import": [
+        "rhel.8.3",
+        "rhel.8.2-x64"
+      ]
+    },
+    "rhel.8.4": {
+      "#import": [
+        "rhel.8.3"
+      ]
+    },
+    "rhel.8.4-arm64": {
+      "#import": [
+        "rhel.8.4",
+        "rhel.8.3-arm64"
+      ]
+    },
+    "rhel.8.4-x64": {
+      "#import": [
+        "rhel.8.4",
+        "rhel.8.3-x64"
+      ]
+    },
+    "rhel.8.5": {
+      "#import": [
+        "rhel.8.4"
+      ]
+    },
+    "rhel.8.5-arm64": {
+      "#import": [
+        "rhel.8.5",
+        "rhel.8.4-arm64"
+      ]
+    },
+    "rhel.8.5-x64": {
+      "#import": [
+        "rhel.8.5",
+        "rhel.8.4-x64"
+      ]
+    },
+    "rhel.8.6": {
+      "#import": [
+        "rhel.8.5"
+      ]
+    },
+    "rhel.8.6-arm64": {
+      "#import": [
+        "rhel.8.6",
+        "rhel.8.5-arm64"
+      ]
+    },
+    "rhel.8.6-x64": {
+      "#import": [
+        "rhel.8.6",
+        "rhel.8.5-x64"
+      ]
+    },
     "rhel.9": {
       "#import": [
         "rhel"
@@ -2030,6 +2413,40 @@
         "rhel-x64"
       ]
     },
+    "rhel.9.0": {
+      "#import": [
+        "rhel.9"
+      ]
+    },
+    "rhel.9.0-arm64": {
+      "#import": [
+        "rhel.9.0",
+        "rhel.9-arm64"
+      ]
+    },
+    "rhel.9.0-x64": {
+      "#import": [
+        "rhel.9.0",
+        "rhel.9-x64"
+      ]
+    },
+    "rhel.9.1": {
+      "#import": [
+        "rhel.9.0"
+      ]
+    },
+    "rhel.9.1-arm64": {
+      "#import": [
+        "rhel.9.1",
+        "rhel.9.0-arm64"
+      ]
+    },
+    "rhel.9.1-x64": {
+      "#import": [
+        "rhel.9.1",
+        "rhel.9.0-x64"
+      ]
+    },
     "sles": {
       "#import": [
         "linux"
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index 3cb3d2df8585d0..aed9d24ba18de2 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -100,15 +100,20 @@
     <RuntimeGroup Include="ol">
       <Parent>rhel</Parent>
       <Architectures>x64</Architectures>
-      <Versions>7;7.0;7.1;7.2;7.3;7.4;7.5;7.6</Versions>
+      <Versions>7;7.0;7.1;7.2;7.3;7.4;7.5;7.6;7.7;7.8;7.9;7.10</Versions>
       <ApplyVersionsToParent>true</ApplyVersionsToParent>
     </RuntimeGroup>
     <RuntimeGroup Include="ol">
       <Parent>rhel</Parent>
-      <Architectures>x64</Architectures>
-      <Versions>8;8.0</Versions>
+      <Architectures>x64;arm64</Architectures>
+      <Versions>8;8.0;8.1;8.2;8.3;8.4;8.5;8.6</Versions>
       <ApplyVersionsToParent>true</ApplyVersionsToParent>
     </RuntimeGroup>
+    <RuntimeGroup Include="ol">
+      <Parent>rhel</Parent>
+      <Architectures>x64;arm64</Architectures>
+      <Versions>9;9.0;9.1</Versions>
+    </RuntimeGroup>
 
     <!-- all opensuse releases are independent -->
     <RuntimeGroup Include="opensuse">
@@ -174,17 +179,17 @@
     <RuntimeGroup Include="rhel">
       <Parent>linux</Parent>
       <Architectures>x64</Architectures>
-      <Versions>7;7.0;7.1;7.2;7.3;7.4;7.5;7.6</Versions>
+      <Versions>7;7.0;7.1;7.2;7.3;7.4;7.5;7.6;7.7;7.8;7.9;7.10</Versions>
     </RuntimeGroup>
     <RuntimeGroup Include="rhel">
       <Parent>linux</Parent>
       <Architectures>x64;arm64</Architectures>
-      <Versions>8;8.0;8.1</Versions>
+      <Versions>8;8.0;8.1;8.2;8.3;8.4;8.5;8.6</Versions>
     </RuntimeGroup>
     <RuntimeGroup Include="rhel">
       <Parent>linux</Parent>
       <Architectures>x64;arm64</Architectures>
-      <Versions>9</Versions>
+      <Versions>9;9.0;9.1</Versions>
     </RuntimeGroup>
 
     <RuntimeGroup Include="sles">
diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json
index 898158211a0ff2..089888f38d0b50 100644
--- a/src/libraries/pkg/baseline/packageIndex.json
+++ b/src/libraries/pkg/baseline/packageIndex.json
@@ -1111,9 +1111,10 @@
         "5.0.1",
         "5.0.2",
         "5.0.3",
-        "5.0.4"
+        "5.0.4",
+        "5.0.5"
       ],
-      "BaselineVersion": "5.0.4",
+      "BaselineVersion": "5.0.5",
       "InboxOn": {}
     },
     "Microsoft.NETCore.Targets": {