diff --git a/Riot/SupportingFiles/Riot.entitlements b/Riot/SupportingFiles/Riot.entitlements
index f1f4bf0bd..2ddbae143 100644
--- a/Riot/SupportingFiles/Riot.entitlements
+++ b/Riot/SupportingFiles/Riot.entitlements
@@ -39,7 +39,7 @@
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)im.vector.app.keychain.shared</string>
+		<string>$(KEYCHAIN_ACCESS_GROUP)</string>
 	</array>
 </dict>
 </plist>
diff --git a/RiotNSE/RiotNSE.entitlements b/RiotNSE/RiotNSE.entitlements
index caae6ed94..ced577af8 100644
--- a/RiotNSE/RiotNSE.entitlements
+++ b/RiotNSE/RiotNSE.entitlements
@@ -8,7 +8,7 @@
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)im.vector.app.keychain.shared</string>
+		<string>$(KEYCHAIN_ACCESS_GROUP)</string>
 	</array>
 </dict>
 </plist>
diff --git a/RiotShareExtension/SupportingFiles/RiotShareExtension.entitlements b/RiotShareExtension/SupportingFiles/RiotShareExtension.entitlements
index caae6ed94..ced577af8 100644
--- a/RiotShareExtension/SupportingFiles/RiotShareExtension.entitlements
+++ b/RiotShareExtension/SupportingFiles/RiotShareExtension.entitlements
@@ -8,7 +8,7 @@
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)im.vector.app.keychain.shared</string>
+		<string>$(KEYCHAIN_ACCESS_GROUP)</string>
 	</array>
 </dict>
 </plist>
diff --git a/SiriIntents/SiriIntents.entitlements b/SiriIntents/SiriIntents.entitlements
index caae6ed94..ced577af8 100644
--- a/SiriIntents/SiriIntents.entitlements
+++ b/SiriIntents/SiriIntents.entitlements
@@ -8,7 +8,7 @@
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)im.vector.app.keychain.shared</string>
+		<string>$(KEYCHAIN_ACCESS_GROUP)</string>
 	</array>
 </dict>
 </plist>