diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
index 01451996..1cf5c735 100644
--- a/.github/workflows/build_android.yml
+++ b/.github/workflows/build_android.yml
@@ -48,7 +48,7 @@ jobs:
           cache: true
           cache-key: ${{ github.sha }}
 
-      - name: Run Fastlane
+      - name: Build LunaSea
         working-directory: ${{ github.workspace }}/android
         env:
           SUPPLY_JSON_KEY: ${{ github.workspace }}/.fastlane-android-auth.json
diff --git a/macos/fastlane/Fastfile b/macos/fastlane/Fastfile
index b0c28b9d..19d755e1 100644
--- a/macos/fastlane/Fastfile
+++ b/macos/fastlane/Fastfile
@@ -78,7 +78,7 @@ platform :mac do
       },
     )
     sh("mkdir", "-p", "../../output")
-    sh("mv", "../../macos/LunaSea.pkg", "../../output/LunaSea-macOS.pkg")
+    sh("mv", "../LunaSea.pkg", "../../output/LunaSea-macOS.pkg")
 
     keychain_delete
   end
@@ -106,12 +106,12 @@ platform :mac do
       }
     )
     notarize(
-      package: "../macos/LunaSea.app",
+      package: "LunaSea.app",
       use_notarytool: true,
     )
 
     sh("mkdir", "-p", "../../output")
-    sh("cp", "-R", "../../macos/LunaSea.app", "../../output/LunaSea.app")
+    sh("cp", "-R", "../LunaSea.app", "../../output/LunaSea.app")
     Dir.chdir("../../output") do
       sh("zip", "-r", "-y", "LunaSea-macOS.zip", "LunaSea.app")
       sh("rm", "-rf", "LunaSea.app")
diff --git a/package.json b/package.json
index 2e3cd6cb..0f2fe164 100644
--- a/package.json
+++ b/package.json
@@ -30,10 +30,15 @@
     "generate:firebase": "rm -rf lib/firebase_options.dart && npm install -g firebase-tools && firebase login && dart pub global activate flutterfire_cli && flutterfire configure",
     "generate:localization": "dart ./scripts/generate_localization.dart",
     "prepare": "husky install && flutter pub get",
+    "prepare:keychain": "npm run prepare:keychain:ios && npm run prepare:keychain:macos",
+    "prepare:keychain:ios": "cd ios && bundle exec fastlane keychain_create && bundle exec fastlane keychain_setup",
+    "prepare:keychain:macos": "cd macos && bundle exec fastlane keychain_create && bundle exec fastlane keychain_setup",
     "profile": "flutter run --profile --cache-sksl --purge-persistent-cache",
-    "release:prepare": "npm run cocoapods:nuke && npm run generate && npm run fastlane:update",
-    "release:changelog": "standard-version --no-verify --commit-all",
-    "release:changelog:dry": "npm run release:changelog -- --dry-run"
+    "release": "HUSKY=0 standard-version --no-verify --commit-all",
+    "release:changelog": "npm run release:changelog -- --dry-run",
+    "release:flavor:beta": "HUSKY=0 git commit --no-verify --allow-empty -m \"chore(release): beta release [skip ci]\"",
+    "release:flavor:candidate": "HUSKY=0 git commit --no-verify --allow-empty -m \"chore(release): candidate release [skip ci]\"",
+    "release:prepare": "npm run cocoapods:nuke && npm run generate && npm run fastlane:update"
   },
   "devDependencies": {
     "@commitlint/cli": "^16.2.3",