diff --git a/.github/actions/create-keychain/action.yml b/.github/actions/create-keychain/action.yml
index af30c019..4229f263 100644
--- a/.github/actions/create-keychain/action.yml
+++ b/.github/actions/create-keychain/action.yml
@@ -14,7 +14,7 @@ runs:
         KEYCHAIN_NAME: ${{ inputs.name }}
         KEYCHAIN_PASSWORD: ${{ inputs.password }}
       run: |
-        bundle exec fastlane run create_keychain unlock:true lock_after_timeout:false
+        bundle exec fastlane run create_keychain unlock:true lock_after_timeout:false timeout:6000
     - uses: webiny/action-post-run@2.0.1
       env:
         KEYCHAIN_NAME: ${{ inputs.name }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9b033a5a..23648c20 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,18 +11,6 @@ env:
   APP_STORE_CONNECT_API_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY }}
   FASTLANE_USERNAME: ${{ secrets.FASTLANE_USERNAME }}
   FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }}
-  MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
-  MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-  MATCH_GIT_URL: ${{ secrets.MATCH_GIT_URL }}
-  MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }}
-  MATCH_KEYCHAIN_NAME: ${{ secrets.MATCH_KEYCHAIN_NAME }}
-  MATCH_KEYCHAIN_PASSWORD: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
-  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_NOTIFY_EXTERNAL_TESTERS: ${{ secrets.PILOT_NOTIFY_EXTERNAL_TESTERS }}
-  CHANGELOG_PREFACE: ${{ secrets.CHANGELOG_PREFACE }}
 
 jobs:
   build_upload:
@@ -40,6 +28,12 @@ jobs:
             platform: "mac"
     env:
       PLATFORM: ${{ matrix.platform }}
+      MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
+      MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+      MATCH_GIT_URL: ${{ secrets.MATCH_GIT_URL }}
+      MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }}
+      MATCH_KEYCHAIN_NAME: ${{ secrets.MATCH_KEYCHAIN_NAME }}
+      MATCH_KEYCHAIN_PASSWORD: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
       GYM_OUTPUT_DIRECTORY: "dist/${{ matrix.platform }}"
     steps:
       - uses: actions/checkout@v2
@@ -51,6 +45,14 @@ jobs:
       - uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: latest-stable
+      - name: Store app version
+        id: app_version
+        if: ${{ matrix.use_version }}
+        run: |
+          VERSION=`ci/version-number.sh $PLATFORM`
+          BUILD=`ci/build-number.sh $PLATFORM`
+          echo "::set-output name=version::$VERSION"
+          echo "::set-output name=build::$BUILD"
       - name: Create keychain
         uses: ./.github/actions/create-keychain
         with:
@@ -60,23 +62,22 @@ jobs:
         run: |
           scripts/ci/recognize-match-hostname.sh
           bundle exec fastlane --env ${{ matrix.platform }} match development
-      - name: Store app version
-        id: app_version
-        if: ${{ matrix.use_version }}
-        run: |
-          VERSION=`ci/version-number.sh $PLATFORM`
-          BUILD=`ci/build-number.sh $PLATFORM`
-          echo "::set-output name=version::$VERSION"
-          echo "::set-output name=build::$BUILD"
       - name: Run tests
         run: |
           cd PassepartoutCore
           swift test
       - name: Build ${{ matrix.name }} app
-        timeout-minutes: 15
+        timeout-minutes: 10
         run: |
           bundle exec fastlane --env $PLATFORM,beta test_and_build_app test:false
       - name: Submit to TestFlight
+        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_NOTIFY_EXTERNAL_TESTERS: ${{ secrets.PILOT_NOTIFY_EXTERNAL_TESTERS }}
+          CHANGELOG_PREFACE: ${{ secrets.CHANGELOG_PREFACE }}
         run: |
           if [ $PLATFORM == "ios" ]; then
             export PILOT_IPA="$GYM_OUTPUT_DIRECTORY/Passepartout.ipa"
@@ -96,18 +97,17 @@ jobs:
       name: public_beta
       url: "https://testflight.apple.com/join/K71mtLjZ"
     env:
