diff --git a/mastodon/db.env b/mastodon/db.env
index dbc5df1..07e0e76 100644
--- a/mastodon/db.env
+++ b/mastodon/db.env
@@ -2,14 +2,14 @@
 # There might be some fancy way to de-dupe this, i just sent it.
 # ----------
 DB_HOST=db
-DB_USER=mastodon
-DB_NAME=mastodon_production
+DB_USER=postgres
+DB_NAME=postgres
 DB_PASS=FsQH5cTo7DzuaJB6kggksZHWj6DgvySBBmnMrvQP
 DB_PORT=5432
 
 # Needed so that the pgsql container creates the expected roles and dbs for you
-POSTGRES_DB=mastodon_production
-POSTGRES_USER=mastodon
+POSTGRES_DB=postgres
+POSTGRES_USER=postgres
 POSTGRES_PASSWORD=FsQH5cTo7DzuaJB6kggksZHWj6DgvySBBmnMrvQP
 
 REDIS_URL=redis://redis:6379
\ No newline at end of file
diff --git a/mastodon/docker-compose.yml b/mastodon/docker-compose.yml
index aa27ec2..2ec66b1 100644
--- a/mastodon/docker-compose.yml
+++ b/mastodon/docker-compose.yml
@@ -12,6 +12,7 @@ services:
     env_file: db.env  
     environment:
       - 'POSTGRES_HOST_AUTH_METHOD=trust'
+      - 'POSTGRES_USER=postgres'
 
   redis:
     restart: always