diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index 0ec1a650..79e556ef 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -67,7 +67,7 @@ jobs:
         run: |
           bundle exec fastlane --env ios,beta store_upload
   submit_to_testflight:
-    runs-on: macos-10.15
+    runs-on: ubuntu-latest
     needs: upload_to_app_store
     environment:
       name: testflight
@@ -88,14 +88,16 @@ jobs:
           bundler-cache: true
       - 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:
-    runs-on: macos-10.15
+    runs-on: ubuntu-latest
     needs: submit_to_testflight
     environment:
       name: app_review
@@ -119,7 +121,9 @@ jobs:
           bundle exec fastlane --env ios update_metadata
       - name: Submit for App Review (macOS)
         run: |
+          export DELIVER_BUILD_NUMBER=`ci/build-number.sh mac`
           bundle exec fastlane --env mac store_review
       - name: Submit for App Review (iOS)
         run: |
+          export DELIVER_BUILD_NUMBER=`ci/build-number.sh ios`
           bundle exec fastlane --env ios store_review
diff --git a/Submodules/fastlane-ci-templates b/Submodules/fastlane-ci-templates
index 7f4d7d41..600ccdc8 160000
--- a/Submodules/fastlane-ci-templates
+++ b/Submodules/fastlane-ci-templates
@@ -1 +1 @@
-Subproject commit 7f4d7d415e60ed345a415888e088f7fed0a9b412
+Subproject commit 600ccdc845727ef181371b086b53f7ed387278cf