-      PILOT_USERNAME: ${{ secrets.PILOT_USERNAME }}
-      PILOT_GROUPS: ${{ secrets.PILOT_GROUPS }}
       PILOT_APP_VERSION: ${{ needs.build_upload.outputs.version }}
       PILOT_BUILD_NUMBER: ${{ needs.build_upload.outputs.build }}
+      PILOT_USERNAME: ${{ secrets.PILOT_USERNAME }}
+      PILOT_GROUPS: ${{ secrets.PILOT_GROUPS }}
+      PILOT_NOTIFY_EXTERNAL_TESTERS: ${{ secrets.PILOT_NOTIFY_EXTERNAL_TESTERS }}
       PILOT_DISTRIBUTE_ONLY: true
     steps:
-      - name: Check out repository
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
         with:
           submodules: true
-      - name: Prepare Ruby bundle
-        uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - name: Publish on TestFlight (iOS)
@@ -131,12 +131,10 @@ jobs:
       DELIVER_BUILD_NUMBER: ${{ needs.build_upload.outputs.build }}
       DELIVER_FORCE: true
     steps:
-      - name: Check out repository
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
         with:
           submodules: true
-      - name: Prepare Ruby bundle
-        uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - name: Submit for App Review (iOS)
@@ -153,9 +151,9 @@ jobs:
       name: app_store
     env:
       TAG_NAME: ${{ needs.build_upload.outputs.version }}
+      RELEASE_NOTES: release-notes.txt
     steps:
-      - name: Check out repository
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
         with:
           submodules: true
       - name: Import GPG key
@@ -167,27 +165,21 @@ jobs:
           git_commit_gpgsign: true
           git_tag_gpgsign: true
           git_push_gpgsign: false
-      - name: Tag release
+      - name: Pull metadata updates
         run: |
           git pull --no-tags origin $GITHUB_REF_NAME
           git submodule update --recursive
+      - name: Tag release
+        run: |
           scripts/ci/commit-release.sh $TAG_NAME
           git push && git push --tags
       - name: Assemble notes
         run: |
-          RELEASE_NOTES="release-notes.txt"
-          echo "# App Store" >$RELEASE_NOTES
-          echo >>$RELEASE_NOTES
-          echo "## iOS" >>$RELEASE_NOTES
-          echo >>$RELEASE_NOTES
-          cat Passepartout/App/iOS/fastlane/metadata/en-US/release_notes.txt >>$RELEASE_NOTES
-          echo "## macOS" >>$RELEASE_NOTES
-          echo >>$RELEASE_NOTES
-          cat Passepartout/App/macOS/fastlane/metadata/en-US/release_notes.txt >>$RELEASE_NOTES
+          scripts/ci/release-notes.sh $TAG_NAME >$RELEASE_NOTES
       - name: Publish release
         uses: softprops/action-gh-release@v1
         with:
-          tag_name: "v${{ needs.build_upload.outputs.version }}"
-          body_path: release-notes.txt
+          tag_name: "v${{ env.TAG_NAME }}"
+          body_path: ${{ env.RELEASE_NOTES }}
           files: |
-            release-notes.txt
+            ${{ env.RELEASE_NOTES }}
diff --git a/fastlane/Gymfile b/fastlane/Gymfile
index 9ccb96f6..7807ec4e 100644
--- a/fastlane/Gymfile
+++ b/fastlane/Gymfile
@@ -17,3 +17,5 @@ skip_profile_detection true
 build_path "build"
 derived_data_path "build/derived_data"
 #cloned_source_packages_path "build/sources"
+
+disable_xcpretty true
diff --git a/scripts/ci/release-notes.sh b/scripts/ci/release-notes.sh
new file mode 100755
index 00000000..24da5106
--- /dev/null
+++ b/scripts/ci/release-notes.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+VERSION=$1
+if [[ -z $VERSION ]]; then
+    echo "Must provide version"
+    exit 1
+fi
+
+APP_ROOT="Passepartout/App"
+echo "# App Store"
+echo
+grep $VERSION $APP_ROOT/iOS/CHANGELOG.md | cut -f 2- -d " "
+echo
+echo "## iOS"
+echo
+cat $APP_ROOT/iOS/fastlane/metadata/en-US/release_notes.txt
+echo "## macOS"
+echo
+cat $APP_ROOT/macOS/fastlane/metadata/en-US/release_notes.txt