diff --git a/docker/images/docker-compose.yaml b/docker/images/docker-compose.yaml
index fd283ad33..8b0f671c9 100644
--- a/docker/images/docker-compose.yaml
+++ b/docker/images/docker-compose.yaml
@@ -36,6 +36,7 @@ services:
 
   penpot-frontend:
     image: "penpotapp/frontend:latest"
+    restart: always
     ports:
       - 9001:80
 
@@ -96,6 +97,8 @@ services:
 
   penpot-backend:
     image: "penpotapp/backend:latest"
+    restart: always
+
     volumes:
       - penpot_assets:/opt/data/assets
 
@@ -214,6 +217,7 @@ services:
 
   penpot-exporter:
     image: "penpotapp/exporter:latest"
+    restart: always
     networks:
       - penpot
 
@@ -268,6 +272,7 @@ services:
   # minio:
   #   image: "minio/minio:latest"
   #   command: minio server /mnt/data --console-address ":9001"
+  #   restart: always
   #
   #   volumes:
   #     - "penpot_minio:/mnt/data"