diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
index f5a08b8e2..85f25282a 100644
--- a/Config/BuildSettings.swift
+++ b/Config/BuildSettings.swift
@@ -295,7 +295,7 @@ final class BuildSettings: NSObject {
     static let roomSettingsScreenShowFlairSettings: Bool = true
     static let roomSettingsScreenShowAdvancedSettings: Bool = true
     static let roomSettingsScreenAdvancedShowEncryptToVerifiedOption: Bool = true
-    static let roomSettingsScreenShowNotificationsV2: Bool = true
+    static let roomSettingsScreenShowNotificationsV2: Bool = false
 
     // MARK: - Room Member Screen
     
@@ -309,10 +309,6 @@ final class BuildSettings: NSObject {
     static let messageDetailsAllowCopyMedia: Bool = true
     static let messageDetailsAllowPasteMedia: Bool = true
     
-    // MARK: - Voice Message
-    
-    static let voiceMessagesEnabled = false
-    
     // MARK: - Notifications
     static let decryptNotificationsByDefault: Bool = true
     
diff --git a/Podfile b/Podfile
index 4d3161034..53b05e0e6 100644
--- a/Podfile
+++ b/Podfile
@@ -11,9 +11,9 @@ use_frameworks!
 # - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-# $matrixKitVersion = '= 0.15.6'
+$matrixKitVersion = '= 0.15.6'
 # $matrixKitVersion = :local
-$matrixKitVersion = {'develop' => 'develop'}
+# $matrixKitVersion = {'develop' => 'develop'}
 
 ########################################
 
@@ -46,7 +46,7 @@ abstract_target 'RiotPods' do
   pod 'GBDeviceInfo', '~> 6.6.0'
   pod 'Reusable', '~> 4.1'
   pod 'KeychainAccess', '~> 4.2.2'
-
+ 
   # Piwik for analytics
   pod 'MatomoTracker', '~> 7.4.1'
 
@@ -103,7 +103,7 @@ post_install do |installer|
       # Plus the app does not enable it
       config.build_settings['ENABLE_BITCODE'] = 'NO'
 
-      # Make fastlane(xcodebuild) happy by preventing it from building for arm64 simulator
+      # Make fastlane(xcodebuild) happy by preventing it from building for arm64 simulator 
       config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
 
       # Force ReadMoreTextView to use Swift 5.2 version (as there is no code changes to perform)
@@ -111,7 +111,7 @@ post_install do |installer|
         config.build_settings['SWIFT_VERSION'] = '5.2'
       end
 
-      # Stop Xcode 12 complaining about old IPHONEOS_DEPLOYMENT_TARGET from pods
+      # Stop Xcode 12 complaining about old IPHONEOS_DEPLOYMENT_TARGET from pods 
       config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
     end
   end
diff --git a/Podfile.lock b/Podfile.lock
index af7c54aa3..0024fd9b1 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -124,9 +124,9 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - MatomoTracker (~> 7.4.1)
-  - MatrixKit (from `https://github.com/matrix-org/matrix-ios-kit.git`, branch `develop`)
-  - MatrixSDK (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `develop`)
-  - MatrixSDK/JingleCallStack (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `develop`)
+  - MatrixKit (= 0.15.6)
+  - MatrixSDK
+  - MatrixSDK/JingleCallStack
   - OLMKit
   - ReadMoreTextView (~> 3.0.1)
   - Reusable (~> 4.1)
@@ -164,6 +164,8 @@ SPEC REPOS:
     - LoggerAPI
     - Logging
     - MatomoTracker
+    - MatrixKit
+    - MatrixSDK
     - OLMKit
     - ReadMoreTextView
     - Realm
@@ -177,22 +179,6 @@ SPEC REPOS:
     - zxcvbn-ios
     - ZXingObjC
 
-EXTERNAL SOURCES:
-  MatrixKit:
-    :branch: develop
-    :git: https://github.com/matrix-org/matrix-ios-kit.git
-  MatrixSDK:
-    :branch: develop
-    :git: https://github.com/matrix-org/matrix-ios-sdk.git
-
-CHECKOUT OPTIONS:
-  MatrixKit:
-    :commit: dae868f96bb3b116f0fe0ce74cd1feca0049f59e
-    :git: https://github.com/matrix-org/matrix-ios-kit.git
-  MatrixSDK:
-    :commit: 3404e154108f38f9eaed8e161c3a66cd9f74198d
-    :git: https://github.com/matrix-org/matrix-ios-sdk.git
-
 SPEC CHECKSUMS:
   AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
   BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
@@ -233,6 +219,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 83b17e47b31a75c05ad3ce7418fd5f7a7a3a8122
+PODFILE CHECKSUM: c1f1d1137ebacb6c74706cb28d5c10f26d6fe655
 
 COCOAPODS: 1.10.1
diff --git a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
index a9bea1d96..84ecb908a 100644
--- a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
+++ b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
@@ -4,8 +4,7 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      runPostActionsOnFailure = "NO">
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"