diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0dc0dca..acc2dbc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-18.04, macos-latest, ubuntu-latest ]
+        os: [ windows-latest, macos-latest, ubuntu-latest ]
 
     steps:
       - name: Check out Git repository
@@ -21,26 +21,17 @@ jobs:
           node-version: 16
 
       - name: Install Required Build Toolchain (Windows, Linux)
-        if: matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
           sudo apt-get install gcc-multilib g++-multilib
           sudo apt-get install --no-install-recommends -y libopenjp2-tools
 
-      - name: Install Wine (Windows)
-        if: matrix.os == 'ubuntu-18.04'
-        run: |
-          sudo dpkg --add-architecture i386
-          wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
-          sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport
-          sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main"
-          sudo apt install --install-recommends winehq-stable
-
       - name: Set "NODE_OPTIONS" (Windows, Linux)
-        if: matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'windows-latest'
         run: |
-          export NODE_OPTIONS="--max-old-space-size=6144 --gc_interval=100"
-          echo $NODE_OPTIONS
+          set NODE_OPTIONS="--max-old-space-size=6144 --gc_interval=100"
+          echo %NODE_OPTIONS%
 
       - name: Set "NODE_OPTIONS" (macOS)
         if: matrix.os == 'macos-latest'
@@ -48,11 +39,17 @@ jobs:
           export NODE_OPTIONS="--max-old-space-size=10240 --gc_interval=100"
           echo $NODE_OPTIONS
 
+      - name: Set "NODE_OPTIONS" Linux)
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          export NODE_OPTIONS="--max-old-space-size=6144 --gc_interval=100"
+          echo $NODE_OPTIONS
+
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
 
       - name: Compile (Windows)
-        if: matrix.os == 'ubuntu-18.04'
+        if: matrix.os == 'windows-latest'
         run: npm run ci-compile:win32
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/electron-builder.json b/electron-builder.json
index 5c46b49..4f693cb 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -40,15 +40,7 @@
   },
   "mac": {
     "category": "public.app-category.utilities",
-    "target": [
-      {
-        "target": "default",
-        "arch": [
-          "x64",
-          "arm64"
-        ]
-      }
-    ]
+    "target": "default"
   },
   "linux": {
     "category": "Network",