diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
new file mode 100644
index 0000000..7f4404a
--- /dev/null
+++ b/.github/workflows/linux.yml
@@ -0,0 +1,53 @@
+name: Linux
+env:
+  VK_VERSION: 1.3.204.1
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  Linux:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install required packages
+        shell: bash
+        run: |
+          sudo apt-get -qq update
+          sudo apt-get install -y make gcc g++ mesa-common-dev libglu1-mesa-dev libxxf86dga-dev libxxf86vm-dev libasound2-dev libx11-dev libxcb1-dev
+      - name: Download and Install Vulkan SDK
+        shell: bash
+        run: |
+          curl -L -v -o vulkansdk-linux-x86_64-$VK_VERSION.tar.gz -O https://sdk.lunarg.com/sdk/download/$VK_VERSION/linux/vulkan_sdk.tar.gz?Human=true
+          tar zxf vulkansdk-linux-x86_64-$VK_VERSION.tar.gz
+      - name: Build vkQuake2 Debug
+        shell: bash
+        run: |
+          export VULKAN_SDK=$GITHUB_WORKSPACE/$VK_VERSION/x86_64
+          cd linux
+          make clean debug
+          cd ..
+      - name: Upload vkQuake2 Debug artifacts
+        uses: actions/upload-artifact@v2.1.3
+        with:
+          name: vkQuake2-Ubuntu-debug-x64
+          path: |
+            linux/debugx64
+            !linux/debugx64/**/*.o
+      - name: Build vkQuake2 Release
+        shell: bash
+        run: |
+          export VULKAN_SDK=$GITHUB_WORKSPACE/$VK_VERSION/x86_64
+          cd linux
+          make clean release
+          cd ..
+      - name: Upload vkQuake2 Release artifacts
+        uses: actions/upload-artifact@v2.1.3
+        with:
+          name: vkQuake2-Ubuntu-release-x64
+          path: |
+            linux/releasex64
+            !linux/releasex64/**/*.o
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
new file mode 100644
index 0000000..9986e6c
--- /dev/null
+++ b/.github/workflows/macos.yml
@@ -0,0 +1,44 @@
+name: MacOS
+env:
+  VK_VERSION: 1.3.204.1
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  MacOS:
+    runs-on: macos-11
+
+    steps:
+      - uses: actions/checkout@v2
+      
+      - name: Install Vulkan SDK
+        uses: humbletim/install-vulkan-sdk@v1.1.1
+        with:
+          version: $VK_VERSION
+          cache: true
+      - name: Build vkQuake2 Debug
+        run: |
+          cd macos
+          make clean-xcode debug-xcode
+          cd ..
+      - name: Upload vkQuake2 Debug artifacts
+        uses: actions/upload-artifact@v2.1.3
+        with:
+          name: vkQuake2-MacOS-debug-x64
+          path: |
+            macos/vkQuake2
+            !macos/vkQuake2/**/*.o
+      - name: Build vkQuake2 Release
+        run: |
+          cd macos
+          make clean-xcode release-xcode
+          cd ..
+      - name: Upload vkQuake2 Release artifacts
+        uses: actions/upload-artifact@v2.1.3
+        with:
+          name: vkQuake2-MacOS-release-x64
+          path: |
+            macos/vkQuake2
+            !macos/vkQuake2/**/*.o
diff --git a/.github/workflows/main.yml b/.github/workflows/windows.yml
similarity index 50%
rename from .github/workflows/main.yml
rename to .github/workflows/windows.yml
index f93c7f4..f698162 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/windows.yml
@@ -1,4 +1,4 @@
-name: CI
+name: Windows
 env:
   VK_VERSION: 1.3.204.1
 on:
@@ -7,85 +7,6 @@ on:
       - master
 
 jobs:
-  Linux:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install required packages
-        shell: bash
-        run: |
-          sudo apt-get -qq update
-          sudo apt-get install -y make gcc g++ mesa-common-dev libglu1-mesa-dev libxxf86dga-dev libxxf86vm-dev libasound2-dev libx11-dev libxcb1-dev
-      - name: Download and Install Vulkan SDK
-        shell: bash
-        run: |
-          curl -L -v -o vulkansdk-linux-x86_64-$VK_VERSION.tar.gz -O https://sdk.lunarg.com/sdk/download/$VK_VERSION/linux/vulkan_sdk.tar.gz?Human=true
-          tar zxf vulkansdk-linux-x86_64-$VK_VERSION.tar.gz
-      - name: Build vkQuake2 Debug
-        shell: bash
-        run: |
-          export VULKAN_SDK=$GITHUB_WORKSPACE/$VK_VERSION/x86_64
-          cd linux
-          make clean debug
-          cd ..
-      - name: Upload vkQuake2 Debug artifacts
-        uses: actions/upload-artifact@v2.1.3
-        with:
-          name: vkQuake2-Ubuntu-debug-x64
-          path: |
-            linux/debugx64
-            !linux/debugx64/**/*.o
-      - name: Build vkQuake2 Release
-        shell: bash
-        run: |
-          export VULKAN_SDK=$GITHUB_WORKSPACE/$VK_VERSION/x86_64
-          cd linux
-          make clean release
-          cd ..
-      - name: Upload vkQuake2 Release artifacts
-        uses: actions/upload-artifact@v2.1.3
-        with:
-          name: vkQuake2-Ubuntu-release-x64
-          path: |
-            linux/releasex64
-            !linux/releasex64/**/*.o
-  MacOS:
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      
-      - name: Install Vulkan SDK
-        uses: humbletim/install-vulkan-sdk@v1.1.1
-        with:
-          version: $VK_VERSION
-          cache: true
-      - name: Build vkQuake2 Debug
-        run: |
-          cd macos
-          make clean-xcode debug-xcode
-          cd ..
-      - name: Upload vkQuake2 Debug artifacts
-        uses: actions/upload-artifact@v2.1.3
-        with:
-          name: vkQuake2-MacOS-debug-x64
-          path: |
-            macos/vkQuake2
-            !macos/vkQuake2/**/*.o
-      - name: Build vkQuake2 Release
-        run: |
-          cd macos
-          make clean-xcode release-xcode
-          cd ..
-      - name: Upload vkQuake2 Release artifacts
-        uses: actions/upload-artifact@v2.1.3
-        with:
-          name: vkQuake2-MacOS-release-x64
-          path: |
-            macos/vkQuake2
-            !macos/vkQuake2/**/*.o
   Windows:
     env:
       VULKAN_SDK: c:\VulkanSDK\%VK_VERSION%