diff --git a/Configurations/APIKit.xcconfig b/Configurations/APIKit.xcconfig
index 4075d7f1..71014a64 100644
--- a/Configurations/APIKit.xcconfig
+++ b/Configurations/APIKit.xcconfig
@@ -12,6 +12,10 @@ SKIP_INSTALL = YES
 SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator watchos watchsimulator appletvos appletvsimulator
 TARGETED_DEVICE_FAMILY = 1,2,3,4
 
+ENABLE_BITCODE[sdk=iphone*] = YES;
+ENABLE_BITCODE[sdk=watch*] = YES;
+ENABLE_BITCODE[sdk=appletv*] = YES;
+
 LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks
 LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
 LD_RUNPATH_SEARCH_PATHS[sdk=watch*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
diff --git a/Configurations/Debug.xcconfig b/Configurations/Debug.xcconfig
index 118cfeca..28cb543b 100644
--- a/Configurations/Debug.xcconfig
+++ b/Configurations/Debug.xcconfig
@@ -9,7 +9,4 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO
 MTL_ENABLE_DEBUG_INFO = YES
 ONLY_ACTIVE_ARCH = YES
 SWIFT_OPTIMIZATION_LEVEL = -Onone
-
-ENABLE_BITCODE[sdk=iphone*] = NO;
-ENABLE_BITCODE[sdk=watch*] = NO;
-ENABLE_BITCODE[sdk=appletv*] = NO;
\ No newline at end of file
+BITCODE_GENERATION_MODE = marker
diff --git a/Configurations/Release.xcconfig b/Configurations/Release.xcconfig
index 630e2663..9d39672f 100644
--- a/Configurations/Release.xcconfig
+++ b/Configurations/Release.xcconfig
@@ -5,7 +5,4 @@ ENABLE_NS_ASSERTIONS = NO
 MTL_ENABLE_DEBUG_INFO = NO
 VALIDATE_PRODUCT = YES
 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
-
-ENABLE_BITCODE[sdk=iphone*] = YES;
-ENABLE_BITCODE[sdk=watch*] = YES;
-ENABLE_BITCODE[sdk=appletv*] = YES;
\ No newline at end of file
+BITCODE_GENERATION_MODE = bitcode