diff --git a/docker-compose.yml b/docker-compose.yml
index 2a0af4d7e2963457d3b5f1d11779be7912c10e1a..5e56844dcef9c5453c033c47bc71a003e433410f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,8 @@ services:
     image: postgres:alpine
     networks:
     - back
+    volumes:
+    - ./data/postgres:/var/lib/postgresql/data
   redis:
     restart: always
     image: redis:alpine
@@ -18,7 +20,7 @@ services:
   web:
     image: nginx
     volumes:
-    - ./nginx.conf:/etc/nginx/nginx.comf
+    - ./nginx.conf:/etc/nginx/nginx.conf
     volumes_from:
     - app
     depends_on:
@@ -27,12 +29,11 @@ services:
     networks:
     - back
     - lb_web
-    env:
+    environment:
     - VIRTUAL_HOST
   app:
     restart: always
-    build: .
-    image: tootsuite/mastodon
+    image: gargron/mastodon
     env_file: .env.production
     command: bundle exec rails s -p 3000 -b '0.0.0.0'
     depends_on:
@@ -41,12 +42,12 @@ services:
     volumes:
     - ./public/assets:/mastodon/public/assets
     - ./public/system:/mastodon/public/system
+    - /mastodon/public
     networks:
     - back
   streaming:
     restart: always
-    build: .
-    image: tootsuite/mastodon
+    image: gargron/mastodon
     env_file: .env.production
     command: npm run start
     depends_on:
@@ -56,8 +57,7 @@ services:
     - back
   sidekiq:
     restart: always
-    build: .
-    image: tootsuite/mastodon
+    image: gargron/mastodon
     env_file: .env.production
     command: bundle exec sidekiq -q default -q mailers -q pull -q push
     depends_on:
@@ -67,4 +67,3 @@ services:
     - ./public/system:/mastodon/public/system
     networks:
     - back
-