diff --git a/eng/Packaging.props b/eng/Packaging.props
index 1c28c2ea442b..c37014c7b6f4 100644
--- a/eng/Packaging.props
+++ b/eng/Packaging.props
@@ -27,7 +27,7 @@
     <PackageVersion Condition="'$(PackageVersion)' == ''">4.7.0</PackageVersion>
     <!-- major.minor.release version of the platforms package we're currently building
          Pre-release will be appended during build -->
-    <PlatformPackageVersion>3.1.10</PlatformPackageVersion>
+    <PlatformPackageVersion>3.1.11</PlatformPackageVersion>
     <SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
     <SkipGenerationCheck>true</SkipGenerationCheck>
     <!-- The index check here is used to determine if the assembly is containted in a stable package version.
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index 504c479baa08..4e1b10f2475c 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -2007,6 +2007,18 @@
     "any",
     "base"
   ],
+  "ol-arm64": [
+    "ol-arm64",
+    "ol",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "ol-x64": [
     "ol-x64",
     "ol",
@@ -2115,6 +2127,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",
@@ -2395,23 +2499,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",
@@ -2421,29 +2573,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",
@@ -2453,16 +2653,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",
@@ -2470,9 +2739,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",
@@ -2995,6 +4023,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",
@@ -3064,6 +4112,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",
@@ -3198,7 +4299,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",
@@ -3213,7 +4449,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",
@@ -3350,6 +4592,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",
@@ -3382,6 +4909,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/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
index 57abcae8ab6f..9fb736171706 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -952,6 +952,12 @@
         "rhel"
       ]
     },
+    "ol-arm64": {
+      "#import": [
+        "ol",
+        "rhel-arm64"
+      ]
+    },
     "ol-x64": {
       "#import": [
         "ol",
@@ -997,6 +1003,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",
@@ -1062,12 +1081,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",
@@ -1081,6 +1146,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",
@@ -1088,6 +1160,177 @@
         "rhel.8.0-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"
@@ -1335,6 +1578,17 @@
         "linux-x64"
       ]
     },
+    "rhel.6": {
+      "#import": [
+        "rhel"
+      ]
+    },
+    "rhel.6-x64": {
+      "#import": [
+        "rhel.6",
+        "rhel-x64"
+      ]
+    },
     "rhel.7": {
       "#import": [
         "rhel"
@@ -1368,6 +1622,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"
@@ -1423,6 +1688,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"
@@ -1474,6 +1772,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"
@@ -1491,6 +1874,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/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index c466a389159f..c0957722a76d 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -84,15 +84,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">
@@ -124,17 +129,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/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index 44f95bef0094..ca3aa29e8129 100644
--- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -204,9 +204,10 @@
         "3.1.7",
         "3.1.8",
         "3.1.9",
-        "3.1.10"
+        "3.1.10",
+        "3.1.11"
       ],
-      "BaselineVersion": "3.1.10",
+      "BaselineVersion": "3.1.11",
       "InboxOn": {}
     },
     "Microsoft.NETCore.Platforms.Future": {