diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8ce1356..561c869 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ env:
 
 jobs:
   mingw-w64-cross-headers:
-    runs-on: [Windows, X64, self-hosted]
+    runs-on: windows-latest
 
     steps:
       - uses: msys2/setup-msys2@v2
@@ -50,7 +50,7 @@ jobs:
 
   mingw-w64-cross-binutils:
     needs: [mingw-w64-cross-headers]
-    runs-on: [Windows, X64, self-hosted]
+    runs-on: windows-latest
 
     steps:
       - uses: msys2/setup-msys2@v2
@@ -90,7 +90,7 @@ jobs:
 
   mingw-w64-cross-gcc-stage1:
     needs: [mingw-w64-cross-headers, mingw-w64-cross-binutils]
-    runs-on: [Windows, X64, self-hosted]
+    runs-on: windows-latest
 
     steps:
       - uses: msys2/setup-msys2@v2
@@ -135,7 +135,7 @@ jobs:
 
   mingw-w64-cross-windows-default-manifest:
     needs: [mingw-w64-cross-binutils, mingw-w64-cross-gcc-stage1]
-    runs-on: [Windows, X64, self-hosted]
+    runs-on: windows-latest
 
     steps:
       - uses: msys2/setup-msys2@v2
@@ -185,7 +185,7 @@ jobs:
         mingw-w64-cross-binutils,
         mingw-w64-cross-gcc-stage1,
       ]
-    runs-on: [Windows, X64, self-hosted]
+    runs-on: windows-latest
 
     steps:
       - uses: msys2/setup-msys2@v2
@@ -249,7 +249,7 @@ jobs:
         mingw-w64-cross-gcc-stage1,
         mingw-w64-cross-crt,
       ]
-    runs-on: [Windows, X64, self-hosted]
+    runs-on: windows-latest
 
     steps:
       - uses: msys2/setup-msys2@v2
@@ -311,7 +311,7 @@ jobs:
         mingw-w64-cross-crt,
         mingw-w64-cross-winpthreads,
       ]
-    runs-on: [Windows, X64, self-hosted]
+    runs-on: windows-latest
 
     steps:
       - uses: msys2/setup-msys2@v2