diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53560ab..ddc5e49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 ## 6.0.4 (unreleased)
 
-- ...
+- Improve docker configuration with `POSTGRES_PORT`.
 
 ## 6.0.3 (2021-02-22)
 
diff --git a/README.md b/README.md
index 7c0603e..c5f9f89 100644
--- a/README.md
+++ b/README.md
@@ -112,6 +112,8 @@ POSTGRES_USER: taiga
 POSTGRES_PASSWORD: taiga
 ```
 
+Additionally, you can also configure `POSTGRES_PORT` in `taiga-back`. Defaults to '5432'.
+
 ### Taiga Settings
 
 **Service: taiga-back**