diff --git a/.env.beta b/.env.beta
index 0092e42b..ea37ca30 100644
--- a/.env.beta
+++ b/.env.beta
@@ -3,6 +3,5 @@ MATCH_TYPE="appstore"
 GYM_EXPORT_METHOD="app-store"
 GYM_SKIP_PACKAGE_PKG="false"
 DEMO_ACCOUNT_REQUIRED="true"
-PILOT_DISTRIBUTE_ONLY="true"
 PILOT_DISTRIBUTE_EXTERNAL="true"
 PILOT_BETA_APP_DESCRIPTION="Passepartout is a non-official, user-friendly OpenVPN® client."
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index 278041b8..f750433a 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -18,7 +18,7 @@ env:
   FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }}
 
 jobs:
-  test_and_upload_to_app_store:
+  test_or_upload_to_app_store:
     runs-on: macos-10.15
     timeout-minutes: 60
     env:
@@ -28,7 +28,11 @@ jobs:
       MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }}
       MATCH_KEYCHAIN_NAME: ${{ secrets.MATCH_KEYCHAIN_NAME }}
       MATCH_KEYCHAIN_PASSWORD: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
-      DELIVER_USERNAME: ${{ secrets.DELIVER_USERNAME }}
+      PILOT_USERNAME: ${{ secrets.PILOT_USERNAME }}
+      PILOT_GROUPS: ${{ secrets.PILOT_GROUPS }}
+      PILOT_BETA_APP_FEEDBACK: ${{ secrets.PILOT_BETA_APP_FEEDBACK }}
+      PILOT_BETA_APP_REVIEW_INFO: ${{ secrets.PILOT_BETA_APP_REVIEW_INFO }}
+      CHANGELOG_PREFACE: ${{ secrets.CHANGELOG_PREFACE }}
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
@@ -67,25 +71,28 @@ jobs:
         if: github.ref == 'refs/heads/stable'
         run: |
           bundle exec fastlane --env ios,beta create_archive
-      - name: Upload to App Store (macOS)
+      - name: Submit to TestFlight (macOS)
         if: github.ref == 'refs/heads/stable'
         run: |
-          bundle exec fastlane --env mac,beta store_upload
-      - name: Upload to App Store (iOS)
+          export PILOT_CHANGELOG=`ci/build-changelog.sh mac`
+          export PILOT_PKG="dist/mac/Passepartout.pkg"
+          bundle exec fastlane --env mac,beta store_beta
+      - name: Submit to TestFlight (iOS)
         if: github.ref == 'refs/heads/stable'
         run: |
-          bundle exec fastlane --env ios,beta store_upload
-  submit_to_testflight:
+          export PILOT_CHANGELOG=`ci/build-changelog.sh ios`
+          export PILOT_IPA="dist/ios/Passepartout.ipa"
+          bundle exec fastlane --env ios,beta store_beta
+  release_public_beta:
     if: github.ref == 'refs/heads/stable'
     runs-on: ubuntu-latest
-    needs: test_and_upload_to_app_store
+    needs: test_or_upload_to_app_store
     environment:
-      name: testflight
+      name: public_beta
     env:
       PILOT_USERNAME: ${{ secrets.PILOT_USERNAME }}
       PILOT_GROUPS: ${{ secrets.PILOT_GROUPS }}
-      PILOT_BETA_APP_FEEDBACK: ${{ secrets.PILOT_BETA_APP_FEEDBACK }}
-      PILOT_BETA_APP_REVIEW_INFO: ${{ secrets.PILOT_BETA_APP_REVIEW_INFO }}
+      PILOT_DISTRIBUTE_ONLY: true
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
@@ -99,17 +106,15 @@ jobs:
       - name: Submit to TestFlight (macOS)
         run: |
           export PILOT_BUILD_NUMBER=`ci/build-number.sh mac`
-          export PILOT_CHANGELOG=`ci/build-changelog.sh mac`
           bundle exec fastlane --env mac,beta store_beta
       - name: Submit to TestFlight (iOS)
         run: |
           export PILOT_BUILD_NUMBER=`ci/build-number.sh ios`
-          export PILOT_CHANGELOG=`ci/build-changelog.sh ios`
           bundle exec fastlane --env ios,beta store_beta
   submit_for_app_review:
     if: github.ref == 'refs/heads/stable'
     runs-on: ubuntu-latest
-    needs: submit_to_testflight
+    needs: release_public_beta
     environment:
       name: app_review
     env: