diff --git a/.travis.yml b/.travis.yml
index 887af893..7de936b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,27 +4,29 @@ xcode_scheme: MacPass
 language: objective-c
 
 before_install:
-- carthage bootstrap --platform Mac
+  - carthage bootstrap --platform Mac
 
-script: xcodebuild clean && xcodebuild build -configuration release -project MacPass.xcodeproj -scheme MacPass CODE_SIGNING_REQUIRED=NO
+before_depoly:
+  - zip -9r MacPass-continuous.zip ./build/Build/Products/Release/MacPass.app
 
-after_success:
-  - zip -9 build/MacPass.app MacPass-continous.zip
-  - wget -c https://github.com/MacPass/uploadtool/raw/master/upload.sh
-  - bash ./upload.sh build/*
+script: xcodebuild clean && xcodebuild build -configuration release -project MacPass.xcodeproj -scheme MacPass CODE_SIGNING_REQUIRED=NO -derivedDataPath ./build
+
+#after_success:
+#  - zip -9r ./build/Build/Products/Release/MacPass.app MacPass-continuous.zip
+#  - wget -c https://github.com/MacPass/uploadtool/raw/master/upload.sh
+#  - bash ./upload.sh build/*
   
 branches:
   except:
-    - # Do not build tags that we create when we upload to GitHub Releases
     - /^(?i:continuous)$/
 
-# deploy:
-#   skip_cleanup: true
-#   provider: releases
-#   api_key:
-#     secure: AEb7fgi29S3aXFt5bXz+lq1KHISumny6bf4j06JBC5gUrSs+dW0/tmVFq68XRAqigeOQU31wwv20f7OHiy+GRYDXM2xBsX9ZBQ2IilnaXlDy/mPsNcJJJsZ2gyodi3KnU0rZtTb93me2YyU86H4Na/gtaZZUKjLwCFtGGziExD8=
-#   file: MacPass.zip
-#   on:
-#     tags: true
-#     repo: mstarke/MacPass
-#     branch: continuous
\ No newline at end of file
+deploy:
+  skip_cleanup: true
+  provider: releases
+  api_key:
+    secure: AEb7fgi29S3aXFt5bXz+lq1KHISumny6bf4j06JBC5gUrSs+dW0/tmVFq68XRAqigeOQU31wwv20f7OHiy+GRYDXM2xBsX9ZBQ2IilnaXlDy/mPsNcJJJsZ2gyodi3KnU0rZtTb93me2YyU86H4Na/gtaZZUKjLwCFtGGziExD8=
+  file: MacPass-continuous.zip
+  on:
+    tags: true
+    repo: mstarke/MacPass
+    branch: continuous
\ No newline at end of file
diff --git a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
index 9ddbc86e..1d0b4252 100644
--- a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
+++ b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
@@ -67,7 +67,6 @@
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
-      enableAddressSanitizer = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable