diff --git a/CHANGELOG.md b/CHANGELOG.md
index b96346c93..41883ccc9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - Can access embed frameworks build phase for a target by @llinardos.
 - Added `com.apple.product-type.framework.static` to `PBXProductType`. https://github.com/tuist/xcodeproj/pull/347 by @ileitch.
 - Can add a not existing file to a group https://github.com/tuist/xcodeproj/pull/418 by @llinardos.
+- **Breaking** Add `SWIFT_COMPILATION_MODE` and `CODE_SIGN_IDENTITY` build settings, remove `DEBUG` flag for Release https://github.com/tuist/xcodeproj/pull/417 @dangthaison91 
 
 ### Fixed
 
diff --git a/Sources/xcodeproj/Utils/BuildSettingsProvider.swift b/Sources/xcodeproj/Utils/BuildSettingsProvider.swift
index 1f4b3b6b8..d25b9f3a4 100644
--- a/Sources/xcodeproj/Utils/BuildSettingsProvider.swift
+++ b/Sources/xcodeproj/Utils/BuildSettingsProvider.swift
@@ -45,8 +45,8 @@ public class BuildSettingsProvider {
         var buildSettings: [String: Any] = [:]
         if let platform = platform, platform == .iOS {
             buildSettings["SDKROOT"] = "iphoneos"
-            buildSettings["CODE_SIGN_IDENTITY"] = "iPhone Developer"
             buildSettings["LD_RUNPATH_SEARCH_PATHS"] = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"
+            buildSettings["CODE_SIGN_IDENTITY"] = "iPhone Developer"
         }
         if let platform = platform, platform == .macOS {
             buildSettings["SDKROOT"] = "macosx"
@@ -67,10 +67,11 @@ public class BuildSettingsProvider {
         if let variant = variant, let swift = swift, variant == .debug, swift == true {
             buildSettings["SWIFT_OPTIMIZATION_LEVEL"] = "-Onone"
             buildSettings["SWIFT_ACTIVE_COMPILATION_CONDITIONS"] = "DEBUG"
+            buildSettings["SWIFT_COMPILATION_MODE"] = "singlefile"
         }
         if let variant = variant, let swift = swift, variant == .release, swift == true {
             buildSettings["SWIFT_OPTIMIZATION_LEVEL"] = "-Owholemodule"
-            buildSettings["SWIFT_ACTIVE_COMPILATION_CONDITIONS"] = "DEBUG"
+            buildSettings["SWIFT_COMPILATION_MODE"] = "wholemodule"
         }
         if let product = product, product == .framework {
             buildSettings["CODE_SIGN_IDENTITY"] = ""