diff --git a/CHANGES.md b/CHANGES.md
index 195008a0c2c..fea04496790 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,16 @@
+Changes in Element v1.6.36 (2025-03-14)
+=======================================
+
+No significant changes.
+
+
+Changes in Element v1.6.34 (2025-03-07)
+=======================================
+
+Security fixes 🔐
+-----------------
+- Fix for [GHSA-632v-9pm3-m8ch](https://github.com/element-hq/element-android/security/advisories/GHSA-632v-9pm3-m8ch) / [CVE-2025-27606](https://www.cve.org/CVERecord?id=CVE-2025-27606)
+
 Changes in Element v1.6.32 (2025-02-18)
 =======================================
 
diff --git a/fastlane/metadata/android/en-US/changelogs/40106340.txt b/fastlane/metadata/android/en-US/changelogs/40106340.txt
new file mode 100644
index 00000000000..6563fef2e46
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40106340.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Improve security.
+Full changelog: https://github.com/element-hq/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40106360.txt b/fastlane/metadata/android/en-US/changelogs/40106360.txt
new file mode 100644
index 00000000000..c717270d3c0
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40106360.txt
@@ -0,0 +1,2 @@
+Main changes in this version: no significant change.
+Full changelog: https://github.com/element-hq/element-android/releases
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 90eca2e0ab9..b2c1f0e2710 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -62,7 +62,7 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
-        buildConfigField "String", "SDK_VERSION", "\"1.6.32\""
+        buildConfigField "String", "SDK_VERSION", "\"1.6.38\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index b8957c4093b..739cd211bc3 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -37,7 +37,7 @@ ext.versionMinor = 6
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-ext.versionPatch = 32
+ext.versionPatch = 38
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'
diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt
index fcedb7c21aa..6b16c2deb80 100644
--- a/vector/src/main/java/im/vector/app/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -61,6 +61,7 @@ import javax.inject.Inject
 data class MainActivityArgs(
         val clearCache: Boolean = false,
         val clearCredentials: Boolean = false,
+        val ignoreLogoutServerError: Boolean = false,
         val isUserLoggedOut: Boolean = false,
         val isAccountDeactivated: Boolean = false,
         val isSoftLogout: Boolean = false
@@ -238,6 +239,7 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
         return MainActivityArgs(
                 clearCache = argsFromIntent?.clearCache ?: false,
                 clearCredentials = argsFromIntent?.clearCredentials ?: false,
+                ignoreLogoutServerError = argsFromIntent?.ignoreLogoutServerError ?: false,
                 isUserLoggedOut = argsFromIntent?.isUserLoggedOut ?: false,
                 isAccountDeactivated = argsFromIntent?.isAccountDeactivated ?: false,
                 isSoftLogout = argsFromIntent?.isSoftLogout ?: false
@@ -263,7 +265,7 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
                 }
             }
             args.clearCredentials -> {
-                signout(session, onboardingStore, ignoreServerError = false)
+                signout(session, onboardingStore, ignoreServerError = args.ignoreLogoutServerError)
             }
             args.clearCache -> {
                 lifecycleScope.launch {
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
index 0dafe881187..effe976ce35 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
@@ -162,6 +162,12 @@ class PinFragment :
     }
 
     private fun launchResetPinFlow() {
-        MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCredentials = true))
+        MainActivity.restartApp(
+                activity = requireActivity(),
+                args = MainActivityArgs(
+                        clearCredentials = true,
+                        ignoreLogoutServerError = true,
+                )
+        )
     }
 }