diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 368b18a578..f1e35dfe60 100755
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 5.7.0-dev+2023-06-22
+current_version = 5.7.0-stable+2023-07-23
 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})
@@ -11,7 +11,7 @@ values =
 	dev
 	stable
 
-[bumpversion:file:Marlin/src/advi3pp/versions.h]
+[bumpversion:file:Marlin/Configuration.h]
 serialize = {major}{minor}{patch}
 search = advi3_pp_version = 0x{current_version}
 replace = advi3_pp_version = 0x{new_version}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f8ab74c0c..dc0b9aaf73 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,16 @@
 
 ## 5.7.0 (2023-06-22)
 
-Align with Marlin 2.1.2.1
+* **#332** - [SD card sorting is not working as expected bug](https://github.com/andrivet/ADVi3pp/issues/332)
+* **#329** - [Add a way to cancel Load and Unload filament enhancement](https://github.com/andrivet/ADVi3pp/issues/329)
+* **#327** - [For Mark II printers, select by default the Mark II offsets for the probe enhancement](https://github.com/andrivet/ADVi3pp/issues/327)
+* **#326** - [Synchronise sources with Marlin 2.1.2 enhancement](https://github.com/andrivet/ADVi3pp/issues/326)
+* **#322** - [Save the last temperature used to Load/Unload and restore it on boot enhancement](https://github.com/andrivet/ADVi3pp/issues/322)
+* **#319** - [Use Touch Switch Mode (SW) for BLTouch enhancement](https://github.com/andrivet/ADVi3pp/issues/319)
+* **#315** - [Beep in Preheat when the target temperature is achieved enhancement](https://github.com/andrivet/ADVi3pp/issues/315)
+* **#314** - [Apply the setting under Settings / Beeper / Beep duration to M300 without P argument enhancement](https://github.com/andrivet/ADVi3pp/issues/314)
+* **#262** - [Add BLTouch support for i3 plus Mark II enhancement](https://github.com/andrivet/ADVi3pp/issues/262)
+* **#115** - [Allow Temp Change during filament change enhancement](https://github.com/andrivet/ADVi3pp/issues/115)
 
 ## 5.6.0 (2023-03-19)
 
diff --git a/LCD-Panel/Masters/ADVi3++5 LCD-Panel.sketch b/LCD-Panel/Masters/ADVi3++5 LCD-Panel.sketch
index 3f6aac48cb..47cedd1894 100644
Binary files a/LCD-Panel/Masters/ADVi3++5 LCD-Panel.sketch and b/LCD-Panel/Masters/ADVi3++5 LCD-Panel.sketch differ
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 23e39b6acc..ebe821c5d5 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -50,7 +50,7 @@
  * vendor name, download location, GitHub account, etc.
  */
 #ifndef DETAILED_BUILD_VERSION
-  #define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " (" ADVi3PP_NAME " 5.7.0-dev)"
+  #define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " (" ADVi3PP_NAME " 5.7.0)"
 #endif
 
 /**
@@ -59,7 +59,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2023-06-22"
+  #define STRING_DISTRIBUTION_DATE "2023-07-23"
 #endif
 
 /**
diff --git a/Scripts/create-release.sh b/Scripts/create-release.sh
index 5a33aa009b..681520e70c 100755
--- a/Scripts/create-release.sh
+++ b/Scripts/create-release.sh
@@ -26,7 +26,7 @@ echo "======================================"
 echo
 echo "BE SURE YOU HAVE CHANGED:"
 echo "- CHANGELOG.md"
-echo "- cd .. ; advbumpversion --allow-dirty --no-commit --no-tag release ; cd Scripts"
+echo "- cd .. ; bump2version --allow-dirty --no-commit --no-tag release ; cd Scripts"
 echo "- User Manual if necessary"
 echo
 pause 'Press any key to continue or Ctrl-C to abort...'
@@ -67,7 +67,7 @@ echo "***** Generate other microSD images..."
 echo
 echo "***** Compile Mainboard firmwares..."
 echo
-platformio -f -c clion run -d "${advi3pp}" -e advi3pp_51 -e advi3pp_51_bltouch -e advi3pp_52c -e advi3pp_52c_bltouch -e advi3pp_54
+platformio -f -c clion run -d "${advi3pp}" -e advi3pp_51 -e advi3pp_51_bltouch -e advi3pp_52c -e advi3pp_52c_bltouch -e advi3pp_54 -e advi3pp_54_bltouch
 ret=$?; if [[ $ret != 0 ]]; then exit $ret; fi
 
 echo
@@ -78,6 +78,7 @@ cp "${advi3pp}/.pio/build/advi3pp_51_bltouch/firmware.hex" "${release}/ADVi3pp-M
 cp "${advi3pp}/.pio/build/advi3pp_52c/firmware.hex" "${release}/ADVi3pp-Mainboard-52c-${version}.hex"
 cp "${advi3pp}/.pio/build/advi3pp_52c_bltouch/firmware.hex" "${release}/ADVi3pp-Mainboard-52c-BLTouch-${version}.hex"
 cp "${advi3pp}/.pio/build/advi3pp_54/firmware.hex" "${release}/ADVi3pp-Mainboard-54-${version}.hex"
+cp "${advi3pp}/.pio/build/advi3pp_54_bltouch/firmware.hex" "${release}/ADVi3pp-Mainboard-54-BLTouch-${version}.hex"
 ret=$?; if [[ $ret != 0 ]]; then exit $ret; fi
 
 echo
diff --git a/Scripts/version.sh b/Scripts/version.sh
index f0e048faa1..8f6c32d51b 100644
--- a/Scripts/version.sh
+++ b/Scripts/version.sh
@@ -1 +1 @@
-version="5.7.0-dev"
+version="5.7.0"