diff --git a/contrib/docker/conf/homeserver.yaml b/contrib/docker/conf/homeserver.yaml
index e5d3f965e..1ca1fe991 100644
--- a/contrib/docker/conf/homeserver.yaml
+++ b/contrib/docker/conf/homeserver.yaml
@@ -50,9 +50,9 @@ listeners:
 database:
   name: "psycopg2"
   args:
-    user: "{{ POSTGRES_USER or "matrix" }}"
+    user: "{{ POSTGRES_USER or "synapse" }}"
     password: "{{ POSTGRES_PASSWORD }}"
-    database: "{{ POSTGRES_DB or "matrix" }}"
+    database: "{{ POSTGRES_DB or "synapse" }}"
     host: "{{ POSTGRES_HOST or "db" }}"
     port: "{{ POSTGRES_PORT or "5432" }}"
     cp_min: 5
diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
index 3d0b3c0ea..e447bf121 100644
--- a/contrib/docker/docker-compose.yml
+++ b/contrib/docker/docker-compose.yml
@@ -38,7 +38,7 @@ services:
     image: postgres:10-alpine
     # Change that password, of course!
     environment:
-      - POSTGRES_USER=matrix
+      - POSTGRES_USER=synapse
       - POSTGRES_PASSWORD=changeme
     volumes:
       # You may store the database tables in a local folder..