diff --git a/Config/Common-Debug.xcconfig b/Config/Common-Debug.xcconfig
index 075fe8cd1..2e9acf8cf 100644
--- a/Config/Common-Debug.xcconfig
+++ b/Config/Common-Debug.xcconfig
@@ -32,3 +32,8 @@ GCC_DYNAMIC_NO_PIC = NO
 GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited)
 GCC_SYMBOLS_PRIVATE_EXTERN = NO
 
+
+// Code signing: Use the development team for all targets
+CODE_SIGN_IDENTITY = iPhone Developer
+CODE_SIGN_STYLE = Automatic
+PROVISIONING_PROFILE_SPECIFIER = ""
diff --git a/Config/Common-Release.xcconfig b/Config/Common-Release.xcconfig
index fe28e299c..c4b293791 100644
--- a/Config/Common-Release.xcconfig
+++ b/Config/Common-Release.xcconfig
@@ -25,3 +25,8 @@ MTL_ENABLE_DEBUG_INFO = NO
 VALIDATE_PRODUCT = YES
 
 SWIFT_COMPILATION_MODE = wholemodule
+
+
+// Code signing: Manual
+CODE_SIGN_IDENTITY = iPhone Distribution
+CODE_SIGN_STYLE = Manual
diff --git a/Riot/SupportingFiles/App-Release.xcconfig b/Riot/SupportingFiles/App-Release.xcconfig
index a77cca00e..d6e460093 100644
--- a/Riot/SupportingFiles/App-Release.xcconfig
+++ b/Riot/SupportingFiles/App-Release.xcconfig
@@ -19,3 +19,6 @@
 
 #include "App-Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-Riot/Pods-RiotPods-Riot.release.xcconfig"
+
+PROVISIONING_PROFILE = $(RIOT_PROVISIONING_PROFILE)
+PROVISIONING_PROFILE_SPECIFIER = $(RIOT_PROVISIONING_PROFILE_SPECIFIER)
\ No newline at end of file
diff --git a/RiotNSE/NSE-Release.xcconfig b/RiotNSE/NSE-Release.xcconfig
index 492ce2dce..4034dd2fe 100644
--- a/RiotNSE/NSE-Release.xcconfig
+++ b/RiotNSE/NSE-Release.xcconfig
@@ -19,3 +19,8 @@
 
 #include "NSE-Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-RiotNSE/Pods-RiotPods-RiotNSE.release.xcconfig"
+
+PROVISIONING_PROFILE = $(NSE_PROVISIONING_PROFILE)
+PROVISIONING_PROFILE_SPECIFIER = $(NSE_PROVISIONING_PROFILE_SPECIFIER)
+
+COPY_PHASE_STRIP = NO
diff --git a/RiotShareExtension/SupportingFiles/ShareExtension-Release.xcconfig b/RiotShareExtension/SupportingFiles/ShareExtension-Release.xcconfig
index 6686c428b..87d49eb37 100644
--- a/RiotShareExtension/SupportingFiles/ShareExtension-Release.xcconfig
+++ b/RiotShareExtension/SupportingFiles/ShareExtension-Release.xcconfig
@@ -19,3 +19,8 @@
 
 #include "ShareExtension-Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-RiotShareExtension/Pods-RiotPods-RiotShareExtension.release.xcconfig"
+
+PROVISIONING_PROFILE = $(SHARE_EXTENSION_PROVISIONING_PROFILE)
+PROVISIONING_PROFILE_SPECIFIER = $(SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER)
+
+COPY_PHASE_STRIP: NO
diff --git a/SiriIntents/SiriIntents-Release.xcconfig b/SiriIntents/SiriIntents-Release.xcconfig
index 2813a727a..ad28a26e5 100644
--- a/SiriIntents/SiriIntents-Release.xcconfig
+++ b/SiriIntents/SiriIntents-Release.xcconfig
@@ -19,3 +19,8 @@
 
 #include "SiriIntents-Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-SiriIntents/Pods-RiotPods-SiriIntents.release.xcconfig"
+
+PROVISIONING_PROFILE = $(SIRI_INTENTS_PROVISIONING_PROFILE)
+PROVISIONING_PROFILE_SPECIFIER = $(SIRI_INTENTS_PROVISIONING_PROFILE_SPECIFIER)
+
+COPY_PHASE_STRIP: NO
diff --git a/Targets/Application.yml b/Targets/Application.yml
index a4f2dde28..2bdb9b1b6 100644
--- a/Targets/Application.yml
+++ b/Targets/Application.yml
@@ -38,20 +38,6 @@ targets:
     configFiles:
       Debug: ../Riot/SupportingFiles/App-Debug.xcconfig
       Release: ../Riot/SupportingFiles/App-Release.xcconfig
