diff --git a/Riot/SupportingFiles/App-Common.xcconfig b/Riot/SupportingFiles/App-Common.xcconfig
index c98f36b18..94664c299 100644
--- a/Riot/SupportingFiles/App-Common.xcconfig
+++ b/Riot/SupportingFiles/App-Common.xcconfig
@@ -20,4 +20,13 @@
 #include "Config/AppIdentifiers.xcconfig"
 #include "Config/Common.xcconfig"
 
+PRODUCT_NAME = Riot
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER)
+
+INFOPLIST_FILE = Riot/SupportingFiles/Info.plist
+ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
+
+CODE_SIGN_ENTITLEMENTS = Riot/SupportingFiles/Riot.entitlements
+
+SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/Riot-Bridging-Header.h
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks
diff --git a/RiotNSE/NSE-Common.xcconfig b/RiotNSE/NSE-Common.xcconfig
index 3e735fd43..a0cfda5a6 100644
--- a/RiotNSE/NSE-Common.xcconfig
+++ b/RiotNSE/NSE-Common.xcconfig
@@ -20,4 +20,11 @@
 #include "Config/AppIdentifiers.xcconfig"
 #include "Config/Common.xcconfig"
 
+PRODUCT_NAME = RiotNSE
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).nse
+
+INFOPLIST_FILE = RiotNSE/Info.plist
+
+CODE_SIGN_ENTITLEMENTS = RiotNSE/RiotNSE.entitlements
+
+SKIP_INSTALL = YES
diff --git a/RiotShareExtension/SupportingFiles/ShareExtension-Common.xcconfig b/RiotShareExtension/SupportingFiles/ShareExtension-Common.xcconfig
index e565324f0..9e1a9baee 100644
--- a/RiotShareExtension/SupportingFiles/ShareExtension-Common.xcconfig
+++ b/RiotShareExtension/SupportingFiles/ShareExtension-Common.xcconfig
@@ -20,4 +20,16 @@
 #include "Config/AppIdentifiers.xcconfig"
 #include "Config/Common.xcconfig"
 
+PRODUCT_NAME = RiotShareExtension
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).shareExtension
+
+INFOPLIST_FILE = RiotShareExtension/SupportingFiles/Info.plist
+ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
+
+CODE_SIGN_ENTITLEMENTS = RiotShareExtension/SupportingFiles/RiotShareExtension.entitlements
+        
+APPLICATION_EXTENSION_API_ONLY = YES
+SKIP_INSTALL = YES
+SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/RiotShareExtension-Bridging-Header.h
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) IS_SHARE_EXTENSION=1
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
diff --git a/SiriIntents/SiriIntents-Common.xcconfig b/SiriIntents/SiriIntents-Common.xcconfig
index 44c917038..3197ce2ec 100644
--- a/SiriIntents/SiriIntents-Common.xcconfig
+++ b/SiriIntents/SiriIntents-Common.xcconfig
@@ -20,4 +20,12 @@
 #include "Config/AppIdentifiers.xcconfig"
 #include "Config/Common.xcconfig"
 
+PRODUCT_NAME=  SiriIntents
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).SiriIntents
+
+INFOPLIST_FILE = SiriIntents/Info.plist
+
+CODE_SIGN_ENTITLEMENTS = SiriIntents/SiriIntents.entitlements
+
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks    
+SKIP_INSTALL = YES
diff --git a/Targets/Application.yml b/Targets/Application.yml
index 4f58c73d4..a4f2dde28 100644
--- a/Targets/Application.yml
+++ b/Targets/Application.yml
@@ -41,14 +41,6 @@ targets:
       
     settings:
       base:
-        ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
-        CODE_SIGN_ENTITLEMENTS: Riot/SupportingFiles/Riot.entitlements
-        INFOPLIST_FILE: Riot/SupportingFiles/Info.plist
-        LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/Frameworks
-        PRODUCT_BUNDLE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER)
-        PRODUCT_NAME: Riot
-        SWIFT_OBJC_BRIDGING_HEADER: $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/Riot-Bridging-Header.h
-
       configs:
         Debug:
           CODE_SIGN_IDENTITY: iPhone Developer
diff --git a/Targets/NotificationServiceExtension.yml b/Targets/NotificationServiceExtension.yml
index 9bea6e959..17636a6f8 100644
--- a/Targets/NotificationServiceExtension.yml
+++ b/Targets/NotificationServiceExtension.yml
@@ -37,11 +37,6 @@ targets:
 
     settings:
       base:
-        CODE_SIGN_ENTITLEMENTS: RiotNSE/RiotNSE.entitlements
-        INFOPLIST_FILE: RiotNSE/Info.plist
-        PRODUCT_BUNDLE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER).nse
-        PRODUCT_NAME: RiotNSE
-        SKIP_INSTALL: YES
       configs:
         Debug:
           CODE_SIGN_IDENTITY: iPhone Developer
diff --git a/Targets/ShareExtension.yml b/Targets/ShareExtension.yml
index daff48487..147303723 100644
--- a/Targets/ShareExtension.yml
+++ b/Targets/ShareExtension.yml
@@ -37,16 +37,6 @@ targets:
 
     settings:
       base:
-        APPLICATION_EXTENSION_API_ONLY: YES
-        ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
-        CODE_SIGN_ENTITLEMENTS: RiotShareExtension/SupportingFiles/RiotShareExtension.entitlements
-        GCC_PREPROCESSOR_DEFINITIONS: $(inherited) IS_SHARE_EXTENSION=1
-        INFOPLIST_FILE: RiotShareExtension/SupportingFiles/Info.plist
-        LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
-        PRODUCT_NAME: RiotShareExtension
-        SKIP_INSTALL: YES
-        SWIFT_OBJC_BRIDGING_HEADER: $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/RiotShareExtension-Bridging-Header.h
-        PRODUCT_BUNDLE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER).shareExtension
       configs:
         Debug:
           CODE_SIGN_IDENTITY: iPhone Developer
diff --git a/Targets/SiriIntents.yml b/Targets/SiriIntents.yml
index 1e18cdab8..938486495 100644
--- a/Targets/SiriIntents.yml
+++ b/Targets/SiriIntents.yml
@@ -40,12 +40,6 @@ targets:
 
     settings:
       base:
-        CODE_SIGN_ENTITLEMENTS: SiriIntents/SiriIntents.entitlements
-        INFOPLIST_FILE: SiriIntents/Info.plist
-        LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
-        PRODUCT_BUNDLE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER).SiriIntents
-        PRODUCT_NAME: SiriIntents
-        SKIP_INSTALL: YES
       configs:
         Debug:
           CODE_SIGN_IDENTITY: iPhone Developer