diff --git a/.github/workflows/Linux_x86.yml b/.github/workflows/Linux_x86.yml
index 30ec98801..755738c3d 100644
--- a/.github/workflows/Linux_x86.yml
+++ b/.github/workflows/Linux_x86.yml
@@ -1,19 +1,14 @@
 name: Linux_x86
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [ opened, synchronize ]
 
 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
@@ -23,7 +18,7 @@ jobs:
 
     - name: Create Build Environment
       run: >
-        sudo dpkg --add-architecture i386 && 
+        sudo dpkg --add-architecture i386 &&
         sudo apt update -y &&
         sudo apt install -y cmake file g++-multilib git libfmt-dev:i386 libsdl2-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev:i386 rpm wget
 
@@ -37,12 +32,6 @@ jobs:
       shell: bash
       run: cmake --build build -j $(nproc) --target package
 
-    - name: Upload-Executable
-      uses: actions/upload-artifact@v2
-      with:
-        name: devilutionx_linux_x86
-        path: build/devilutionx
-
     - name: Package
       run: Packaging/nix/LinuxReleasePackaging.sh && Packaging/nix/AppImage.sh
 
diff --git a/.github/workflows/Linux_x86_64_SDL1.yml b/.github/workflows/Linux_x86_64_SDL1.yml
index ce1e8ba39..a36fd22fc 100644
--- a/.github/workflows/Linux_x86_64_SDL1.yml
+++ b/.github/workflows/Linux_x86_64_SDL1.yml
@@ -1,19 +1,14 @@
 name: Linux_x86_64_SDL1
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [ opened, synchronize ]
 
 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
@@ -36,12 +31,6 @@ jobs:
       shell: bash
       run: cmake --build build -j $(nproc) --target package
 
-    - name: Upload-Executable
-      uses: actions/upload-artifact@v2
-      with:
-        name: devilutionx_linux_x86_64_SDL1
-        path: build/devilutionx
-
     - name: Package
       run: Packaging/nix/LinuxReleasePackaging.sh
 
diff --git a/.github/workflows/MacOSX.yml b/.github/workflows/MacOSX.yml
index b8b8ce453..d00adc9a0 100644
--- a/.github/workflows/MacOSX.yml
+++ b/.github/workflows/MacOSX.yml
@@ -1,24 +1,18 @@
 name: MacOSX
 
-# When creating a new workflow in GitHub’s action builder the default trigger is the push event. We want to extend this to push and pull request events.
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [ opened, synchronize ]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
 
 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' }}
     # The CMake configure and build commands are platform agnostic and should work equally
     # well on Windows or Mac.  You can convert this to a matrix build if you need
     # cross-platform coverage.
diff --git a/.github/workflows/Windows_x64.yml b/.github/workflows/Windows_x64.yml
index 27400fd22..37d550772 100644
--- a/.github/workflows/Windows_x64.yml
+++ b/.github/workflows/Windows_x64.yml
@@ -1,19 +1,14 @@
 name: Windows_x64
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [ opened, synchronize ]
 
 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
@@ -37,12 +32,6 @@ jobs:
       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:
diff --git a/.github/workflows/Windows_x86.yml b/.github/workflows/Windows_x86.yml
index dbe378e58..e7be70e33 100644
--- a/.github/workflows/Windows_x86.yml
+++ b/.github/workflows/Windows_x86.yml
@@ -1,19 +1,14 @@
 name: Windows_x86
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [ opened, synchronize ]
 
 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
@@ -37,12 +32,6 @@ jobs:
       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: