diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1
index 50d16c52..e884da49 100644
--- a/images/win/scripts/Installers/Install-JavaTools.ps1
+++ b/images/win/scripts/Installers/Install-JavaTools.ps1
@@ -106,7 +106,7 @@ $defaultVersion = $toolsetJava.default
 foreach ($jdkVendor in $jdkVendors) {
     $jdkVendorName = $jdkVendor.name
     $jdkVersionsToInstall = $jdkVendor.versions
-    
+
     $isDefaultVendor = $jdkVendorName -eq $defaultVendor
 
     foreach ($jdkVersionToInstall in $jdkVersionsToInstall) {
@@ -133,7 +133,11 @@ if (-not (Test-IsWin22)) {
 # Install Java tools
 # Force chocolatey to ignore dependencies on Ant and Maven or else they will download the Oracle JDK
 Choco-Install -PackageName ant -ArgumentList "-i"
-Choco-Install -PackageName maven -ArgumentList "-i"
+# Maven 3.9.x has multiple compatibilities problems
+$toolsetMavenVersion = (Get-ToolsetContent).maven.version
+$versionToInstall = Get-LatestChocoPackageVersion -TargetVersion $toolsetMavenVersion -PackageName "maven"
+
+Choco-Install -PackageName maven -ArgumentList "--version=$versionToInstall"
 Choco-Install -PackageName gradle
 
 # Add maven env variables to Machine
diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json
index a98bb2f3..bf9e44a4 100644
--- a/images/win/toolsets/toolset-2019.json
+++ b/images/win/toolsets/toolset-2019.json
@@ -479,6 +479,9 @@
     "node": {
         "default": "18"
     },
+    "maven": {
+        "version": "3.8"
+    },
     "mysql": {
         "version": "5.7"
     },
diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json
index f804daac..bfafc88e 100644
--- a/images/win/toolsets/toolset-2022.json
+++ b/images/win/toolsets/toolset-2022.json
@@ -390,6 +390,9 @@
     "node": {
         "default": "18"
     },
+    "maven": {
+        "version": "3.8"
+    },
     "mysql": {
         "version": "8.0"
     },