diff --git a/content/actions/using-github-hosted-runners/about-github-hosted-runners.md b/content/actions/using-github-hosted-runners/about-github-hosted-runners.md
index 07831439bd..f7443771ad 100644
--- a/content/actions/using-github-hosted-runners/about-github-hosted-runners.md
+++ b/content/actions/using-github-hosted-runners/about-github-hosted-runners.md
@@ -76,6 +76,7 @@ For the overall list of included tools for each runner operating system, see the
 
 * [Ubuntu 20.04 LTS](https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md)
 * [Ubuntu 18.04 LTS](https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md)
+* [Windows Server 2022](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md)
 * [Windows Server 2019](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md)
 * [Windows Server 2016](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md)
 * [macOS 11](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md)
diff --git a/data/reusables/github-actions/supported-github-runners.md b/data/reusables/github-actions/supported-github-runners.md
index af4477f60f..2e01f5efca 100644
--- a/data/reusables/github-actions/supported-github-runners.md
+++ b/data/reusables/github-actions/supported-github-runners.md
@@ -1,14 +1,25 @@
 <table style="width:100%">
 <thead>
   <tr>
-    <th style="width:25%">Virtual environment</th>
-    <th style="width:25%">YAML workflow label</th>
-    <th style="width:50%">Notes</th>
+    <th style="width:35%"><b>Virtual environment</b></th>
+    <th style="width:25%"><b>YAML workflow label</b></th>
+    <th style="width:40%"><b>Notes</b></th>
   </tr>
 </thead>
 <tbody>
 <tr>
 <td>
+Windows Server 2022<sup>[beta]</sup>
+</td>
+<td>
+<code>windows-2022</code>
+</td>
+<td>
+The <code>windows-latest</code> label currently uses the windows server 2019 runner image.
+</td>
+</tr>
+<tr>
+<td>
 Windows Server 2019
 </td>
 <td>
@@ -49,13 +60,13 @@ Ubuntu 18.04
 </tr>
 <tr>
 <td>
-Ubuntu 16.04
+Ubuntu 16.04<sup>[deprecated]</sup>
 </td>
 <td>
 <code>ubuntu-16.04</code>
 </td>
 <td>
-Deprecated and limited to existing customers only. If any of your workflows use Ubuntu 16.04, migrate to Ubuntu 20.04 or 18.04. For more information, see  <A href="https://github.blog/changelog/2021-04-29-github-actions-ubuntu-16-04-lts-virtual-environment-will-be-removed-on-september-20-2021">the blog post</A>.
+Deprecated and limited to existing customers only. Migrate to Ubuntu 20.04. For more information, see  <A href="https://github.blog/changelog/2021-04-29-github-actions-ubuntu-16-04-lts-virtual-environment-will-be-removed-on-september-20-2021">the blog post</A>.
 </td>
 </tr>
 <tr>
@@ -66,7 +77,7 @@ macOS Big Sur 11
 <code>macos-11</code>
 </td>
 <td>
-{% data reusables.github-actions.macos-runner-preview %}
+The <code>macos-latest</code> label currently uses the macOS 10.15 runner image.
 </td>
 </tr>
 <tr>
@@ -77,8 +88,13 @@ macOS Catalina 10.15
 <code>macos-latest</code> or <code>macos-10.15</code>
 </td>
 <td>
-{% data reusables.github-actions.macos-runner-preview %}
 </td>
 </tr>
 </tbody>
 </table>
+
+{% warning %}
+
+<b>Note:</b> Beta Images are provided "as-is", "with all faults" and "as available" and are excluded from the service level agreement and warranty. Beta Images may not be covered by customer support. 
+
+{% endwarning %}