diff --git a/infra/docker/database/pg13_16.Dockerfile b/infra/docker/database/pg13_16.Dockerfile
index 77dbd3ca06..b317bbb442 100644
--- a/infra/docker/database/pg13_16.Dockerfile
+++ b/infra/docker/database/pg13_16.Dockerfile
@@ -47,9 +47,7 @@ RUN \
 
 RUN for file in $(find /usr/share/postgresql -name 'postgresql.conf.sample'); do \
         # We want timescaledb to be loaded in this image by every created cluster
-        sed -r -i "s/[#]*\s*(shared_preload_libraries)\s*=\s*'(.*)'/\1 = 'timescaledb,\2'/;s/,'/'/" "$file" \
-        # We need to listen on all interfaces, otherwise PostgreSQL is not accessible
-        && echo "listen_addresses = '*'" >> "$file"; \
+        sed -r -i "s/[#]*\s*(shared_preload_libraries)\s*=\s*'(.*)'/\1 = 'timescaledb,\2'/;s/,'/'/" "$file"; \
     done
 
 # Install PostGIS extension
diff --git a/infra/docker/database/upgrade_pg.Dockerfile b/infra/docker/database/upgrade_pg.Dockerfile
index 10e6078cdc..29c6ae6163 100644
--- a/infra/docker/database/upgrade_pg.Dockerfile
+++ b/infra/docker/database/upgrade_pg.Dockerfile
@@ -52,6 +52,11 @@ RUN \
     apt-get install -y timescaledb-$TIMESCALEDB_MAJOR-postgresql-$FROM_PG_MAJOR=$TIMESCALEDB_VERSION* timescaledb-$TIMESCALEDB_MAJOR-loader-postgresql-$FROM_PG_MAJOR=$TIMESCALEDB_VERSION* && \
     apt-get install -y timescaledb-$TIMESCALEDB_MAJOR-postgresql-$TO_PG_MAJOR=$TIMESCALEDB_VERSION* timescaledb-$TIMESCALEDB_MAJOR-loader-postgresql-$TO_PG_MAJOR=$TIMESCALEDB_VERSION*
 
+RUN for file in $(find /usr/share/postgresql -name 'postgresql.conf.sample'); do \
+    # We want timescaledb to be loaded in this image by every created cluster
+    sed -r -i "s/[#]*\s*(shared_preload_libraries)\s*=\s*'(.*)'/\1 = 'timescaledb,\2'/;s/,'/'/" "$file"; \
+done
+
 # Install PostGIS extension in both versions of Postgres
 RUN apt update
 RUN \