-      
-    settings:
-      base:
-      configs:
-        Debug:
-          CODE_SIGN_IDENTITY: iPhone Developer
-          CODE_SIGN_IDENTITY[sdk=iphoneos*]: iPhone Developer
-          CODE_SIGN_STYLE: Automatic
-          PROVISIONING_PROFILE_SPECIFIER: 
-        Release:
-          CODE_SIGN_IDENTITY: iPhone Distribution
-          CODE_SIGN_STYLE: Manual
-          PROVISIONING_PROFILE: $(RIOT_PROVISIONING_PROFILE)
-          PROVISIONING_PROFILE_SPECIFIER: $(RIOT_PROVISIONING_PROFILE_SPECIFIER)
 
     preBuildScripts:
     - name: ⚠️ SwiftLint
@@ -80,6 +66,7 @@ targets:
         - "**/*.strings" # Exclude all strings files
 
     # Add separately localizable files
+    # Once a language has enough translations (>80%), it must be declared here
     - path: ../Riot/Assets/en.lproj/InfoPlist.strings
     - path: ../Riot/Assets/en.lproj/Localizable.strings
     - path: ../Riot/Assets/en.lproj/Vector.strings
diff --git a/Targets/ApplicationTests.yml b/Targets/ApplicationTests.yml
index afc79f96a..259385708 100644
--- a/Targets/ApplicationTests.yml
+++ b/Targets/ApplicationTests.yml
@@ -36,7 +36,6 @@ targets:
     settings:
       base:
         BUNDLE_LOADER: $(TEST_HOST)
-        CODE_SIGN_STYLE: Manual
         FRAMEWORK_SEARCH_PATHS: $(SDKROOT)/Developer/Library/Frameworks $(inherited)
         INFOPLIST_FILE: RiotTests/Info.plist
         LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/Frameworks @loader_path/Frameworks
diff --git a/Targets/NotificationServiceExtension.yml b/Targets/NotificationServiceExtension.yml
index 17636a6f8..82d661520 100644
--- a/Targets/NotificationServiceExtension.yml
+++ b/Targets/NotificationServiceExtension.yml
@@ -34,20 +34,6 @@ targets:
     configFiles:
       Debug: ../RiotNSE/NSE-Debug.xcconfig
       Release: ../RiotNSE/NSE-Release.xcconfig
-
-    settings:
-      base:
-      configs:
-        Debug:
-          CODE_SIGN_IDENTITY: iPhone Developer
-          CODE_SIGN_STYLE: Automatic
-          PROVISIONING_PROFILE_SPECIFIER: ""
-        Release:
-          CODE_SIGN_IDENTITY: iPhone Distribution
-          CODE_SIGN_STYLE: Manual
-          COPY_PHASE_STRIP: NO
-          PROVISIONING_PROFILE: $(NSE_PROVISIONING_PROFILE)
-          PROVISIONING_PROFILE_SPECIFIER: $(NSE_PROVISIONING_PROFILE_SPECIFIER)
   
     postbuildScripts:
     - name: Embed Precompiled Frameworks
diff --git a/Targets/ShareExtension.yml b/Targets/ShareExtension.yml
index 147303723..e42ca41db 100644
--- a/Targets/ShareExtension.yml
+++ b/Targets/ShareExtension.yml
@@ -35,20 +35,6 @@ targets:
       Debug: ../RiotShareExtension/SupportingFiles/ShareExtension-Debug.xcconfig
       Release: ../RiotShareExtension/SupportingFiles/ShareExtension-Release.xcconfig
 
-    settings:
-      base:
-      configs:
-        Debug:
-          CODE_SIGN_IDENTITY: iPhone Developer
-          CODE_SIGN_STYLE: Automatic
-          PROVISIONING_PROFILE_SPECIFIER: ""
-        Release:
-          CODE_SIGN_IDENTITY: iPhone Distribution
-          CODE_SIGN_STYLE: Manual
-          COPY_PHASE_STRIP: NO
-          PROVISIONING_PROFILE: $(SHARE_EXTENSION_PROVISIONING_PROFILE)
-          PROVISIONING_PROFILE_SPECIFIER: $(SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER)
-
     postbuildScripts:
     - name: Embed Precompiled Frameworks
       runOnlyWhenInstalling: false
diff --git a/Targets/SiriIntents.yml b/Targets/SiriIntents.yml
index 938486495..343b6a60a 100644
--- a/Targets/SiriIntents.yml
+++ b/Targets/SiriIntents.yml
@@ -38,20 +38,6 @@ targets:
       Debug: ../SiriIntents/SiriIntents-Debug.xcconfig
       Release: ../SiriIntents/SiriIntents-Release.xcconfig
 
-    settings:
-      base:
-      configs:
-        Debug:
-          CODE_SIGN_IDENTITY: iPhone Developer
-          CODE_SIGN_STYLE: Automatic
-          PROVISIONING_PROFILE_SPECIFIER: ""
-        Release:
-          CODE_SIGN_IDENTITY: iPhone Distribution
-          CODE_SIGN_STYLE: Manual
-          COPY_PHASE_STRIP: NO
-          PROVISIONING_PROFILE: $(SIRI_INTENTS_PROVISIONING_PROFILE)
-          PROVISIONING_PROFILE_SPECIFIER: $(SIRI_INTENTS_PROVISIONING_PROFILE_SPECIFIER)
-
     postbuildScripts:
     - name: Embed Precompiled Frameworks
       runOnlyWhenInstalling: false