diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
new file mode 100644
index 0000000..d5c426c
--- /dev/null
+++ b/.github/workflows/mac-build.yml
@@ -0,0 +1,39 @@
+name: Build CPD-Client Mac
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build CPD-Client Mac
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: macos-latest
+
+    steps:
+
+      - name: Setup Python 3.11
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Python install setuptools
+        run: python3 -m pip install setuptools
+
+      - name: Check out the repository
+        uses: actions/checkout@v2
+
+      - name: Setup Node.js 16.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: '16.x'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Make and Publish
+        run: npm run build-mac
+        env:
+          GITHUB_TOKEN: ${{ secrets.BUILD_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 27e53f0..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: Build CPD-Client
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Build CPD-Client
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        os: [macos-latest, ubuntu-latest]
-
-    steps:
-
-      - name: Setup Python 3.11 (Mac)
-        if: startsWith(matrix.os, 'macos')
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
-
-      - name: Python install setuptools (Mac)
-        if: startsWith(matrix.os, 'macos')
-        run: python3 -m pip install setuptools
-
-      - name: Check out the repository
-        uses: actions/checkout@v2
-
-      - name: Setup Node.js 16.x (Mac)
-        if: startsWith(matrix.os, 'macos')
-        uses: actions/setup-node@v1
-        with:
-          node-version: '16.x'
-
-      - name: Setup Node.js 14.x (Ubuntu)
-        if: startsWith(matrix.os, 'ubuntu')
-        uses: actions/setup-node@v1
-        with:
-          node-version: '14.x'
-
-      - name: Install dependencies
-        run: npm install
-
-      - name: Install flatpak
-        if: startsWith(matrix.os, 'ubuntu')
-        run: |
-          sudo apt-get install flatpak -y
-          sudo apt-get install flatpak-builder -y
-          sudo apt-get install elfutils -y
-          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          sudo flatpak install flathub org.freedesktop.Platform/x86_64/22.08 org.freedesktop.Sdk/x86_64/22.08 org.electronjs.Electron2.BaseApp/x86_64/22.08 -y
-          git config --global --add protocol.file.allow always
-
-      - name: Make and Publish (Ubuntu)
-        if: startsWith(matrix.os, 'ubuntu')
-        run: npm run build-linux
-        env:
-          GITHUB_TOKEN: ${{ secrets.BUILD_TOKEN }}
-
-      - name: Make and Publish (Mac)
-        if: startsWith(matrix.os, 'macos')
-        run: npm run build-mac
-        env:
-          GITHUB_TOKEN: ${{ secrets.BUILD_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/ubuntu-build.yml b/.github/workflows/ubuntu-build.yml
new file mode 100644
index 0000000..247b40c
--- /dev/null
+++ b/.github/workflows/ubuntu-build.yml
@@ -0,0 +1,40 @@
+name: Build CPD-Client Ubuntu
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build CPD-Client Ubuntu
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: ubuntu-latest
+
+    steps:
+
+      - name: Check out the repository
+        uses: actions/checkout@v2
+
+      - name: Setup Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: '14.x'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Install flatpak
+        run: |
+          sudo apt-get install flatpak -y
+          sudo apt-get install flatpak-builder -y
+          sudo apt-get install elfutils -y
+          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          sudo flatpak install flathub org.freedesktop.Platform/x86_64/22.08 org.freedesktop.Sdk/x86_64/22.08 org.electronjs.Electron2.BaseApp/x86_64/22.08 -y
+          git config --global --add protocol.file.allow always
+
+      - name: Make and Publish
+        run: npm run build-linux
+        env:
+          GITHUB_TOKEN: ${{ secrets.BUILD_TOKEN }}
\ No newline at end of file