diff --git a/.github/workflows/main.yml b/.github/workflows/build-app.yml
similarity index 68%
rename from .github/workflows/main.yml
rename to .github/workflows/build-app.yml
index 66cc99f6d..c11a33296 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/build-app.yml
@@ -43,23 +43,3 @@ jobs:
           file: OpenCore-Patcher.app.zip
           tag: ${{ github.ref }}
           file_glob: true
-  build:
-    name: Build CLI
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v2
-      - run: pyinstaller OCLP-GUI.spec
-      - run: cd dist; zip ../OCLP-GUI.zip OCLP-GUI
-      - name: Upload Binary to Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: OCLP-GUI
-          path: OCLP-GUI.zip
-      - name: Upload to Release
-        if: github.event_name == 'release'
-        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: OCLP-GUI.zip
-          tag: ${{ github.ref }}
-          file_glob: true
diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml
new file mode 100644
index 000000000..618182a0e
--- /dev/null
+++ b/.github/workflows/build-cli.yml
@@ -0,0 +1,29 @@
+name: CI - Build CLI
+
+on:
+  push:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    name: Build CLI
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v2
+      - run: pyinstaller OCLP-GUI.spec
+      - run: cd dist; zip ../OCLP-GUI.zip OCLP-GUI
+      - name: Upload Binary to Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: OCLP-GUI
+          path: OCLP-GUI.zip
+      - name: Upload to Release
+        if: github.event_name == 'release'
+        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: OCLP-GUI.zip
+          tag: ${{ github.ref }}
+          file_glob: true
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build-site.yml
similarity index 97%
rename from .github/workflows/build_test_deploy.yml
rename to .github/workflows/build-site.yml
index cef2f539b..7e3c14596 100644
--- a/.github/workflows/build_test_deploy.yml
+++ b/.github/workflows/build-site.yml
@@ -1,4 +1,4 @@
-name: Build/Test/Deploy
+name: CI - Build Site
 on:
   push:
     branches-ignore: