diff --git a/docker-compose.yml b/docker-compose.yml
index 59e0e549680..9f91268051a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,14 +1,18 @@
 version: '2'
 services:
   db:
+    restart: always
     image: postgres
   redis:
+    restart: always
     image: redis
   neo4j:
+    restart: always
     build:
       context: .
       dockerfile: Dockerfile.neo4j
   web:
+    restart: always
     build:
       context: .
       dockerfile: Dockerfile.app
@@ -24,6 +28,7 @@ services:
       - ./public/assets:/mastodon/public/assets
       - ./public/system:/mastodon/public/system
   sidekiq:
+    restart: always
     build:
       context: .
       dockerfile: Dockerfile.app