diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 957d64fb1..2cba0d392 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -345,9 +345,10 @@ platform :ios do
     update_identifiers
     replace_assets
 
+    sh 'rm -rf ../ios/build/'
     sh 'rm -rf ../build-ios/'
     sh 'cd ../ios/ && xcodebuild -workspace Mattermost.xcworkspace/ -scheme Mattermost -sdk iphoneos -configuration Release -parallelizeTargets -resultBundlePath ../build-ios/result -derivedDataPath ../build-ios/ CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO'
-    sh 'cd ../build-ios/ && mkdir -p Payload && cp -R Build/Products/Release-iphoneos/Mattermost.app Payload/ && zip -r Mattermost-unsigned.ipa Payload/'
+    sh 'cd ../build-ios/ && mkdir -p Payload && cp -R ../ios/Build/Products/Release-iphoneos/Mattermost.app Payload/ && zip -r Mattermost-unsigned.ipa Payload/'
     sh 'mv ../build-ios/Mattermost-unsigned.ipa ../'
     sh 'rm -rf ../build-ios/'
   end
@@ -368,6 +369,7 @@ platform :ios do
       data_path = 'build-ios'
     end
 
+    sh 'rm -rf ../ios/build/'
     sh 'rm -rf ../build-ios/'
     sh 'cd ../ios && xcodebuild -workspace Mattermost.xcworkspace -scheme Mattermost -arch x86_64 -sdk iphonesimulator -configuration Release -parallelizeTargets -derivedDataPath ../build-ios ENABLE_BITCODE=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ENABLE_BITCODE=NO'
     sh "cd ../#{data_path}/Build/Products/Release-iphonesimulator && zip -r Mattermost-simulator-x86_64.app.zip Mattermost.app"