diff --git a/Config/Common.xcconfig b/Config/Common.xcconfig
index 26ba72d5a..13843cffc 100644
--- a/Config/Common.xcconfig
+++ b/Config/Common.xcconfig
@@ -20,3 +20,5 @@
 BUNDLE_DISPLAY_NAME = Element (Riot.im)
 
 APPLICATION_GROUP_IDENTIFIER = group.im.vector
+
+BASE_BUNDLE_IDENTIFIER = im.vector.app
diff --git a/Riot.xcodeproj/project.pbxproj b/Riot.xcodeproj/project.pbxproj
index 94ffd7844..93f3ab51f 100644
--- a/Riot.xcodeproj/project.pbxproj
+++ b/Riot.xcodeproj/project.pbxproj
@@ -759,6 +759,10 @@
 		EC1CA89C24C9C9A200DE9EBF /* SetupBiometricsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC1CA89424C9C9A200DE9EBF /* SetupBiometricsViewModel.swift */; };
 		EC1CA8C824D3160100DE9EBF /* Row.m in Sources */ = {isa = PBXBuildFile; fileRef = EC1CA8C724D3160100DE9EBF /* Row.m */; };
 		EC1CA8CB24D3168F00DE9EBF /* Section.m in Sources */ = {isa = PBXBuildFile; fileRef = EC1CA8CA24D3168F00DE9EBF /* Section.m */; };
+		EC1CA8D424D8103400DE9EBF /* App-Common.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = EC1CA8D324D8103400DE9EBF /* App-Common.xcconfig */; };
+		EC1CA8D624D8108700DE9EBF /* ShareExtension-Common.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = EC1CA8D524D8108700DE9EBF /* ShareExtension-Common.xcconfig */; };
+		EC1CA8D824D8118400DE9EBF /* SiriIntents-Common.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = EC1CA8D724D8118400DE9EBF /* SiriIntents-Common.xcconfig */; };
+		EC1CA8DA24D811B400DE9EBF /* NSE-Common.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = EC1CA8D924D811B400DE9EBF /* NSE-Common.xcconfig */; };
 		EC2B4EF124A1EEBD005EB739 /* DataProtectionHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC2B4EF024A1EEBD005EB739 /* DataProtectionHelper.swift */; };
 		EC2B4EF224A1EF34005EB739 /* DataProtectionHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC2B4EF024A1EEBD005EB739 /* DataProtectionHelper.swift */; };
 		EC3B066924AC6ADE000DF9BF /* CrossSigningService.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC3B066424AC6ADD000DF9BF /* CrossSigningService.swift */; };
@@ -1885,6 +1889,10 @@
 		EC1CA8C724D3160100DE9EBF /* Row.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Row.m; sourceTree = "<group>"; };
 		EC1CA8C924D3168F00DE9EBF /* Section.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Section.h; sourceTree = "<group>"; };
 		EC1CA8CA24D3168F00DE9EBF /* Section.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Section.m; sourceTree = "<group>"; };
+		EC1CA8D324D8103400DE9EBF /* App-Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "App-Common.xcconfig"; sourceTree = "<group>"; };
+		EC1CA8D524D8108700DE9EBF /* ShareExtension-Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "ShareExtension-Common.xcconfig"; sourceTree = "<group>"; };
+		EC1CA8D724D8118400DE9EBF /* SiriIntents-Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "SiriIntents-Common.xcconfig"; sourceTree = "<group>"; };
+		EC1CA8D924D811B400DE9EBF /* NSE-Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "NSE-Common.xcconfig"; sourceTree = "<group>"; };
 		EC2B4EF024A1EEBD005EB739 /* DataProtectionHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataProtectionHelper.swift; sourceTree = "<group>"; };
 		EC3B066424AC6ADD000DF9BF /* CrossSigningService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrossSigningService.swift; sourceTree = "<group>"; };
 		EC3B066624AC6ADD000DF9BF /* CrossSigningSetupBannerCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CrossSigningSetupBannerCell.xib; sourceTree = "<group>"; };
@@ -2461,6 +2469,7 @@
 				92726A451F58737A004AD26F /* IntentHandler.h */,
 				92726A461F58737A004AD26F /* IntentHandler.m */,
 				92726A481F58737A004AD26F /* Info.plist */,
+				EC1CA8D724D8118400DE9EBF /* SiriIntents-Common.xcconfig */,
 				EC1CA8BB24D1B4BF00DE9EBF /* SiriIntents-Debug.xcconfig */,
 				EC1CA8BA24D1B4BF00DE9EBF /* SiriIntents-Release.xcconfig */,
 			);
@@ -2821,6 +2830,7 @@
 				B1664BD120F4E82700808783 /* RiotShareExtension-Bridging-Header.h */,
 				B1664BD220F4E82800808783 /* RiotShareExtension.entitlements */,
 				B1664BD320F4E82800808783 /* Info.plist */,
