diff --git a/Riot/target-bum-beta.yml b/Riot/target-bum-beta.yml
index 190fb729a..240a17893 100644
--- a/Riot/target-bum-beta.yml
+++ b/Riot/target-bum-beta.yml
@@ -91,6 +91,7 @@ targets:
         - "Modules/Analytics/Test/Unit/BWIAnalyticsTests.swift"
         - "**/*.strings" # Exclude all strings files
         - "Modules/Integrations/Widgets/Jitsi/*"
+        - "Managers/KeyValueStorage/Extensions/Keychain.swift"
     - path: ../bwi
       excludes:
         - "Tests"
diff --git a/Riot/target-bum-open.yml b/Riot/target-bum-open.yml
index db8362c76..8cf853cf7 100644
--- a/Riot/target-bum-open.yml
+++ b/Riot/target-bum-open.yml
@@ -77,6 +77,7 @@ targets:
         - "Modules/Analytics/Test/Unit/BWIAnalyticsTests.swift"
         - "**/*.strings" # Exclude all strings files
         - "Modules/Integrations/Widgets/Jitsi/*"
+        - "Managers/KeyValueStorage/Extensions/Keychain.swift"
     - path: ../bwi
       excludes:
         - "Tests"
diff --git a/Riot/target-bwi-mdm.yml b/Riot/target-bwi-mdm.yml
index 81fb058c0..305f90277 100644
--- a/Riot/target-bwi-mdm.yml
+++ b/Riot/target-bwi-mdm.yml
@@ -76,6 +76,7 @@ targets:
         - "Modules/Analytics/Test/Unit/BWIAnalyticsTests.swift"
         - "**/*.strings" # Exclude all strings files
         - "Modules/Integrations/Widgets/Jitsi/*"
+        - "Managers/KeyValueStorage/Extensions/Keychain.swift"
     - path: ../bwi
       excludes:
         - "Tests"
diff --git a/Riot/target-messenger.yml b/Riot/target-messenger.yml
index 30ca62e90..cf9565f25 100644
--- a/Riot/target-messenger.yml
+++ b/Riot/target-messenger.yml
@@ -76,6 +76,7 @@ targets:
         - "Modules/Analytics/Test/Unit/BWIAnalyticsTests.swift"
         - "**/*.strings" # Exclude all strings files
         - "Modules/Integrations/Widgets/Jitsi/*"
+        - "Managers/KeyValueStorage/Extensions/Keychain.swift"
     - path: ../bwi
       excludes:
         - "Tests"
diff --git a/RiotNSE/target.yml b/RiotNSE/target.yml
index 9718733cf..12ce53d26 100644
--- a/RiotNSE/target.yml
+++ b/RiotNSE/target.yml
@@ -100,6 +100,7 @@ targets:
         - "Controllers/**"
         - "Models/*List/**"
         - "Views/**"
+        - "Managers/KeyValueStorage/Extensions/Keychain.swift"
         
     - path: ../Riot/Modules/Analytics
     - path: ../Riot/Managers/UserSessions