diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index 7409d187..a4c4dcfb 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -58,17 +58,15 @@ jobs:
       - name: Build (macOS)
         run: |
           bundle exec fastlane --env mac,beta create_archive
-          scripts/ci/reset-archive.sh
       - name: Build (iOS)
         run: |
           bundle exec fastlane --env ios,beta create_archive
-          scripts/ci/reset-archive.sh
       - name: Upload to App Store (macOS)
         run: |
-          bundle exec fastlane --env mac,beta store_deploy
+          bundle exec fastlane --env mac,beta store_upload
       - name: Upload to App Store (iOS)
         run: |
-          bundle exec fastlane --env ios,beta store_deploy
+          bundle exec fastlane --env ios,beta store_upload
   submit_to_testflight:
     runs-on: macos-10.15
     needs: upload_to_app_store
@@ -92,13 +90,11 @@ jobs:
       - name: Submit to TestFlight (macOS)
         run: |
           export PILOT_CHANGELOG=`ci/build-changelog.sh mac`
-          export PILOT_BUILD_NUMBER=`ci/build-number.sh`
-          bundle exec fastlane --env mac,beta beta_deploy
+          bundle exec fastlane --env mac,beta store_beta
       - name: Submit to TestFlight (iOS)
         run: |
           export PILOT_CHANGELOG=`ci/build-changelog.sh ios`
-          export PILOT_BUILD_NUMBER=`ci/build-number.sh`
-          bundle exec fastlane --env ios,beta beta_deploy
+          bundle exec fastlane --env ios,beta store_beta
   submit_for_app_review:
     runs-on: macos-10.15
     needs: submit_to_testflight
@@ -118,10 +114,10 @@ jobs:
           bundler-cache: true
       - name: Update App Store Connect metadata (macOS)
         run: |
-          ci/update-asc-metadata.sh mac
+          bundle exec fastlane --env mac update_metadata
       - name: Update App Store Connect metadata (iOS)
         run: |
-          ci/update-asc-metadata.sh ios
+          bundle exec fastlane --env ios update_metadata
       - name: Submit for App Review (macOS)
         run: |
           bundle exec fastlane --env mac store_review
diff --git a/Submodules/fastlane-ci-templates b/Submodules/fastlane-ci-templates
index 883b9fb9..ee86dfd2 160000
--- a/Submodules/fastlane-ci-templates
+++ b/Submodules/fastlane-ci-templates
@@ -1 +1 @@
-Subproject commit 883b9fb9c230d872524ab29fbee0a3328776883f
+Subproject commit ee86dfd27b7e0ba09b2fb8152d50cf15e9ca3030
diff --git a/scripts/ci/reset-archive.sh b/scripts/ci/reset-archive.sh
deleted file mode 100755
index ebb82817..00000000
--- a/scripts/ci/reset-archive.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-git checkout *Info.plist Passepartout.xcodeproj