+				EC1CA8D524D8108700DE9EBF /* ShareExtension-Common.xcconfig */,
 				EC1CA8B824D1AD1600DE9EBF /* ShareExtension-Debug.xcconfig */,
 				EC1CA8B924D1AD1600DE9EBF /* ShareExtension-Release.xcconfig */,
 			);
@@ -2845,6 +2855,7 @@
 				B16932A020F3A21B00746532 /* Riot.entitlements */,
 				B16932A120F3A21B00746532 /* Info.plist */,
 				B16932A220F3A21B00746532 /* empty.mm */,
+				EC1CA8D324D8103400DE9EBF /* App-Common.xcconfig */,
 				EC1CA8B424D1AA8700DE9EBF /* App-Debug.xcconfig */,
 				EC1CA8B624D1AA8D00DE9EBF /* App-Release.xcconfig */,
 			);
@@ -4850,6 +4861,7 @@
 				EC85D7452477E5F7002C44C9 /* NotificationService.swift */,
 				EC85D756247E700F002C44C9 /* NSEMemoryStore.swift */,
 				EC85D7472477E5F7002C44C9 /* Info.plist */,
+				EC1CA8D924D811B400DE9EBF /* NSE-Common.xcconfig */,
 				EC1CA8BC24D1B4CF00DE9EBF /* NSE-Debug.xcconfig */,
 				EC1CA8BD24D1B4CF00DE9EBF /* NSE-Release.xcconfig */,
 			);
@@ -5254,6 +5266,7 @@
 				B1664BCB20F4E67600808783 /* RoomsListViewController.xib in Resources */,
 				B169328520F38BE800746532 /* SegmentedViewController.xib in Resources */,
 				B1664DA420F4F96300808783 /* Vector.strings in Resources */,
+				EC1CA8D624D8108700DE9EBF /* ShareExtension-Common.xcconfig in Resources */,
 				B1664BC920F4E67600808783 /* ShareViewController.xib in Resources */,
 				B169328820F3954A00746532 /* SharedImages.xcassets in Resources */,
 				B1664BC520F4E67600808783 /* FallbackViewController.xib in Resources */,
@@ -5265,6 +5278,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				EC1CA8D824D8118400DE9EBF /* SiriIntents-Common.xcconfig in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5272,6 +5286,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				EC1CA8DA24D811B400DE9EBF /* NSE-Common.xcconfig in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5448,6 +5463,7 @@
 				B1C562E5228C7C8D0037F12A /* RoomContextualMenuViewController.storyboard in Resources */,
 				3232ABA2225730E100AD6A5C /* DeviceVerificationStartViewController.storyboard in Resources */,
 				3284A35120A07C210044F922 /* postMessageAPI.js in Resources */,
+				EC1CA8D424D8103400DE9EBF /* App-Common.xcconfig in Resources */,
 				B1B557A220EF58AD00210D55 /* ContactTableViewCell.xib in Resources */,
 				B1B558EB20EF768F00210D55 /* RoomIncomingTextMsgWithPaginationTitleBubbleCell.xib in Resources */,
 				B1C543A6239E999700DCA1FA /* KeyVerificationCellInnerContentView.xib in Resources */,
