diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index a4ef0db1d7f165a3fceedf719f673fbf79a19588..228f2a4a8a31224922a2166bab40b741cfc684bd 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -74,7 +74,7 @@ jobs:
     steps:
       - uses: actions/setup-haskell@v1.1.4
         with:
-          ghc-version: '8.8.4'
+          ghc-version: '8.8.4.1'
           cabal-version: '3.2.0.0'
       - name: Print versions
         run: |
@@ -124,7 +124,7 @@ jobs:
     steps:
       - uses: actions/setup-haskell@v1.1.4
         with:
-          ghc-version: '8.10.2'
+          ghc-version: '8.10.2.2'
           cabal-version: '3.2.0.0'
       - name: Print versions
         run: |
diff --git a/cabal-dev-scripts/src/GenValidate.hs b/cabal-dev-scripts/src/GenValidate.hs
index 6a112465af1359cc1a4c1df5f1254ea3b233389f..2da70b6fa71e2aa781a3bc8bcd950b48b2b95e28 100644
--- a/cabal-dev-scripts/src/GenValidate.hs
+++ b/cabal-dev-scripts/src/GenValidate.hs
@@ -4,6 +4,7 @@
 module Main (main) where
 
 import Data.List          (isPrefixOf)
+import Data.Maybe         (fromMaybe)
 import GHC.Generics       (Generic)
 import System.Environment (getArgs)
 import System.Exit        (exitFailure)
@@ -47,9 +48,9 @@ main = do
                     -- Unexpected failure on GHCi exit: fd:10: hClose: resource vanished (Broken pipe)
                     -- cabal-tests: fd:10: hClose: resource vanished (Broken pipe)
                     -- [ WinGhcJob "8.8.1" ["8.6.5"]
-                    [ WinGhcJob "8.6.5" []
-                    , WinGhcJob "8.8.4" []
-                    , WinGhcJob "8.10.2" []
+                    [ mkWinGhcJob "8.6.5"  Nothing           []
+                    , mkWinGhcJob "8.8.4"  (Just "8.8.4.1")  []
+                    , mkWinGhcJob "8.10.2" (Just "8.10.2.2") []
                     ]
                 , zMangleVersion = map mangleChar
                 , zOr            = (||)
@@ -123,12 +124,6 @@ data MacGhcJob = MacGhcJob
     }
   deriving (Generic)
 
-data WinGhcJob = WinGhcJob
-    { wgjVersion :: String
-    , wgjNeeds   :: [String]
-    }
-  deriving (Generic)
-
 mkMacGhcJob :: String -> String -> MacGhcJob
 mkMacGhcJob v u = MacGhcJob
     { mgjVersion = v
@@ -138,6 +133,16 @@ mkMacGhcJob v u = MacGhcJob
     , mgjSteps   = defSteps
     }
 
+data WinGhcJob = WinGhcJob
+    { wgjVersion      :: String
+    , wgjChocoVersion :: String
+    , wgjNeeds        :: [String]
+    }
+  deriving (Generic)
+
+mkWinGhcJob :: String -> Maybe String -> [String] -> WinGhcJob
+mkWinGhcJob v mv = WinGhcJob v (fromMaybe v mv)
+
 instance Zinza Z where
     toType    = genericToTypeSFP
     toValue   = genericToValueSFP
diff --git a/templates/ci-windows.template.yml b/templates/ci-windows.template.yml
index 8a37f2f241d736867b14540ea64dcb121700b06d..bc05394696158dfe1127778a6c4e4a355dc2fb09 100644
--- a/templates/ci-windows.template.yml
+++ b/templates/ci-windows.template.yml
@@ -31,7 +31,7 @@ jobs:
     steps:
       - uses: actions/setup-haskell@v1.1.4
         with:
-          ghc-version: '{{ job.version }}'
+          ghc-version: '{{ job.chocoVersion }}'
           cabal-version: '3.2.0.0'
       - name: Print versions
         run: |