diff --git a/.env.ios b/.env.ios
index 7cb4f0a1..c3a86450 100644
--- a/.env.ios
+++ b/.env.ios
@@ -1,6 +1,7 @@
 INFO_PLIST_ROOT="Passepartout/App"
 MATCH_PLATFORM="ios"
 GYM_SCHEME="Passepartout"
+GYM_DESTINATION="generic/platform=iOS"
 DELIVER_PLATFORM="ios"
 DELIVER_METADATA_PATH="Passepartout/App/fastlane/ios/metadata"
 DELIVER_SCREENSHOTS_PATH="Passepartout/App/fastlane/ios/screenshots"
diff --git a/.env.mac b/.env.mac
index 46aa9771..04f3ccfc 100644
--- a/.env.mac
+++ b/.env.mac
@@ -3,6 +3,7 @@ MATCH_PLATFORM="catalyst"
 MATCH_ADDITIONAL_CERT_TYPES="mac_installer_distribution"
 GYM_SCHEME="Passepartout"
 GYM_CATALYST_PLATFORM="macos"
+GYM_DESTINATION="generic/platform=macOS"
 DELIVER_PLATFORM="osx"
 DELIVER_METADATA_PATH="Passepartout/App/fastlane/mac/metadata"
 DELIVER_SCREENSHOTS_PATH="Passepartout/App/fastlane/mac/screenshots"
diff --git a/.env.tvos b/.env.tvos
index fa06c784..4a19050b 100644
--- a/.env.tvos
+++ b/.env.tvos
@@ -1,6 +1,7 @@
 INFO_PLIST_ROOT="Passepartout/App"
 MATCH_PLATFORM="tvos"
 GYM_SCHEME="Passepartout"
+GYM_DESTINATION="generic/platform=tvOS"
 DELIVER_PLATFORM="appletvos"
 DELIVER_METADATA_PATH="Passepartout/App/fastlane/tvos/metadata"
 DELIVER_SCREENSHOTS_PATH="Passepartout/App/fastlane/tvos/screenshots"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6e558ac9..e6d72f60 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -85,10 +85,10 @@ jobs:
           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"
-          else
+          if [ $PLATFORM == "mac" ]; then
             export PILOT_PKG="$GYM_OUTPUT_DIRECTORY/Passepartout.pkg"
+          else
+            export PILOT_IPA="$GYM_OUTPUT_DIRECTORY/Passepartout.ipa"
           fi
           export PILOT_CHANGELOG=`ci/build-changelog.sh $PLATFORM`
           bundle exec fastlane --env $PLATFORM,beta run pilot