diff --git a/CHANGELOG.md b/CHANGELOG.md
index 829a5d6dd..fcb050497 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,48 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [3.7.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/3.6.1...3.7.0)
+
+- fix(webapp): logo and top-menu optimization [`#8590`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8590)
+- fix(webapp): hotfix dropdown menu placement [`#8594`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8594)
+- fix(webapp): notifications - UI Improvements [`#8559`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8559)
+- update user, write all values, query verification Badge [`#8593`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8593)
+- refactor(webapp): remove email normalization [`#8580`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8580)
+- feat(backend): autoselect badges when rewarding and the user still have free slots [`#8577`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8577)
+- fix websocket - downgrade graphql [`#8592`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8592)
+- build(deps-dev): bump @faker-js/faker from 9.7.0 to 9.8.0 in /webapp [`#8567`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8567)
+- build(deps): bump @aws-sdk/client-s3 from 3.804.0 to 3.817.0 in /backend [`#8582`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8582)
+- build(deps-dev): bump eslint-plugin-jsonc in /backend [`#8583`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8583)
+- build(deps-dev): bump @types/lodash from 4.17.16 to 4.17.17 in /backend [`#8585`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8585)
+- build(deps-dev): bump the cypress group across 1 directory with 2 updates [`#8561`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8561)
+- build(deps-dev): bump @types/node from 22.15.18 to 22.15.21 in /backend [`#8586`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8586)
+- build(deps): bump peter-evans/repository-dispatch [`#8589`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8589)
+- build(deps-dev): bump eslint-plugin-prettier in /webapp [`#8520`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8520)
+- improve login & invite mechanics [`#8574`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8574)
+- build(backend): upgrade outdated S3 client [`#8463`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8463)
+- refactor(docker): remove dead code [`#8554`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8554)
+- build(deps-dev): bump eslint-plugin-prettier in /backend [`#8526`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8526)
+- build(deps): bump linkify-html from 4.2.0 to 4.3.1 in /backend [`#8532`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8532)
+- build(deps-dev): bump @faker-js/faker from 9.7.0 to 9.8.0 [`#8560`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8560)
+- build(deps): bump peter-evans/repository-dispatch [`#8563`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8563)
+- fix(webapp): fix popover flickering [`#8555`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8555)
+- fix(backend): user role in group in notifications [`#8552`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8552)
+- fix statistics: reports [`#8576`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8576)
+- build(deps): bump docker/build-push-action from 6.16.0 to 6.17.0 [`#8562`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8562)
+- build(deps): bump sanitize-html from 2.16.0 to 2.17.0 in /backend [`#8568`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8568)
+- build(deps-dev): bump @faker-js/faker from 9.7.0 to 9.8.0 in /backend [`#8570`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8570)
+- build(deps): bump node from 23.11.0-alpine to 24.0.2-alpine in /backend [`#8564`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8564)
+- build(deps-dev): bump ts-jest from 29.3.2 to 29.3.4 in /backend [`#8569`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8569)
+- build(deps-dev): bump @types/node from 22.15.3 to 22.15.18 in /backend [`#8571`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8571)
+- build(deps-dev): bump eslint-config-prettier in /backend [`#8529`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8529)
+- feat(backend): add support line to emails [`#8502`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8502)
+- build(deps-dev): bump tsc-alias from 1.8.15 to 1.8.16 in /backend [`#8530`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8530)
+
 #### [3.6.1](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/3.6.0...3.6.1)
 
+> 12 May 2025
+
+- v3.6.1 [`#8553`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8553)
 - fix(webapp): fix flickering? [`#8549`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8549)
 - fix(backend): fix statistics and introduce new values [`#8550`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8550)
 - Fix typo in german translation [`#8548`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8548)
diff --git a/backend/package.json b/backend/package.json
index 0f4a883eb..26d16eb7d 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-backend",
-  "version": "3.6.1",
+  "version": "3.7.0",
   "description": "GraphQL Backend for ocelot.social",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",
diff --git a/deployment/helm/charts/ocelot-neo4j/Chart.yaml b/deployment/helm/charts/ocelot-neo4j/Chart.yaml
index 8cb9e2418..74be16822 100644
--- a/deployment/helm/charts/ocelot-neo4j/Chart.yaml
+++ b/deployment/helm/charts/ocelot-neo4j/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "3.6.1"
+appVersion: "3.7.0"
diff --git a/deployment/helm/charts/ocelot-social/Chart.yaml b/deployment/helm/charts/ocelot-social/Chart.yaml
index c24ea6cfc..eae714c4f 100644
--- a/deployment/helm/charts/ocelot-social/Chart.yaml
+++ b/deployment/helm/charts/ocelot-social/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "3.6.1"
+appVersion: "3.7.0"
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 56ed60cad..9e1f21657 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ocelot-social-frontend",
-  "version": "3.6.1",
+  "version": "3.7.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ocelot-social-frontend",
-      "version": "3.6.1",
+      "version": "3.7.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@intlify/unplugin-vue-i18n": "^2.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index 427484f5a..053e208b8 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-frontend",
-  "version": "3.6.1",
+  "version": "3.7.0",
   "description": "ocelot.social new Frontend (in development and not fully implemented) by IT4C Boilerplate for frontends",
   "main": "build/index.js",
   "type": "module",
diff --git a/package.json b/package.json
index 4cc4ecda1..6c961f085 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social",
-  "version": "3.6.1",
+  "version": "3.7.0",
   "description": "Free and open source software program code available to run social networks.",
   "author": "ocelot.social Community",
   "license": "MIT",
diff --git a/webapp/maintenance/source/package.json b/webapp/maintenance/source/package.json
index ab2171317..54da82c2f 100644
--- a/webapp/maintenance/source/package.json
+++ b/webapp/maintenance/source/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ocelot-social/maintenance",
-  "version": "3.6.1",
+  "version": "3.7.0",
   "description": "Maintenance page for ocelot.social",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",
diff --git a/webapp/package.json b/webapp/package.json
index 8f43c7776..c9960ccb4 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-webapp",
-  "version": "3.6.1",
+  "version": "3.7.0",
   "description": "ocelot.social Frontend",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",