diff --git a/.examples/docker-compose/insecure/postgres/apache/db.env b/.examples/docker-compose/insecure/postgres/apache/db.env
index 41106cab132127a92e68a17cd4c1c344edde179b..dd2a4610870fccbb093c30d465c4925247b274b8 100644
--- a/.examples/docker-compose/insecure/postgres/apache/db.env
+++ b/.examples/docker-compose/insecure/postgres/apache/db.env
@@ -1,3 +1,2 @@
 POSTGRES_PASSWORD=
-POSTGRES_DB=nextcloud
-POSTGRES_USER=nextcloud
+POSTGRES_USER=postgres
diff --git a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
index 596568d69c92d720857be9f2fc4befd677480696..159a17b1bfd0e712a2f88e140b0fafbcd50a84c3 100644
--- a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
@@ -18,6 +18,7 @@ services:
       - nextcloud:/var/www/html
     environment:
       - POSTGRES_HOST=db
+      - POSTGRES_DB=nextcloud
     env_file:
       - db.env
     depends_on:
diff --git a/.examples/docker-compose/insecure/postgres/fpm/db.env b/.examples/docker-compose/insecure/postgres/fpm/db.env
index 41106cab132127a92e68a17cd4c1c344edde179b..dd2a4610870fccbb093c30d465c4925247b274b8 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/db.env
+++ b/.examples/docker-compose/insecure/postgres/fpm/db.env
@@ -1,3 +1,2 @@
 POSTGRES_PASSWORD=
-POSTGRES_DB=nextcloud
-POSTGRES_USER=nextcloud
+POSTGRES_USER=postgres
diff --git a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
index b1ff459c4f2935f71daaa036923012ff5990bd2a..113cf66defda2a5962e551b127d0fe85b4d2ed83 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
@@ -16,6 +16,7 @@ services:
       - nextcloud:/var/www/html
     environment:
       - POSTGRES_HOST=db
+      - POSTGRES_DB=nextcloud
     env_file:
       - db.env
     depends_on:
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/db.env b/.examples/docker-compose/with-nginx-proxy/postgres/apache/db.env
index 41106cab132127a92e68a17cd4c1c344edde179b..dd2a4610870fccbb093c30d465c4925247b274b8 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/db.env
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/db.env
@@ -1,3 +1,2 @@
 POSTGRES_PASSWORD=
-POSTGRES_DB=nextcloud
-POSTGRES_USER=nextcloud
+POSTGRES_USER=postgres
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
index 2e40e8d7e250ca325575ffbd64ed48d43d71e40c..78e34d91a090419f791e58bff6303ab46d9325e0 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
@@ -19,6 +19,7 @@ services:
       - LETSENCRYPT_HOST=
       - LETSENCRYPT_EMAIL=
       - POSTGRES_HOST=db
+      - POSTGRES_DB=nextcloud
     env_file:
       - db.env
     depends_on:
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/db.env b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/db.env
index 41106cab132127a92e68a17cd4c1c344edde179b..dd2a4610870fccbb093c30d465c4925247b274b8 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/db.env
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/db.env
@@ -1,3 +1,2 @@
 POSTGRES_PASSWORD=
-POSTGRES_DB=nextcloud
-POSTGRES_USER=nextcloud
+POSTGRES_USER=postgres
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
index 39e85f719f1d75f2f0ce630a26f62a2c5bbeb33d..371494ae7f4e37a263a86464e4d6ab3e58a931cc 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
@@ -16,6 +16,7 @@ services:
       - nextcloud:/var/www/html
     environment:
       - POSTGRES_HOST=db
+      - POSTGRES_DB=nextcloud
     env_file:
       - db.env
     depends_on: