diff --git a/.github/scripts/macos/setup-keychain.ps1 b/.github/scripts/macos/setup-keychain.ps1
index f346428a..7d3e4d4d 100644
--- a/.github/scripts/macos/setup-keychain.ps1
+++ b/.github/scripts/macos/setup-keychain.ps1
@@ -11,7 +11,6 @@ security create-keychain -p $env:KEYCHAIN_PASSWORD build.keychain
 security default-keychain -s build.keychain
 security unlock-keychain -p $env:KEYCHAIN_PASSWORD build.keychain
 security set-keychain-settings -lut 1200 build.keychain
-security add-generic-password -k build.keychain -a "AC_USERNAME" -w $env:APPLE_ID_PASSWORD -s "AC_PASSWORD"
 security import $desktopKeyPath -k build.keychain -P $env:DESKTOP_KEY_PASSWORD -T /usr/bin/codesign -T /usr/bin/security
 security import $devidAppCertPath -k build.keychain -P $env:DEVID_CERT_PASSWORD -T /usr/bin/codesign -T /usr/bin/security
 security import $devidInstallerCertPath -k build.keychain -P $env:DEVID_CERT_PASSWORD -T /usr/bin/codesign -T /usr/bin/security
diff --git a/.github/secrets/bitwarden-deskop-key.p12.gpg b/.github/secrets/bitwarden-desktop-key.p12.gpg
similarity index 100%
rename from .github/secrets/bitwarden-deskop-key.p12.gpg
rename to .github/secrets/bitwarden-desktop-key.p12.gpg
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ed0fbb8b..b20ec2c3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -153,6 +153,9 @@ jobs:
 
       - name: Build application for .dmg
         run: npm run dist:mac
+        env:
+          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
 
 #      - name: Build Safari extension for App Store
 #        shell: pwsh
@@ -160,3 +163,6 @@ jobs:
 
       - name: Build application for App Store
         run: npm run dist:mac:mas
+        env:
+          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
diff --git a/scripts/after-sign.js b/scripts/after-sign.js
index 79b504c7..7b6af59c 100644
--- a/scripts/after-sign.js
+++ b/scripts/after-sign.js
@@ -7,18 +7,19 @@ async function run(context) {
     console.log('## After sign');
     // console.log(context);
 
-    const appleId = process.env.APPLEID;
-    const appName = context.packager.appInfo.productFilename;
-    const appPath = `${context.appOutDir}/${appName}.app`;
     const macBuild = context.electronPlatformName === 'darwin';
 
     if (macBuild) {
         console.log('### Notarizing ' + appPath);
+        const appName = context.packager.appInfo.productFilename;
+        const appPath = `${context.appOutDir}/${appName}.app`;
+        const appleId = process.env.APPLE_ID_USERNAME || process.env.APPLEID;
+        const appleIdPassword = process.env.APPLE_ID_PASSWORD || `@keychain:AC_PASSWORD`;
         return await notarize({
             appBundleId: 'com.bitwarden.desktop',
             appPath: appPath,
             appleId: appleId,
-            appleIdPassword: `@keychain:AC_PASSWORD`,
+            appleIdPassword: appleIdPassword,
         });
     }
 }