diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
index 3343a233f..519af0888 100644
--- a/Config/AppVersion.xcconfig
+++ b/Config/AppVersion.xcconfig
@@ -16,5 +16,5 @@
 //
 
 // Version
-MARKETING_VERSION = 2.0.0
+MARKETING_VERSION = 2.1.0
 CURRENT_PROJECT_VERSION = 20220714163152
diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift
index 359b38aed..cabc38f78 100644
--- a/Config/BWIBuildSettings.swift
+++ b/Config/BWIBuildSettings.swift
@@ -498,4 +498,7 @@ class BWIBuildSettings: NSObject {
 
     // bwi disable encrypted option in message context menu
     var roomContextualMenuShowEncryptionOption = false
+    
+    // bwi show new session manager
+    var showSessionManager = false
 }
diff --git a/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift b/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift
index 0a0e0dae1..8d0cc8a0a 100644
--- a/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift
+++ b/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift
@@ -27,6 +27,7 @@ extension BWIBuildSettings {
         bwiEnableErrorTracking = true
         bwiMatomoTrackingDefaultState = true
         bwiShowMessageBubbles = true
+        showSessionManager = true
     }
     
 }
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index e35feab29..de973352f 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -493,7 +493,7 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
     Section *sectionSecurity = [Section sectionWithTag:SECTION_TAG_SECURITY];
     [sectionSecurity addRowWithTag:SECURITY_BUTTON_INDEX];
         
-    if (RiotSettings.shared.enableNewSessionManager)
+    if (RiotSettings.shared.enableNewSessionManager || BWIBuildSettings.shared.showSessionManager)
     {
         // NOTE: Add device manager entry point in the security section atm for debug purpose
         [sectionSecurity addRowWithTag:DEVICE_MANAGER_INDEX];