diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 7126bb5b6d..2cc41bb7f3 100755
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 5.4.0-dev+2022-06-12
+current_version = 5.4.0-stable+2022-07-15
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?\+(?P<date>\d{4}\-\d{2}\-\d{2})
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4547aa5fe7..233fc0b01a 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,23 @@
 # ADVi3++ Changelog
 
+## 5.4.0 (2022-07-15)
+
+* **#291** - [When pressing on a move button, it continues for a while after the button is released](https://github.com/andrivet/ADVi3pp/issues/291)
+* **#290** - [Avoid homing when not necessary](https://github.com/andrivet/ADVi3pp/issues/290)
+* **#289** - [Travel movements during manual bed levelling significantly slower than earlier versions](https://github.com/andrivet/ADVi3pp/issues/289)
+* **#288** - [Inversion of black and white BLTouch wires not detected](https://github.com/andrivet/ADVi3pp/issues/288)
+* **#287** - [Warn if manual bed leveling is attempted while extruder is hot](https://github.com/andrivet/ADVi3pp/issues/287)
+* **#285** - [Show what triggered a hardware error](https://github.com/andrivet/ADVi3pp/issues/285)
+* **#284** - [LCD stuck dim when hardware error detected](https://github.com/andrivet/ADVi3pp/issues/284)
+* **#279** - [Enhance the beeping feature](https://github.com/andrivet/ADVi3pp/issues/279)
+* **#277** - [Raise extruder during Tuning / Extruder](https://github.com/andrivet/ADVi3pp/issues/277)
+* **#274** - [Enhanced motion during filament load](https://github.com/andrivet/ADVi3pp/issues/274)
+* **#246** - [Skew compensation implementation](https://github.com/andrivet/ADVi3pp/issues/246)
+* **#177** - [Cancel e-steps tuning](https://github.com/andrivet/ADVi3pp/issues/177)
+
 ## 5.3.0 (2022-06-04)
 
-* **#214** -Troubleshooting vibrations and mechanical issues
+* **#214** - Troubleshooting vibrations and mechanical issues
 
 ## 5.2.0 (2022-05-01)
 
@@ -18,9 +33,9 @@
 ## 5.1.0 (2022-03-25)
 
 * Align ADVi3++ with upstream latest release of Marlin (2.0.9.3)
-* **#263** - Use G-Code M256 (set brightness) instead of M250 (set contrast)
-* **#268** - Fix Z height not saved and 0.1mm less than expected
 * **#271** - Fix pin #6 displayed as an output in the I/O screen
+* **#268** - Fix Z height not saved and 0.1mm less than expected
+* **#263** - Use G-Code M256 (set brightness) instead of M250 (set contrast)
 * **#79** - Support for filament runout sensors
 
 ## 5.0.3 (2022-02-27)
@@ -29,8 +44,8 @@
 
 ## 5.0.2 (2021-11-14)
 
-* **#260** - Fix LCD dimming
 * **#266** - Junction Deviation bug and display one more digit
+* **#260** - Fix LCD dimming
 
 ## 5.0.1 (2021-09-18)
 
diff --git a/Scripts/version.sh b/Scripts/version.sh
index 41e065a2de..7077a82b90 100644
--- a/Scripts/version.sh
+++ b/Scripts/version.sh
@@ -1 +1 @@
-version="5.4.0-dev"
+version="5.4.0"