diff --git a/build.gradle b/build.gradle
index 4de8b5029..a8be71079 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,7 @@ test {
 // Development_stage (DEV:0  BETA:1  STABLE:2)
 def major = '7'
 def minor = '0'
-def development_stage = 1
+def development_stage = 2
 def releaseArtefacts = true
 def development_tag = ["dev", "beta", "tag_stable"]
 def version_type = ["-DEV", "-BETA", ""]
diff --git a/docs/latestbeta.html b/docs/latestbeta.html
index 5808fd988..67b76ea1a 100644
--- a/docs/latestbeta.html
+++ b/docs/latestbeta.html
@@ -1,2 +1,2 @@
-version=6.0.368.2
-released=06.08.2022
+version=7.0.487.1
+released=16.04.2023
diff --git a/docs/lateststable.html b/docs/lateststable.html
index 5808fd988..c917c963a 100644
--- a/docs/lateststable.html
+++ b/docs/lateststable.html
@@ -1,2 +1,2 @@
-version=6.0.368.2
-released=06.08.2022
+version=7.0.488.2
+released=22.04.2023
diff --git a/src/main/resources/changelog.md b/src/main/resources/changelog.md
index 344cfcad4..d1855e08c 100644
--- a/src/main/resources/changelog.md
+++ b/src/main/resources/changelog.md
@@ -1,3 +1,97 @@
+# Changelist HO! 7.0
+
+## Some numbers
+* 139 commits
+* 389 files changed, 43142 insertions(+), 31736 deletions(-)
+* Contributors:
+  * 130 wsbrenk
+  * 5 Sébastien Le Callonnec
+  * 2 akasolace
+  * 1 Ray Dixon
+  * 1 Sophia
+
+## Highlights
+
+* Faster and more secure database access using prepared statements (#1593)
+* Improved formula for calculating skill losses - Schum's formula (#1661)
+* fix team spirit influence on midfield rating (#1778)
+* login dialog shows team logos (#1643)
+
+## [Detailed Changelog](https://github.com/akasolace/HO/issues?q=milestone%3A7.0)
+
+### Database
+* faster and more secure database access using prepared statements (#1593)
+* refactoring of user administration (#1628)
+* each HO process uses its own log file (#1800)
+
+### Squad
+* add last match columns: rating at end of match, position and minutes (#1523)
+* add mother club and matches current team columns (#1401)
+* fix `ArrayIndexOutOfBoundsException` upon startup, as no column could be displayed (#1757)
+* fix player compare when sold player is bought back again (#1624)
+* new column HTMS-28, player potential (#1288)
+* fix last match date of walkover matches (#1776)
+* fix npe when player avatar download fails (#1806)
+* fix best position display in skill tester (#1822)
+* fix import of hrf files from portal tracker (#1829)
+
+### Team Analyzer
+* team analyzer displays man marking tactic (#1741)
+* add opponents' team development numbers to recap table (#347)
+* adjust panel layouts for font size 16 (#1805)
+
+### Rating
+* fix team spirit influence on midfield rating (#1778)
+
+### Matches
+* reload of match details supports selection ranges (#1595)
+
+### Lineup
+* SubstitutionEditor shows effect on loddarstats (#1626)
+* fix bug of cleared next lineup when wrong matches were downloaded from HT (#1721)
+* lineup rating pane is scrollable (#1783)
+* fix error in lineup position panel (#1795)
+
+### Statistics
+* add tooltips and labels to series data points (#1199)
+* player statistics no longer shows players that quit the club before selected time range (#1705)
+
+### Transfer
+* display player's age at transfer date (#1659)
+* Transfer module is no longer an autostart module to speed up the first download (#1760)
+* fix copy+paste feature in transfer scout (#1841)
+
+### Training
+* fix daylight saving resetting future trainings (#1668)
+* fix skill drop calculation - use Schum's formula (#1661)
+* fix error in training calculation due to incorrectly loaded cup matches (#1714)
+* changing training priorities in prediction table will update player details views (#1798)
+
+### League
+* fix order of last 5 matches - use the same as hattrick (#1793)
+* disable league promotion feature (#1412)
+
+### Youth
+* duration format d hh:mm:ss of "can be promoted in" when less than one day is left (#1578)
+
+### Misc
+* fix display of wrong currency and character encoding when ht worldetails table wasn't initialized (#1622)
+
+## Translations
+
+Reports by Contributors - October 15, 2022 - April 22, 2023
+
+* Jan 131
+* Fresty di Lot 39
+* sich 16
+* wsbrenk 16
+* Lidegand 14
+* Moorhuhninho 13
+* TeamBMW 5
+
+Total 234
+
+
 # Changelist HO! 6.1
 
 ## Some numbers
@@ -57,12 +151,11 @@ Reports by Contributors - August 05, 2022 - October 15, 2022
 * 260 commits
 * 395 files changed, 13134 insertions(+), 15920 deletions(-)
 * Contributors:
-  171	wsbrenk
-  80	akasolace
-  4	Sébastien Le Callonnec
-  4	Wolfgang Schneider
-  1	Goran Stefanovic
-
+  * 171	wsbrenk
+  * 80	akasolace
+  * 4	Sébastien Le Callonnec
+  * 4	Wolfgang Schneider
+  * 1	Goran Stefanovic
 
 ## Highlights
 * refactoring player details panel showing players' avatars now (#1349)
diff --git a/src/main/resources/release_notes.md b/src/main/resources/release_notes.md
index 225d98a56..62c8116e1 100644
--- a/src/main/resources/release_notes.md
+++ b/src/main/resources/release_notes.md
@@ -69,7 +69,7 @@
 
 ## Translations
 
-Reports by Contributors - October 15, 2022 - February 04, 2023
+Reports by Contributors - October 15, 2022 - April 22, 2023
 
 * Jan 131
 * Fresty di Lot 39