diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3dd9ea534c5..8775e032e2a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,7 +45,7 @@ jobs:
   macos:
     needs: lint
     runs-on: macos-latest
-    if: github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
+    if: github.ref == 'refs/heads/main'
     timeout-minutes: 30
 
     steps:
@@ -112,9 +112,21 @@ jobs:
 
     - run: yarn generate
     - run: yarn prepare-beta-build
-    - run: yarn build
+
+    - name: Create bundle
+      run: yarn build:esbuild:prod
+
+    - name: Build with packaging .deb file
+      run: yarn build:release
+      if: github.ref == 'refs/heads/main'
       env:
         DISABLE_INSPECT_FUSE: on
+    - name: Build without packaging .deb file
+      run: yarn build:release --linux dir
+      if: github.ref != 'refs/heads/main'
+      env:
+        DISABLE_INSPECT_FUSE: on
+
     - run: xvfb-run --auto-servernum yarn test-node
     - run: xvfb-run --auto-servernum yarn test-electron
       timeout-minutes: 5
@@ -158,9 +170,21 @@ jobs:
     - run: del package.json
     - run: type temp.json | findstr /v certificateSubjectName | findstr /v certificateSha1 > package.json
     - run: yarn prepare-beta-build
-    - run: yarn build
+
+    - name: Create bundle
+      run: yarn build:esbuild:prod
+
+    - name: Build with NSIS
+      run: yarn build:release
+      if: github.ref == 'refs/heads/main'
       env:
         DISABLE_INSPECT_FUSE: on
+    - name: Build without NSIS
+      run: yarn build:release --win dir
+      if: github.ref != 'refs/heads/main'
+      env:
+        DISABLE_INSPECT_FUSE: on
+
     - run: yarn test-electron
       timeout-minutes: 5
     - run: yarn test-release