diff --git a/Riot/SupportingFiles/App-Common.xcconfig b/Riot/SupportingFiles/App-Common.xcconfig
new file mode 100644
index 000000000..7f45a3e58
--- /dev/null
+++ b/Riot/SupportingFiles/App-Common.xcconfig
@@ -0,0 +1,22 @@
+// 
+// Copyright 2020 Vector Creations Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Configuration settings file format documentation can be found at:
+// https://help.apple.com/xcode/#/dev745c5c974
+
+#include "Config/Common.xcconfig"
+
+PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER)
diff --git a/Riot/SupportingFiles/App-Debug.xcconfig b/Riot/SupportingFiles/App-Debug.xcconfig
index cb43ef2f1..59aa4f856 100644
--- a/Riot/SupportingFiles/App-Debug.xcconfig
+++ b/Riot/SupportingFiles/App-Debug.xcconfig
@@ -17,5 +17,5 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "Config/Common.xcconfig"
+#include "App-Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-Riot/Pods-RiotPods-Riot.debug.xcconfig"
diff --git a/Riot/SupportingFiles/App-Release.xcconfig b/Riot/SupportingFiles/App-Release.xcconfig
index 630e4b085..a77cca00e 100644
--- a/Riot/SupportingFiles/App-Release.xcconfig
+++ b/Riot/SupportingFiles/App-Release.xcconfig
@@ -17,5 +17,5 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "Config/Common.xcconfig"
+#include "App-Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-Riot/Pods-RiotPods-Riot.release.xcconfig"
diff --git a/RiotNSE/NSE-Common.xcconfig b/RiotNSE/NSE-Common.xcconfig
new file mode 100644
index 000000000..9e860eeb0
--- /dev/null
+++ b/RiotNSE/NSE-Common.xcconfig
@@ -0,0 +1,22 @@
+// 
+// Copyright 2020 Vector Creations Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Configuration settings file format documentation can be found at:
+// https://help.apple.com/xcode/#/dev745c5c974
+
+#include "Config/Common.xcconfig"
+
+PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).nse
diff --git a/RiotNSE/NSE-Debug.xcconfig b/RiotNSE/NSE-Debug.xcconfig
index 929ff1eca..ed107513c 100644
--- a/RiotNSE/NSE-Debug.xcconfig
+++ b/RiotNSE/NSE-Debug.xcconfig
@@ -17,5 +17,5 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "Config/Common.xcconfig"
+#include "NSE-Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-RiotNSE/Pods-RiotPods-RiotNSE.debug.xcconfig"
diff --git a/RiotNSE/NSE-Release.xcconfig b/RiotNSE/NSE-Release.xcconfig
index a34f1ee99..492ce2dce 100644
--- a/RiotNSE/NSE-Release.xcconfig
+++ b/RiotNSE/NSE-Release.xcconfig
@@ -17,5 +17,5 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "Config/Common.xcconfig"
+#include "NSE-Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-RiotNSE/Pods-RiotPods-RiotNSE.release.xcconfig"
diff --git a/RiotShareExtension/SupportingFiles/ShareExtension-Common.xcconfig b/RiotShareExtension/SupportingFiles/ShareExtension-Common.xcconfig
new file mode 100644
index 000000000..5170b8e60
--- /dev/null
+++ b/RiotShareExtension/SupportingFiles/ShareExtension-Common.xcconfig
@@ -0,0 +1,22 @@
+// 
+// Copyright 2020 Vector Creations Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Configuration settings file format documentation can be found at:
+// https://help.apple.com/xcode/#/dev745c5c974
+
+#include "Config/Common.xcconfig"
+
+PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).shareExtension
diff --git a/RiotShareExtension/SupportingFiles/ShareExtension-Debug.xcconfig b/RiotShareExtension/SupportingFiles/ShareExtension-Debug.xcconfig
index fed79e843..9a6a0132c 100644
--- a/RiotShareExtension/SupportingFiles/ShareExtension-Debug.xcconfig
+++ b/RiotShareExtension/SupportingFiles/ShareExtension-Debug.xcconfig
@@ -17,5 +17,5 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "Config/Common.xcconfig"
+#include "ShareExtension-Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-RiotShareExtension/Pods-RiotPods-RiotShareExtension.debug.xcconfig"
diff --git a/RiotShareExtension/SupportingFiles/ShareExtension-Release.xcconfig b/RiotShareExtension/SupportingFiles/ShareExtension-Release.xcconfig
index 4576bef67..6686c428b 100644
--- a/RiotShareExtension/SupportingFiles/ShareExtension-Release.xcconfig
+++ b/RiotShareExtension/SupportingFiles/ShareExtension-Release.xcconfig
@@ -17,5 +17,5 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "Config/Common.xcconfig"
+#include "ShareExtension-Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-RiotShareExtension/Pods-RiotPods-RiotShareExtension.release.xcconfig"
diff --git a/SiriIntents/SiriIntents-Common.xcconfig b/SiriIntents/SiriIntents-Common.xcconfig
new file mode 100644
index 000000000..c41fa4e80
--- /dev/null
+++ b/SiriIntents/SiriIntents-Common.xcconfig
@@ -0,0 +1,22 @@
+// 
+// Copyright 2020 Vector Creations Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Configuration settings file format documentation can be found at:
+// https://help.apple.com/xcode/#/dev745c5c974
+
+#include "Config/Common.xcconfig"
+
+PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).SiriIntents
diff --git a/SiriIntents/SiriIntents-Debug.xcconfig b/SiriIntents/SiriIntents-Debug.xcconfig
index de95ec9d4..d0c6ee7b2 100644
--- a/SiriIntents/SiriIntents-Debug.xcconfig
+++ b/SiriIntents/SiriIntents-Debug.xcconfig
@@ -17,5 +17,5 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "Config/Common.xcconfig"
+#include "SiriIntents-Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-SiriIntents/Pods-RiotPods-SiriIntents.debug.xcconfig"
diff --git a/SiriIntents/SiriIntents-Release.xcconfig b/SiriIntents/SiriIntents-Release.xcconfig
index cad71edf4..2813a727a 100644
--- a/SiriIntents/SiriIntents-Release.xcconfig
+++ b/SiriIntents/SiriIntents-Release.xcconfig
@@ -17,5 +17,5 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "Config/Common.xcconfig"
+#include "SiriIntents-Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-SiriIntents/Pods-RiotPods-SiriIntents.release.xcconfig"