diff --git a/.azure/azure-ci-build-pipeline.yaml b/.azure/azure-ci-build-pipeline.yaml
index 4c15daf5..a93aa131 100644
--- a/.azure/azure-ci-build-pipeline.yaml
+++ b/.azure/azure-ci-build-pipeline.yaml
@@ -6,16 +6,29 @@ trigger:
 - bugfix/*
 - release/*
 
-pool:
-  vmImage: ubuntu-latest
 strategy:
   matrix:
-    Python38:
+    UbuntuPython38:
       python.version: '3.8'
-    Python39:
-      python.version: '3.9'
-    Python310:
+      imageName: 'ubuntu-latest'
+    UbuntuPython310:
       python.version: '3.10'
+      imageName: 'ubuntu-latest'
+    WindowsPython38:
+      python.version: '3.8'
+      imageName: 'windows-latest'
+    WindowsPython310:
+      python.version: '3.10'
+      imageName: 'windows-latest'
+    MacOSPython38:
+      python.version: '3.8'
+      imageName: 'macOS-latest'
+    MacOSPython310:
+      python.version: '3.10'
+      imageName: 'macOS-latest'
+
+pool:
+  vmImage: $(imageName)
 
 steps:
 - task: UsePythonVersion@0
@@ -50,11 +63,6 @@ steps:
     primaite setup
   displayName: 'Perform PrimAITE Setup'
 
-#- script: |
-#    flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-#    flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-#  displayName: 'Lint with flake8'
-
 - script: |
     pytest tests/
   displayName: 'Run tests'