diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8cc29192..6a21a2ef2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Changed
+
+- Integrated the commands `database:setup` and `database:migrate` into the container start
+
+### Todo
+
+- Apply manual data migration (`yarn database:migrate`) is not needed anymore
+
 ## 1.180.1 - 18.08.2022
 
 ### Added
diff --git a/README.md b/README.md
index 729a2802a..2ae2808cf 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ Open http://localhost:3333 in your browser and accomplish these steps:
 
 1. Increase the version of the `ghostfolio/ghostfolio` Docker image in `docker/docker-compose.yml`
 1. Run the following command to start the new Docker image: `docker-compose --env-file ./.env -f docker/docker-compose.yml up -d`  
-At each start container will automatically upgrade database schema if needed.
+   At each start, the container will automatically apply the database schema migrations if needed.
 
 ### Run with _Unraid_ (Community)