diff --git a/.github/workflows/2.nightly_release.yml b/.github/workflows/2.nightly_release.yml
index d7a40e67c..6b280d3fe 100644
--- a/.github/workflows/2.nightly_release.yml
+++ b/.github/workflows/2.nightly_release.yml
@@ -19,36 +19,20 @@ jobs:
           bundle install
           npm install --global create-dmg
 
-      # We will make it compatible with the latest version of Xcode
-      # - name: Select Xcode version
-      #   run: sudo xcode-select -s '/Applications/Xcode_13.4.1.app/Contents/Developer'
+      - name: Select Xcode version
+        run: sudo xcode-select -s '/Applications/Xcode_13.4.1.app/Contents/Developer'
 
       - name: Set build number
         shell: bash
         run: |
           fastlane run increment_build_number build_number:${{ github.run_number }}
 
-      - name: Fastlane match
+      - name: Fastlane Nightly
         shell: bash
-        run: |
-          fastlane run setup_ci
-          fastlane match developer_id --readonly
+        run: fastlane nightly
         env:
           MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-
-      # pre-build the PlayTools
-      - name: Carthage bootstrap
-        shell: bash
-        run: |
-          carthage update --use-xcframeworks
-        env:
-          FASTLANE: 1
-
-      - name: Fastlane Nightly
-        shell: bash
-        run: fastlane nightly --verbose
-        env:
           FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 120 # x86 is slooooooow
 
       - name: Exract API_KEY
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index a96395d67..3b3cb6b1f 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -26,6 +26,9 @@ end
 
 
 lane :release do
+  setup_ci if ENV['CI']
+  match(type: "developer_id", readonly: true)
+  carthage(use_xcframeworks: true)
   build_mac_app(
     configuration: "Release",
     scheme: "PlayCover",
@@ -39,6 +42,9 @@ lane :release do
 end
 
 lane :nightly do
+  setup_ci if ENV['CI']
+  match(type: "developer_id", readonly: true)
+  carthage(use_xcframeworks: true)
   build_mac_app(
     configuration: "Nightly",
     scheme: "PlayCover",