diff --git a/Riot/SupportingFiles/Riot.entitlements b/Riot/SupportingFiles/Riot.entitlements
index 2f0db7cec..e98a9b681 100644
--- a/Riot/SupportingFiles/Riot.entitlements
+++ b/Riot/SupportingFiles/Riot.entitlements
@@ -37,5 +37,9 @@
 	<array>
 		<string>group.im.vector</string>
 	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)im.vector.app.keychain.shared</string>
+	</array>
 </dict>
 </plist>
diff --git a/Riot/Utils/Constants.swift b/Riot/Utils/Constants.swift
index 200c52cdd..97578fa0f 100644
--- a/Riot/Utils/Constants.swift
+++ b/Riot/Utils/Constants.swift
@@ -19,5 +19,6 @@ import Foundation
 enum Constants {
     
     static let toBeRemovedNotificationCategoryIdentifier = "TO_BE_REMOVED"
+    static let keychainAccessGroup = "7J4U792NQT.im.vector.app.keychain.shared"
     
 }
diff --git a/RiotNSE/RiotNSE.entitlements b/RiotNSE/RiotNSE.entitlements
index e540aaaec..a33c8619f 100644
--- a/RiotNSE/RiotNSE.entitlements
+++ b/RiotNSE/RiotNSE.entitlements
@@ -6,5 +6,9 @@
 	<array>
 		<string>group.im.vector</string>
 	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)im.vector.app.keychain.shared</string>
+	</array>
 </dict>
 </plist>
diff --git a/RiotShareExtension/SupportingFiles/RiotShareExtension.entitlements b/RiotShareExtension/SupportingFiles/RiotShareExtension.entitlements
index e540aaaec..a33c8619f 100644
--- a/RiotShareExtension/SupportingFiles/RiotShareExtension.entitlements
+++ b/RiotShareExtension/SupportingFiles/RiotShareExtension.entitlements
@@ -6,5 +6,9 @@
 	<array>
 		<string>group.im.vector</string>
 	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)im.vector.app.keychain.shared</string>
+	</array>
 </dict>
 </plist>
diff --git a/SiriIntents/SiriIntents.entitlements b/SiriIntents/SiriIntents.entitlements
index e540aaaec..a33c8619f 100644
--- a/SiriIntents/SiriIntents.entitlements
+++ b/SiriIntents/SiriIntents.entitlements
@@ -6,5 +6,9 @@
 	<array>
 		<string>group.im.vector</string>
 	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)im.vector.app.keychain.shared</string>
+	</array>
 </dict>
 </plist>