diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
new file mode 100644
index 000000000..60d86838a
--- /dev/null
+++ b/.github/workflows/linux.yml
@@ -0,0 +1,54 @@
+name: Build Linux
+
+on: [push]
+
+jobs:
+  build:
+    name: Build for ${{ matrix.targetPlatform }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        targetPlatform:
+          - StandaloneLinux64
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        # with:
+        #   lfs: true
+
+      # Cache resued Library files to speed up compilation
+      - uses: actions/cache@v2
+        with:
+          path: Library
+          key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}
+          restore-keys: |
+            Library-
+
+      # Test (No tests yet, leaving this here for future.)
+      # - name: Run tests
+      #   uses: game-ci/unity-test-runner@v2
+      #   env:
+      #     UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+      #   with:
+      #     githubToken: ${{ secrets.GITHUB_TOKEN }}
+
+      # Build project with Unity
+      - name: Build project
+        uses: game-ci/unity-builder@v2
+        env:
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+        with:
+          unityVersion: auto
+          buildName: Heaven Studio
+          buildsPath: build
+          targetPlatform: ${{ matrix.targetPlatform }}
+          
+      # Output
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.targetPlatform }}-build
+          path: ./build/${{ matrix.targetPlatform }}/
diff --git a/.github/workflows/main.yml b/.github/workflows/macos.yml
similarity index 94%
rename from .github/workflows/main.yml
rename to .github/workflows/macos.yml
index 0bfa6a81b..88370f89f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/macos.yml
@@ -1,4 +1,4 @@
-name: Build my project ✨
+name: Build MacOS
 
 on: [push]
 
@@ -10,8 +10,6 @@ jobs:
       fail-fast: false
       matrix:
         targetPlatform:
-          - StandaloneWindows64
-          - StandaloneLinux64
           - StandaloneOSX
 
     steps:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 000000000..d3aadc8d5
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,54 @@
+name: Build Windows
+
+on: [push]
+
+jobs:
+  build:
+    name: Build for ${{ matrix.targetPlatform }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        targetPlatform:
+          - StandaloneWindows64
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        # with:
+        #   lfs: true
+
+      # Cache resued Library files to speed up compilation
+      - uses: actions/cache@v2
+        with:
+          path: Library
+          key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}
+          restore-keys: |
+            Library-
+
+      # Test (No tests yet, leaving this here for future.)
+      # - name: Run tests
+      #   uses: game-ci/unity-test-runner@v2
+      #   env:
+      #     UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+      #   with:
+      #     githubToken: ${{ secrets.GITHUB_TOKEN }}
+
+      # Build project with Unity
+      - name: Build project
+        uses: game-ci/unity-builder@v2
+        env:
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+        with:
+          unityVersion: auto
+          buildName: Heaven Studio
+          buildsPath: build
+          targetPlatform: ${{ matrix.targetPlatform }}
+          
+      # Output
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.targetPlatform }}-build
+          path: ./build/${{ matrix.targetPlatform }}/
diff --git a/README.md b/README.md
index ad129be92..a1d9386d1 100644
--- a/README.md
+++ b/README.md
@@ -25,9 +25,9 @@
 This project is still in development, so there are currently no release builds yet. GitHub Actions creates experimental builds on each commmit, but minimal support will be provided.
 
 
-- [Windows](https://nightly.link/megaminerjenny/HeavenStudio/workflows/main/master/StandaloneWindows64-build.zip)
-- [Linux](https://nightly.link/megaminerjenny/HeavenStudio/workflows/main/master/StandaloneLinux64-build.zip)
-- [MacOS](https://nightly.link/megaminerjenny/HeavenStudio/workflows/main/master/StandaloneOSX-build.zip)
+- [Windows](https://nightly.link/megaminerjenny/HeavenStudio/workflows/windows/master/StandaloneWindows64-build.zip)
+- [Linux](https://nightly.link/megaminerjenny/HeavenStudio/workflows/linux/master/StandaloneLinux64-build.zip)
+- [MacOS](https://nightly.link/megaminerjenny/HeavenStudio/workflows/macos/master/StandaloneOSX-build.zip)
 #### Important Notes:
 - The prebuilt binaries are compressed in tar format, you may need to use 7-Zip or WinRAR on Windows to extract them.
 - On MacOS and Linux builds you may [experience bugs with audio-related tasks](https://github.com/megaminerjenny/HeavenStudio/issues/72), but in most cases Heaven Studio works perfectly.