diff --git a/CHANGELOG.md b/CHANGELOG.md
index d30e2559bc63..e32b75919bbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Changelog
 
+## [3.7.0](https://github.com/openfoodfacts/smooth-app/compare/v3.6.0...v3.7.0) (2022-08-17)
+
+
+### Features
+
+* [#2174](https://github.com/openfoodfacts/smooth-app/issues/2174) - doomscrolling instead of "download more" button ([#2770](https://github.com/openfoodfacts/smooth-app/issues/2770)) ([c821f6d](https://github.com/openfoodfacts/smooth-app/commit/c821f6d2fecb4ce7c529f7ff9931707aded60ba3))
+* [#2785](https://github.com/openfoodfacts/smooth-app/issues/2785) - async access to dao product list ([#2788](https://github.com/openfoodfacts/smooth-app/issues/2788)) ([d922511](https://github.com/openfoodfacts/smooth-app/commit/d922511a32903332eb07e0a3b23f371155ebda17))
+* Edit product page UI improvements ([#2754](https://github.com/openfoodfacts/smooth-app/issues/2754)) ([8ed337b](https://github.com/openfoodfacts/smooth-app/commit/8ed337bfdeffa81d78363cc9b8d63e0daffdfc13))
+* Show osm attribution + removed matomo_tracker fork ([#2740](https://github.com/openfoodfacts/smooth-app/issues/2740)) ([f6f8511](https://github.com/openfoodfacts/smooth-app/commit/f6f851179cb8d59519d68679f2b75189be8153a6))
+* Sign up form: try to highlight the issue ([#2535](https://github.com/openfoodfacts/smooth-app/issues/2535)) ([d08b1bd](https://github.com/openfoodfacts/smooth-app/commit/d08b1bd3772838fee3747d7f174a9396100358bd))
+
+
+### Bug Fixes
+
+* [#2553](https://github.com/openfoodfacts/smooth-app/issues/2553) - upgrade to off-dart 1.24.0 + categories not completed ([#2795](https://github.com/openfoodfacts/smooth-app/issues/2795)) ([133071d](https://github.com/openfoodfacts/smooth-app/commit/133071dea9c2ab398f51ae23e38e2c36a39a5d4d))
+* [#2729](https://github.com/openfoodfacts/smooth-app/issues/2729) - product query page - simplified top messages and buttons ([#2736](https://github.com/openfoodfacts/smooth-app/issues/2736)) ([dee9be3](https://github.com/openfoodfacts/smooth-app/commit/dee9be35a3efde29302de2c1cecb0bea98f5b8ed))
+* [#2730](https://github.com/openfoodfacts/smooth-app/issues/2730) - removed $ in "contact" translations ([#2734](https://github.com/openfoodfacts/smooth-app/issues/2734)) ([462e73f](https://github.com/openfoodfacts/smooth-app/commit/462e73ff3f0df72b40d50911cf9b4ad00a704e22))
+* [#2773](https://github.com/openfoodfacts/smooth-app/issues/2773) - appropriate "clear?" and "delete?" messages for user lists ([#2778](https://github.com/openfoodfacts/smooth-app/issues/2778)) ([3deb4cb](https://github.com/openfoodfacts/smooth-app/commit/3deb4cbeb535c10446b36af3215725acc40e507b))
+* [#2774](https://github.com/openfoodfacts/smooth-app/issues/2774) - moved items in EditProductPage ([#2779](https://github.com/openfoodfacts/smooth-app/issues/2779)) ([9e11f50](https://github.com/openfoodfacts/smooth-app/commit/9e11f50dbe2fb91104d6e18ca2e298b2c622ebd7))
+* [#2776](https://github.com/openfoodfacts/smooth-app/issues/2776) - more standard user preferences app bar ([#2780](https://github.com/openfoodfacts/smooth-app/issues/2780)) ([4abe9fe](https://github.com/openfoodfacts/smooth-app/commit/4abe9fe832f43a38beaa02df29c3c91cc4278cc0))
+* back button invisible for some preferences ([#2760](https://github.com/openfoodfacts/smooth-app/issues/2760)) ([e58db02](https://github.com/openfoodfacts/smooth-app/commit/e58db0284619bdf6126e568d1ac26f0fb1a5def4))
+* Offline product knowledge panel issue ([#2693](https://github.com/openfoodfacts/smooth-app/issues/2693)) ([4052a84](https://github.com/openfoodfacts/smooth-app/commit/4052a848d178164962f302c8ff76c0aabd6c2435))
+* support back swipe on iOS product page ([#2792](https://github.com/openfoodfacts/smooth-app/issues/2792)) ([f2bb63f](https://github.com/openfoodfacts/smooth-app/commit/f2bb63f1381d9f7b3cb1796462b41e40261261ae))
+* text alignment in attribute chips ([#2786](https://github.com/openfoodfacts/smooth-app/issues/2786)) ([c5e5ef8](https://github.com/openfoodfacts/smooth-app/commit/c5e5ef8866d79bd8d25fb6743484a12d01a3f87d))
+* unsupported-locale-update ([#2766](https://github.com/openfoodfacts/smooth-app/issues/2766)) ([6fe4f22](https://github.com/openfoodfacts/smooth-app/commit/6fe4f22ed981610ce3fd489316e5a93fb4688b1d))
+
 ## [3.6.0](https://github.com/openfoodfacts/smooth-app/compare/v3.5.1...v3.6.0) (2022-08-04)
 
 
diff --git a/version.txt b/version.txt
index 40c341bdcdbe..7c69a55dbb18 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3.6.0
+3.7.0