diff --git a/images/win/scripts/Installers/Install-Mingw64.ps1 b/images/win/scripts/Installers/Install-Mingw64.ps1
index 15bb31825..6d9043a80 100644
--- a/images/win/scripts/Installers/Install-Mingw64.ps1
+++ b/images/win/scripts/Installers/Install-Mingw64.ps1
@@ -3,7 +3,8 @@
 ##  Desc:  Install GNU tools for Windows
 ################################################################################
 
-Choco-Install -PackageName mingw -ArgumentList "--version=8.1.0"
+$toolsetVersion = (Get-ToolsetContent).mingw.version
+Choco-Install -PackageName mingw -ArgumentList "--version=$toolsetVersion"
 
 # Make a copy of mingw32-make.exe to make.exe, which is a more discoverable name
 # and so the same command line can be used on Windows as on macOS and Linux
diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json
index fb15f0582..39265c49f 100644
--- a/images/win/toolsets/toolset-2019.json
+++ b/images/win/toolsets/toolset-2019.json
@@ -189,6 +189,9 @@
             ]
         }
     },
+    "mingw": {
+	"version": "8.1.0"
+    },
     "MsysPackages": {
         "msys2": [
             "base-devel",
diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json
index 06af656b0..93b451e00 100644
--- a/images/win/toolsets/toolset-2022.json
+++ b/images/win/toolsets/toolset-2022.json
@@ -159,6 +159,9 @@
             ]
         }
     },
+    "mingw": {
+	"version": "11.2.0.07112021"
+    },
     "MsysPackages": {
         "msys2": [],
         "mingw": []