diff --git a/photoprism/compose.yml b/photoprism/compose.yml
index f181c64..6a57efd 100644
--- a/photoprism/compose.yml
+++ b/photoprism/compose.yml
@@ -4,7 +4,7 @@ services:
     container_name: photoprism
     image: photoprism/photoprism:latest
     ## Don't enable automatic restarts until PhotoPrism has been properly configured and tested!
-    restart: unless-stopped
+    restart: always
     stop_grace_period: 10s
     depends_on:
       - photoprism-mariadb
@@ -53,7 +53,7 @@ services:
   photoprism-mariadb:
     container_name: photoprism-mariadb
     image: mariadb:10.11
-    restart: unless-stopped
+    restart: always
     stop_grace_period: 5s
     security_opt:
       - seccomp:unconfined