diff --git a/.github/workflows/c-demos.yml b/.github/workflows/c-demos.yml
index 399e1c88..21a03b67 100644
--- a/.github/workflows/c-demos.yml
+++ b/.github/workflows/c-demos.yml
@@ -82,10 +82,11 @@ jobs:
             arch: x86_64
             make_file: "Unix Makefiles"
           - os: windows-latest
-            platform: windows
+            platform: windows/amd64
             arch: amd64
+            make_file: "MinGW Makefiles"
           - os: windows-latest
-            platform: windows
+            platform: windows/arm64
             arch: arm64
             make_file: "MinGW Makefiles"
           - os: macos-latest
diff --git a/.github/workflows/dotnet-demos.yml b/.github/workflows/dotnet-demos.yml
index 45bb68ec..be5ebf86 100644
--- a/.github/workflows/dotnet-demos.yml
+++ b/.github/workflows/dotnet-demos.yml
@@ -28,10 +28,10 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
         include:
           - os: windows-latest
-            platform: windows
+            platform: windows/amd64
             arch: amd64
           - os: windows-latest
-            platform: windows
+            platform: windows/arm64
             arch: arm64
 
     steps:
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 426c5713..e07fd5e3 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -41,10 +41,10 @@ jobs:
         dotnet-version: [2.1.x, 3.0.x, 3.1.x, 5.0.x, 6.0.x, 8.0.x]
         include:
           - os: windows-latest
-            platform: windows
+            platform: windows/amd64
             arch: amd64
           - os: windows-latest
-            platform: windows
+            platform: windows/arm64
             arch: arm64
           - dotnet-version: 2.1.x
             binding-framework: netstandard2.0
diff --git a/.github/workflows/java-demos.yml b/.github/workflows/java-demos.yml
index 4552d782..6cde8e02 100644
--- a/.github/workflows/java-demos.yml
+++ b/.github/workflows/java-demos.yml
@@ -29,10 +29,10 @@ jobs:
         java-version: ['11', '17', '19']
         include:
           - os: windows-latest
-            platform: windows
+            platform: windows/amd64
             arch: amd64
           - os: windows-latest
-            platform: windows
+            platform: windows/arm64
             arch: arm64
 
     steps:
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index cba61386..7d0e6e55 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -33,10 +33,10 @@ jobs:
         java-version: ['11', '17', '19']
         include:
           - os: windows-latest
-            platform: windows
+            platform: windows/amd64
             arch: amd64
           - os: windows-latest
-            platform: windows
+            platform: windows/arm64
             arch: arm64
 
     steps:
diff --git a/.github/workflows/nodejs-demos.yml b/.github/workflows/nodejs-demos.yml
index 3e0aa82a..872c8f88 100644
--- a/.github/workflows/nodejs-demos.yml
+++ b/.github/workflows/nodejs-demos.yml
@@ -32,10 +32,10 @@ jobs:
         node-version: [16.x, 18.x, 20.x]
         include:
           - os: windows-latest
-            platform: windows
+            platform: windows/amd64
             arch: amd64
           - os: windows-latest
-            platform: windows
+            platform: windows/arm64
             arch: arm64
 
     steps:
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index d51ac935..bde2d421 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -32,10 +32,10 @@ jobs:
         node-version: [16.x, 18.x, 20.x]
         include:
           - os: windows-latest
-            platform: windows
+            platform: windows/amd64
             arch: amd64
           - os: windows-latest
-            platform: windows
+            platform: windows/arm64
             arch: arm64
 
     steps:
diff --git a/.github/workflows/python-demos.yml b/.github/workflows/python-demos.yml
index 4dd2b70d..dc3a8e1f 100644
--- a/.github/workflows/python-demos.yml
+++ b/.github/workflows/python-demos.yml
@@ -29,10 +29,10 @@ jobs:
         python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
         include:
           - os: windows-latest
-            platform: windows
+            platform: windows/amd64
             arch: amd64
           - os: windows-latest
-            platform: windows
+            platform: windows/arm64
             arch: arm64
 
     steps:
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 9aba2937..8d3cfae0 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -39,10 +39,10 @@ jobs:
         python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
         include:
           - os: windows-latest
-            platform: windows
+            platform: windows/amd64
             arch: amd64
           - os: windows-latest
-            platform: windows
+            platform: windows/arm64
             arch: arm64
 
     steps: