diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml
index 473ae709..659ecf47 100644
--- a/.github/workflows/test_windows.yml
+++ b/.github/workflows/test_windows.yml
@@ -5,7 +5,7 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
diff --git a/docs/build_windows.md b/docs/build_windows.md
index 6b8e7fbc..8c7ec227 100644
--- a/docs/build_windows.md
+++ b/docs/build_windows.md
@@ -13,9 +13,9 @@ Click on the `Install` button on the top right, which should show the option to
 ![Unreal Engine Install Location UI Screenshot](images/ue_install_location.png)
 
 ## Build AirSim
-* Install Visual Studio 2019.
-**Make sure** to select **Desktop Development with C++** and **Windows 10 SDK 10.0.18362** (should be selected by default) and select the latest .NET Framework SDK under the 'Individual Components' tab while installing VS 2019.
-* Start `Developer Command Prompt for VS 2019`.
+* Install Visual Studio 2022.
+**Make sure** to select **Desktop Development with C++** and **Windows 10 SDK 10.0.19041** (should be selected by default) and select the latest .NET Framework SDK under the 'Individual Components' tab while installing VS 2022.
+* Start `Developer Command Prompt for VS 2022`.
 * Clone the repo: `git clone https://github.com/Microsoft/AirSim.git`, and go the AirSim directory by `cd AirSim`.
 
     **Note:** It's generally not a good idea to install AirSim in C drive. This can cause scripts to fail, and requires running VS in Admin mode. Instead clone in a different drive such as D or E.
@@ -37,6 +37,9 @@ Alternatively, you can use [APIs](apis.md) for programmatic control or use the s
 Once AirSim is set up by following above steps, you can,
 
 1. Double click on .sln file to load the Blocks project in `Unreal\Environments\Blocks` (or .sln file in your own [custom](unreal_custenv.md) Unreal project). If you don't see .sln file then you probably haven't completed steps in Build Unreal Project section above.
+
+    **Note**: If you are using UE 4.26 or below, Unreal will auto-generate the .sln file targetting Visual Studio 2019. Visual Studio 2022 will be able to load and run this .sln, but if you want full Visual Studio 2022 support, you will need to use UE 4.27 and explicitly enable support by going to 'Edit->Editor Preferences->Source Code' and selecting 'Visual Studio 2022' for the 'Source Code Editor' setting.
+
 2. Select your Unreal project as Start Up project (for example, Blocks project) and make sure Build config is set to "Develop Editor" and x64.
 3. After Unreal Editor loads, press Play button.