diff --git a/.env.beta.ios b/.env.beta.ios
index 50742dee..db31d8b0 100644
--- a/.env.beta.ios
+++ b/.env.beta.ios
@@ -1,5 +1,4 @@
 MATCH_TYPE="appstore"
 GYM_EXPORT_METHOD="app-store"
-DELIVER_IPA_PATH="$DIST_PATH/$PLATFORM/$TARGET/$APP_NAME.ipa"
 PILOT_IPA="$DIST_PATH/$PLATFORM/$TARGET/$APP_NAME.ipa"
 PILOT_DISTRIBUTE_EXTERNAL="true"
diff --git a/.env.beta.mac b/.env.beta.mac
index 97232640..ecb58ff2 100644
--- a/.env.beta.mac
+++ b/.env.beta.mac
@@ -1,4 +1,3 @@
 MATCH_TYPE="appstore"
 GYM_EXPORT_METHOD="app-store"
 GYM_SKIP_PACKAGE_PKG="false"
-DELIVER_PKG_PATH="$DIST_PATH/$PLATFORM/$TARGET/$APP_NAME.pkg"
diff --git a/.env.ios b/.env.ios
index c5cc012a..499a66e6 100644
--- a/.env.ios
+++ b/.env.ios
@@ -2,5 +2,4 @@ PLATFORM="ios"
 DELIVER_PLATFORM="ios"
 GYM_SCHEME="Passepartout-iOS"
 BUNDLE_CONTEXT="ios"
-APP_CONTEXT="iOS"
-APP_ROOT="Passepartout/App/$APP_CONTEXT"
+APP_ROOT="Passepartout/App/iOS"
diff --git a/.env.mac b/.env.mac
index 1f43f42b..3a4bd5e5 100644
--- a/.env.mac
+++ b/.env.mac
@@ -2,5 +2,4 @@ PLATFORM="mac"
 DELIVER_PLATFORM="osx"
 GYM_SCHEME="Passepartout-macOS"
 BUNDLE_CONTEXT="macos"
-APP_CONTEXT="macOS"
-APP_ROOT="Passepartout/App/$APP_CONTEXT"
+APP_ROOT="Passepartout/App/macOS"
diff --git a/Submodules/fastlane-ci-templates b/Submodules/fastlane-ci-templates
index 613f18fe..bc83d210 160000
--- a/Submodules/fastlane-ci-templates
+++ b/Submodules/fastlane-ci-templates
@@ -1 +1 @@
-Subproject commit 613f18fe23706a0fe15222ab02c76c4014a8c018
+Subproject commit bc83d210092fb6e18628f57f2eb66f37fdede557
diff --git a/fastlane/Deliverfile b/fastlane/Deliverfile
index 07ded9ed..468bb9ba 100644
--- a/fastlane/Deliverfile
+++ b/fastlane/Deliverfile
@@ -2,8 +2,17 @@
 # For more information, check out the docs
 # https://docs.fastlane.tools/actions/deliver/
 
-screenshots_path "#{ENV['APP_ROOT']}/fastlane/screenshots"
-metadata_path "#{ENV['APP_ROOT']}/fastlane/metadata"
+screenshots_path "#{ENV["APP_ROOT"]}/fastlane/screenshots"
+metadata_path "#{ENV["APP_ROOT"]}/fastlane/metadata"
+
+if not ENV["TARGET"].nil?
+    binary_path = "#{ENV["DIST_PATH"]}/#{ENV["PLATFORM"]}/#{ENV["TARGET"]}"
+    if ENV["PLATFORM"] == "ios"
+        ipa "#{binary_path}/#{ENV["APP_NAME"]}.ipa"
+    else
+        pkg "#{binary_path}/#{ENV["APP_NAME"]}.pkg"
+    end
+end
 
 skip_binary_upload true
 skip_metadata false