diff --git a/CHANGELOG.md b/CHANGELOG.md
index 231995451..133d4b4f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ We have many important notes in this release. We know it's a pain for sysadmin,
   * Remove NodeJS 16 support (see https://nodejs.org/fr/blog/announcements/nodejs16-eol):
     * Please upgrade to NodeJS 18 before upgrading PeerTube
     * If you use NodeSource repository, you may have to migrate to their new repository: https://github.com/nodesource/distributions/wiki/How-to-migrate-to-the-new-repository
-    * Check in `production.yaml` that you use `127.0.0.1` instead of `localhost` for `listen.hostname` (https://github.com/Chocobozzz/PeerTube/blob/develop/config/production.yaml.example#L2) to ensure PeerTube is listening on IPv4
+    * Check in `production.yaml` that you use `127.0.0.1` instead of `localhost` for `listen.hostname`, `database.hostname` and `redis.hostname` as Node 18 favours IPv6 for `localhost` resolution
 
   * Remove WebTorrent support in player:
     * "WebTorrent videos" are renamed to "Web Video". The video format is the same, we just stop to use P2P for these videos
diff --git a/config/default.yaml b/config/default.yaml
index 8d60a87d0..3a4891eff 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -70,7 +70,7 @@ trust_proxy:
 
 # Your database name will be database.name OR 'peertube'+database.suffix
 database:
-  hostname: 'localhost'
+  hostname: '127.0.0.1'
   port: 5432
   ssl: false
   suffix: '_dev'
@@ -83,7 +83,7 @@ database:
 # You can also specify a 'socket' path to a unix socket but first need to
 # set 'hostname' and 'port' to null
 redis:
-  hostname: 'localhost'
+  hostname: '127.0.0.1'
   port: 6379
   auth: null # Used by both standalone and sentinel
   db: 0
diff --git a/config/dev.yaml b/config/dev.yaml
index 60179533d..921b9f913 100644
--- a/config/dev.yaml
+++ b/config/dev.yaml
@@ -17,11 +17,11 @@ rates_limit:
     max: 200
 
 database:
-  hostname: 'localhost'
+  hostname: '127.0.0.1'
   port: 5432
 
 redis:
-  hostname: 'localhost'
+  hostname: '127.0.0.1'
 
 smtp:
   hostname: null
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 3b2b029ab..90c31072e 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -68,7 +68,7 @@ trust_proxy:
 
 # Your database name will be database.name OR 'peertube'+database.suffix
 database:
-  hostname: 'localhost'
+  hostname: '127.0.0.1'
   port: 5432
   ssl: false
   suffix: '_prod'
@@ -81,7 +81,7 @@ database:
 # You can also specify a 'socket' path to a unix socket but first need to
 # set 'hostname' and 'port' to null
 redis:
-  hostname: 'localhost'
+  hostname: '127.0.0.1'
   port: 6379
   auth: null # Used by both standalone and sentinel
   db: 0