diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index baa17433e3..6f9c06ee46 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -8092,10 +8092,9 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				APP_DISPLAY_NAME = "Element X";
-				APP_GROUP_IDENTIFIER = "group.$(BASE_APP_GROUP_IDENTIFIER)";
+				APP_GROUP_IDENTIFIER = group.io.element;
 				APP_NAME = ElementX;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "colors/accent-color";
-				BASE_APP_GROUP_IDENTIFIER = io.element;
 				BASE_BUNDLE_IDENTIFIER = io.element.elementx;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -8163,10 +8162,9 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				APP_DISPLAY_NAME = "Element X";
-				APP_GROUP_IDENTIFIER = "group.$(BASE_APP_GROUP_IDENTIFIER)";
+				APP_GROUP_IDENTIFIER = group.io.element;
 				APP_NAME = ElementX;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "colors/accent-color";
-				BASE_APP_GROUP_IDENTIFIER = io.element;
 				BASE_BUNDLE_IDENTIFIER = io.element.elementx;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
diff --git a/Enterprise b/Enterprise
index 86e0ea2f41..23bc91faa2 160000
--- a/Enterprise
+++ b/Enterprise
@@ -1 +1 @@
-Subproject commit 86e0ea2f41df809d85ef3b51d8259760e0a4ee2c
+Subproject commit 23bc91faa2c9465051a38051bc8d803c38e389d7
diff --git a/Variants/Alpha/alpha.yml b/Variants/Alpha/alpha.yml
index ae58d83862..dc7a875170 100644
--- a/Variants/Alpha/alpha.yml
+++ b/Variants/Alpha/alpha.yml
@@ -1,5 +1,5 @@
 settings:
-  BASE_APP_GROUP_IDENTIFIER: io.element.pr
+  APP_GROUP_IDENTIFIER: group.io.element.pr
   BASE_BUNDLE_IDENTIFIER: io.element.elementx.pr
 
 targets:
diff --git a/Variants/Nightly/nightly.yml b/Variants/Nightly/nightly.yml
index a8a852f075..572f79c44c 100644
--- a/Variants/Nightly/nightly.yml
+++ b/Variants/Nightly/nightly.yml
@@ -1,5 +1,5 @@
 settings:
-  BASE_APP_GROUP_IDENTIFIER: io.element.nightly
+  APP_GROUP_IDENTIFIER: group.io.element.nightly
   BASE_BUNDLE_IDENTIFIER: io.element.elementx.nightly
 
 targets:
diff --git a/app.yml b/app.yml
index 89deb906e6..7de1f49538 100644
--- a/app.yml
+++ b/app.yml
@@ -1,7 +1,7 @@
 settings:
   APP_DISPLAY_NAME: Element X
   PRODUCTION_APP_NAME: Element
-  BASE_APP_GROUP_IDENTIFIER: io.element
+  APP_GROUP_IDENTIFIER: group.io.element
   BASE_BUNDLE_IDENTIFIER: io.element.elementx
   ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME: "colors/accent-color"
   DEVELOPMENT_TEAM: 7J4U792NQT
diff --git a/project.yml b/project.yml
index 900905960c..e69836b6ef 100644
--- a/project.yml
+++ b/project.yml
@@ -38,7 +38,6 @@ options:
 settings:
   CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED: true
   ENABLE_BITCODE: false
-  APP_GROUP_IDENTIFIER: group.$(BASE_APP_GROUP_IDENTIFIER)
   APP_NAME: ElementX
   KEYCHAIN_ACCESS_GROUP_IDENTIFIER: "$(DEVELOPMENT_TEAM).$(BASE_BUNDLE_IDENTIFIER)"
   MARKETING_VERSION: 25.03.2