diff --git a/docker-compose.yml b/docker-compose.yml
index 57a3469..f9cae41 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,7 +35,8 @@ services:
     # Only enable automatic restarts once your installation is properly
     # configured as it otherwise may get stuck in a restart loop:
     # https://docs.photoprism.org/getting-started/faq/#why-is-photoprism-getting-stuck-in-a-restart-loop
-    # restart: unless-stopped
+    restart: unless-stopped
+    container_name: photoprism_server
     security_opt:
       - seccomp:unconfined
       - apparmor:unconfined
@@ -85,6 +86,7 @@ services:
       - "./storage:/photoprism/storage"
 
   mariadb:
+    container_name: photoprism_db
     image: mariadb:10.5
     restart: unless-stopped
     security_opt:
@@ -98,11 +100,7 @@ services:
       MYSQL_DATABASE: photoprism
       MYSQL_USER: photoprism
       MYSQL_PASSWORD: insecure
-
-# Uncomment the following lines to upgrade automatically, whenever there is a new Docker image available:
-#
-#  watchtower:
-#    image: containrrr/watchtower
-#    restart: unless-stopped
-#    volumes:
-#      - "/var/run/docker.sock:/var/run/docker.sock"
+networks:
+  default:
+    external: true
+    name: gerbil_network