diff --git a/README.md b/README.md
index 11a5d84..0f9aac4 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ levels as the example files.
    the module can be patched or further configured.
 
  - Define shared (default) or static builds (for executables and libraries).
- 
+
  - Define optimized (default) or debug builds.
 
  - Run tests (using the EPICS build system, i.e., `make runtests`
@@ -76,7 +76,7 @@ and limitations.
  - Cross-compile for RTEMS 4.9 and 4.10 (pc386, Base >= 3.15)
  - Cross-compile for RTEMS 5 (10 BSPs, Base >= 7.0.5.1)
  - Built dependencies are cached (for faster builds).
- 
+
 See specific
 **[ci-scripts on Travis-CI README](travis/README.md)**
 for more details.
@@ -85,7 +85,7 @@ for more details.
  - One parallel runner (all builds are sequential)
  - Windows Server 2012/2016/2019
  - Compile using gcc/MinGW or different Visual Studio versions: \
-   2010, 2012, 2013, 2015, 2017, 2019
+   2010, 2012, 2013, 2015, 2017, 2019, 2022
  - Compile for Windows 32bit and 64bit
  - No useful caching available.
 
@@ -95,10 +95,10 @@ for more details.
 
 ### [GitHub Actions](https://github.com/)
  - 20 parallel runners on Linux/Windows (5 runners on MacOS)
- - Ubuntu 16/18/20, MacOS 10.15, Windows Server 2016/2019
+ - Ubuntu 16/18/20, MacOS 10.15, Windows Server 2016/2019/2022
  - Compile natively on Linux (gcc, clang)
  - Compile natively on MacOS (clang)
- - Compile natively on Windows (gcc/MinGW, Visual Studio 2017 & 2019)
+ - Compile natively on Windows (gcc/MinGW, Visual Studio 2017/2019/2022)
  - Cross-compile for Windows 32bit and 64bit using MinGW and WINE
  - Cross-compile for RTEMS 4.9 and 4.10 (pc386, Base >= 3.15)
  - Cross-compile for RTEMS 5 (10 BSPs, Base >= 7.0.5.1)
@@ -112,7 +112,7 @@ for more details.
 
  - Docker-based runners on Linux (one VM instance per job)
  - Can use any Docker image from Dockerhub (the examples use
-  `ubuntu:bionic`)
+    `ubuntu:bionic`)
  - Compile natively using different compilers (gcc, clang)
  - Cross-compile for Windows 32bit and 64bit using MinGW and WINE
  - Cross-compile for RTEMS 4.9 and 4.10 (pc386, Base >= 3.15)
diff --git a/appveyor/.appveyor.yml.example-full b/appveyor/.appveyor.yml.example-full
index 979a65d..6224a78 100644
--- a/appveyor/.appveyor.yml.example-full
+++ b/appveyor/.appveyor.yml.example-full
@@ -92,8 +92,8 @@ environment:
   BASE: 7.0
 
   matrix:
-  - CMP: vs2019
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+  - CMP: vs2022
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
   - CMP: gcc
   - CMP: vs2019
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
diff --git a/appveyor/.appveyor.yml.example-mini b/appveyor/.appveyor.yml.example-mini
index 5907214..f7506ae 100644
--- a/appveyor/.appveyor.yml.example-mini
+++ b/appveyor/.appveyor.yml.example-mini
@@ -20,7 +20,7 @@ skip_commits:
 install:
   - cmd: git submodule update --init --recursive
 
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 # Build Configurations: shared/static, optimized/debug
 configuration:
@@ -34,9 +34,9 @@ environment:
   SETUP_PATH: .ci-local:.ci
 
   matrix:
-  - CMP: vs2019
+  - CMP: vs2022
     BASE: 7.0
-  - CMP: vs2019
+  - CMP: vs2022
     BASE: 3.15
 
 # Platform: processor architecture
diff --git a/appveyor/README.md b/appveyor/README.md
index e96f93d..7590bf9 100644
--- a/appveyor/README.md
+++ b/appveyor/README.md
@@ -5,7 +5,7 @@
  - One parallel runner (all builds are sequential)
  - Windows Server 2012/2016/2019
  - Compile using gcc/MinGW or different Visual Studio versions: \
-   2010, 2012, 2013, 2015, 2017, 2019
+   2010, 2012, 2013, 2015, 2017, 2019, 2022
  - Compile for Windows 32bit and 64bit
  - No useful caching available.
 
@@ -46,7 +46,7 @@
     List of environment variable settings. Each list element (starting with
     a dash) is one step on the axis of the build matrix. \
     Set `CMP` to select the compiler: `gcc` for the native
-    [MinGW](http://mingw-w64.org/) GNU compiler, `vs2010` ...`vs2019` 
+    [MinGW](http://mingw-w64.org/) GNU compiler, `vs2010` ...`vs2022`
     (options listed above) for the Microsoft Visual Studio compilers.
 
     Your builds will take long. \
diff --git a/github-actions/README.md b/github-actions/README.md
index 9a35c91..836b3e7 100644
--- a/github-actions/README.md
+++ b/github-actions/README.md
@@ -6,7 +6,7 @@
  - Ubuntu 16/18/20, MacOS 10.15, Windows Server 2016/2019
  - Compile natively on Linux (gcc, clang)
  - Compile natively on MacOS (clang)
- - Compile natively on Windows (gcc/MinGW, Visual Studio 2017 & 2019)
+ - Compile natively on Windows (gcc/MinGW, Visual Studio 2017/2019/2022)
  - Cross-compile for Windows 32bit and 64bit using MinGW and WINE
  - Cross-compile for RTEMS 4.9 and 4.10 (pc386, Base >= 3.15)
  - Cross-compile for RTEMS 5 (10 BSPs, Base >= 7.0.5.1)
diff --git a/github-actions/ci-scripts-build.yml.example-full b/github-actions/ci-scripts-build.yml.example-full
index f124d18..515ea67 100644
--- a/github-actions/ci-scripts-build.yml.example-full
+++ b/github-actions/ci-scripts-build.yml.example-full
@@ -166,6 +166,16 @@ jobs:
             configuration: static
             name: "Win2019 MSC-19, static"
 
+          - os: windows-2022
+            cmp: vs2022
+            configuration: default
+            name: "Win2022 MSC-22"
+
+          - os: windows-2022
+            cmp: vs2022
+            configuration: static
+            name: "Win2022 MSC-22, static"
+
     steps:
     - uses: actions/checkout@v2
       with: