diff --git a/.github/workflows/build-enjoy-app.yml b/.github/workflows/build-enjoy-app.yml
index 176a6bdf..64d114ba 100644
--- a/.github/workflows/build-enjoy-app.yml
+++ b/.github/workflows/build-enjoy-app.yml
@@ -6,7 +6,7 @@ on:
         type: choice
         description: Choose os
         options:
-          - macos-latest
+          - macos-12
           - macos-14
           - windows-latest
           - ubuntu-latest
@@ -25,13 +25,13 @@ jobs:
         uses: josStorer/get-current-time@v2
         id: current-time
         with:
-          format: YYYYMMDD-HH-mm
+          format: YYYYMMDDHHmm
 
       - uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: "**/node_modules"
-          key: ${{ runner.os }}-${{ github.event.inputs.os }}-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ github.event.inputs.os }}-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install dependencies
         run: yarn install
diff --git a/.github/workflows/release-enjoy-app.yml b/.github/workflows/release-enjoy-app.yml
index 87720d50..ef673f1f 100644
--- a/.github/workflows/release-enjoy-app.yml
+++ b/.github/workflows/release-enjoy-app.yml
@@ -6,20 +6,39 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-12, macos-14, windows-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version: 20
-      - name: install dependencies
+
+      - name: Install dependencies
         run: yarn install
-      - name: publish
+
+      - name: Install Apple certificate
+        if: contains(github.event.inputs.os, 'macos')
+        env:
+          MACOS_CERTIFICATE_APPLICATION_BASE64: ${{ secrets.MACOS_CERTIFICATE_APPLICATION_BASE64 }}
+          MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
+        run: ./enjoy/scripts/add-macos-cert.sh
+
+      - name: Publish
         env:
           GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
+          APPLE_ID: ${{ runner.os == 'macOS' && secrets.APPLE_ID || '' }}
+          APPLE_APP_PASSWORD: ${{ runner.os == 'macOS' && secrets.APPLE_APP_PASSWORD || '' }}
+          APPLE_TEAM_ID: ${{ runner.os == 'macOS' && secrets.APPLE_TEAM_ID || '' }}
         run: yarn publish:enjoy
-      - if: matrix.os == 'macos-latest'
-        env:
-          GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
-          PACKAGE_OS_ARCH: arm64
-        run: yarn run publish:enjoy --arch=arm64
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: Enjoy-${{ runner.os }}-${{ matrix.os == 'macos-14' && 'arm64' || 'x64' }}-build-${{ github.ref_name }}
+          path: |
+            enjoy/out/make/**/*.deb
+            enjoy/out/make/**/*.rpm
+            enjoy/out/make/**/*.zip
+            enjoy/out/make/**/*.exe
+            enjoy/out/make/**/*.dmg