diff --git a/Config/CommonConfiguration.swift b/Config/CommonConfiguration.swift
index aad857a5d..f8284c868 100644
--- a/Config/CommonConfiguration.swift
+++ b/Config/CommonConfiguration.swift
@@ -73,7 +73,7 @@ class CommonConfiguration: NSObject, Configurable {
         // Disable key backup on common
         sdkOptions.enableKeyBackupWhenStartingMXCrypto = false
         
-        // configure key provider delegate
+        // Configure key provider delegate
         MXKeyProvider.sharedInstance().delegate = EncryptionKeyManager.shared
     }
     
diff --git a/RiotNSE/target.yml b/RiotNSE/target.yml
index abb9f67fa..de68fdcd7 100644
--- a/RiotNSE/target.yml
+++ b/RiotNSE/target.yml
@@ -48,6 +48,7 @@ targets:
     - path: ../Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift
     - path: ../Riot/Categories/UNUserNotificationCenter.swift
     - path: ../Riot/Managers/KeyValueStorage/KeyValueStore.swift
+    - path: ../Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
     - path: ../Riot/Categories/Bundle.swift
     - path: ../Riot/Generated/Strings.swift
     - path: ../Riot/Generated/Images.swift
diff --git a/RiotShareExtension/target.yml b/RiotShareExtension/target.yml
index e4d5e0e8b..0f28f586a 100644
--- a/RiotShareExtension/target.yml
+++ b/RiotShareExtension/target.yml
@@ -49,6 +49,8 @@ targets:
     - path: ../Config/CommonConfiguration.swift
     - path: ../Riot/Utils/UserNameColorGenerator.swift
     - path: ../Riot/Categories/MXRoomSummary+Riot.m
+    - path: ../Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
+    - path: ../Riot/Managers/KeyValueStorage
     - path: ../Riot/Managers/Settings/RiotSettings.swift
     - path: ../Riot/Categories/UIColor.swift
     - path: ../Riot/Categories/UISearchBar.swift
diff --git a/SiriIntents/target.yml b/SiriIntents/target.yml
index e5ef4beae..42488cd0a 100644
--- a/SiriIntents/target.yml
+++ b/SiriIntents/target.yml
@@ -46,3 +46,5 @@ targets:
     - path: ../Config/BuildSettings.swift
     - path: ../Config/Configurable.swift
     - path: ../Riot/Managers/Settings/RiotSettings.swift
+    - path: ../Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
+    - path: ../Riot/Managers/KeyValueStorage