diff --git a/Build.xcconfig b/Build.xcconfig
index a7f46a78..93135631 100644
--- a/Build.xcconfig
+++ b/Build.xcconfig
@@ -16,17 +16,17 @@ ORG_PREFIX = $(ORG_IDENTIFIER)
 PRODUCT_NAME = SideStore
 //PRODUCT_NAME[configuration=Debug] = Prov Debug
 
+
 //PRODUCT_BUNDLE_IDENTIFIER[config=Debug]   =  $(ORG_PREFIX).SideStore$(BUNDLE_ID_SUFFIX)
 //PRODUCT_BUNDLE_IDENTIFIER[config=Release] =  $(ORG_PREFIX).SideStore
-PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).SideStore$(BUNDLE_ID_SUFFIX)
+// preserve unmodified bundle ID (without any extra suffixes)
+GROUP_ID = $(ORG_PREFIX).SideStore$(BUNDLE_ID_SUFFIX)
+PRODUCT_BUNDLE_IDENTIFIER = $(GROUP_ID)
 
 EXTENSION_PREFIX            = $(PRODUCT_BUNDLE_IDENTIFIER)
-APP_GROUP_IDENTIFIER        = $(PRODUCT_BUNDLE_IDENTIFIER)
+APP_GROUP_IDENTIFIER        = $(GROUP_ID)
 ICLOUD_CONTAINER_IDENTIFIER = iCloud.$(ORG_PREFIX).$(PROJECT_NAME)
 
-// preserve unmodified bundle ID (without any extra suffixes)
-GROUP_ID = $(PRODUCT_BUNDLE_IDENTIFIER)
-
 // Suppress noise from os activity in xcode console log for release builds
 DEBUG_ACTIVITY_MODE = disable
 
diff --git a/xcconfigs/AltBackup.xcconfig b/xcconfigs/AltBackup.xcconfig
index a283cc8a..fcb72751 100644
--- a/xcconfigs/AltBackup.xcconfig
+++ b/xcconfigs/AltBackup.xcconfig
@@ -1,6 +1,3 @@
 #include "../Build.xcconfig"
 
 PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER).AltBackup
-
-// retain the non-suffixed bundleID set in $GROUP_ID for APP_GROUP_IDENTIFIER
-APP_GROUP_IDENTIFIER = $(GROUP_ID)
\ No newline at end of file
diff --git a/xcconfigs/AltWidgetExtension.xcconfig b/xcconfigs/AltWidgetExtension.xcconfig
index 2fd5d472..f269c9a7 100644
--- a/xcconfigs/AltWidgetExtension.xcconfig
+++ b/xcconfigs/AltWidgetExtension.xcconfig
@@ -1,6 +1,3 @@
 #include "../Build.xcconfig"
 
 PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER).AltWidget
-
-// retain the non-suffixed bundleID set in $GROUP_ID for APP_GROUP_IDENTIFIER
-APP_GROUP_IDENTIFIER = $(GROUP_ID)
\ No newline at end of file