diff --git a/docker-compose.yml b/docker-compose.yml
index 1991514424..be98d894e7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,16 +2,17 @@ version: '3'
 services:
   db:
     restart: always
-    image: postgres:14-alpine
+    image: postgres:15-alpine
     shm_size: 256mb
     networks:
       - internal_network
     healthcheck:
       test: ['CMD', 'pg_isready', '-U', 'postgres']
     volumes:
-      - ./data/postgres14:/var/lib/postgresql/data
+      - ./data/postgres.15:/var/lib/postgresql/data
     environment:
       - 'POSTGRES_HOST_AUTH_METHOD=trust'
+      - 'POSTGRES_USER=mastodon'
 
   redis:
     restart: always
@@ -21,7 +22,7 @@ services:
     healthcheck:
       test: ['CMD', 'redis-cli', 'ping']
     volumes:
-      - ./redis:/data
+      - ./data/redis:/data
 
   # es:
   #   restart: always
@@ -82,7 +83,7 @@ services:
       # - es
     volumes:
       - ./public/system:/mastodon/public/system
-      - ./data/postgres14:/var/lib/postgresql/data
+      # - ./data/postgres:/var/lib/postgresql/data
 
   streaming:
     build: .