diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7b72c3a7..49c22d286 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 Changelog
 ==========
 
+Version 6.23.6 *(2022-05-14)*
+----------------------------
+
+ * Fix a glitch with device freezing at deleting multiple files at once
+ * Properly handle deleting the last file in a folder
+ * Restore previous way of handling hidden and included folders on FOSS app version, not Google Play
+ * Added some stability, translation and UX improvements
+
 Version 6.23.5 *(2022-05-05)*
 ----------------------------
 
diff --git a/fastlane/metadata/android/en-US/changelogs/365.txt b/fastlane/metadata/android/en-US/changelogs/365.txt
new file mode 100644
index 000000000..28bde3635
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/365.txt
@@ -0,0 +1,4 @@
+ * Fix a glitch with device freezing at deleting multiple files at once
+ * Properly handle deleting the last file in a folder
+ * Restore previous way of handling hidden and included folders on FOSS app version, not Google Play
+ * Added some stability, translation and UX improvements