diff --git a/.circleci/config.yml b/.circleci/config.yml
index e2c9d6d9c..0fa32f34d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,32 +14,6 @@ jobs:
       - run: bash <(curl -s https://codecov.io/bash)
     environment:
       CTEST_OUTPUT_ON_FAILURE: 1
-  windows_x86:
-    docker:
-      - image: debian:testing
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run: apt-get update -y
-      - run: apt-get install -y cmake gcc-mingw-w64-i686 g++-mingw-w64-i686 pkg-config-mingw-w64-i686 wget git sudo
-      - run: Packaging/windows/mingw-prep.sh
-      - run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/mingwcc.cmake
-      - run: cmake --build build -j 2 --target package
-      - store_artifacts: {path: ./build/devilutionx.exe, destination: devilutionx_x86.exe}
-      - store_artifacts: {path: ./build/devilutionx.zip, destination: devilutionx_x86.zip}
-  windows_x64:
-    docker:
-    - image: debian:testing
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run: apt-get update -y
-      - run: apt-get install -y cmake gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 pkg-config-mingw-w64-x86-64 wget git sudo
-      - run: Packaging/windows/mingw-prep64.sh
-      - run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/mingwcc64.cmake
-      - run: cmake --build build -j 2 --target package
-      - store_artifacts: {path: ./build/devilutionx.exe, destination: devilutionx_x64.exe}
-      - store_artifacts: {path: ./build/devilutionx.zip, destination: devilutionx_x64.zip}
   switch:
     docker:
       - image: devkitpro/devkita64:latest
@@ -103,8 +77,6 @@ workflows:
   testflow:
     jobs:
       - linux_x86_64_test
-      - windows_x86
-      - windows_x64
       - switch
       - 3ds
       - amigaos-m68k
diff --git a/.github/workflows/Windows_x64.yml b/.github/workflows/Windows_x64.yml
new file mode 100644
index 000000000..27400fd22
--- /dev/null
+++ b/.github/workflows/Windows_x64.yml
@@ -0,0 +1,50 @@
+name: Windows_x64
+
+on: [push, pull_request]
+
+jobs:
+  prebuild:
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+
+  build:
+    needs: prebuild
+    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Create Build Environment
+      run: >
+        sudo apt update &&
+        sudo apt install -y cmake gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 pkg-config-mingw-w64-x86-64 wget git sudo &&
+        sudo Packaging/windows/mingw-prep64.sh
+
+    - name: Configure CMake
+      shell: bash
+      working-directory: ${{github.workspace}}
+      run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/mingwcc64.cmake
+
+    - name: Build
+      working-directory: ${{github.workspace}}
+      shell: bash
+      run: cmake --build build -j $(nproc) --target package
+
+    - name: Upload-Executable
+      uses: actions/upload-artifact@v2
+      with:
+        name: devilutionx_x64.exe
+        path: build/devilutionx.exe
+
+    - name: Upload-Package
+      uses: actions/upload-artifact@v2
+      with:
+        name: devilutionx_x64.zip
+        path: build/devilutionx.zip
diff --git a/.github/workflows/Windows_x86.yml b/.github/workflows/Windows_x86.yml
new file mode 100644
index 000000000..dbe378e58
--- /dev/null
+++ b/.github/workflows/Windows_x86.yml
@@ -0,0 +1,50 @@
+name: Windows_x86
+
+on: [push, pull_request]
+
+jobs:
+  prebuild:
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+
+  build:
+    needs: prebuild
+    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Create Build Environment
+      run: >
+        sudo apt update &&
+        sudo apt install -y cmake gcc-mingw-w64-i686 g++-mingw-w64-i686 pkg-config-mingw-w64-i686 wget git sudo &&
+        sudo Packaging/windows/mingw-prep.sh
+
+    - name: Configure CMake
+      shell: bash
+      working-directory: ${{github.workspace}}
+      run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/mingwcc.cmake
+
+    - name: Build
+      working-directory: ${{github.workspace}}
+      shell: bash
+      run: cmake --build build -j $(nproc) --target package
+
+    - name: Upload-Executable
+      uses: actions/upload-artifact@v2
+      with:
+        name: devilutionx_x86.exe
+        path: build/devilutionx.exe
+
+    - name: Upload-Package
+      uses: actions/upload-artifact@v2
+      with:
+        name: devilutionx_x86.zip
+        path: build/devilutionx.zip