diff --git a/compose.mailrelay.yml b/compose.mailrelay.yml
index eef92c5..86f144e 100644
--- a/compose.mailrelay.yml
+++ b/compose.mailrelay.yml
@@ -2,7 +2,7 @@
 version: "3.8"
  
 services:
-  wordpress:
+  app:
     entrypoint: /docker-entrypoint.sh
     environment:
       - SMTP_HOST=${SMTP_HOST}
diff --git a/compose.yml b/compose.yml
index eb93098..7a06f0e 100644
--- a/compose.yml
+++ b/compose.yml
@@ -2,7 +2,7 @@
 version: "3.8"
 
 services:
-  wordpress:
+  app:
     image: "wordpress:5.5.1"
     volumes:
       - "wordpress_content:/var/www/html/wp-content/"
@@ -10,13 +10,21 @@ services:
       - backend
       - proxy
     environment:
-      - WORDPRESS_DB_HOST=mariadb
+      - WORDPRESS_DB_HOST=db
       - WORDPRESS_DB_USER=wordpress
       - WORDPRESS_DB_PASSWORD_FILE=/run/secrets/db_password
       - WORDPRESS_DB_NAME=wordpress
       - WORDPRESS_CONFIG_EXTRA=${WORDPRESS_CONFIG_EXTRA}
     secrets:
       - db_password
+    depends_on:
+      - db
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 1m
     deploy:
       update_config:
         failure_action: rollback
@@ -33,7 +41,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
 
-  mariadb:
+  db:
     image: "mariadb:10.5"
     volumes:
       - "mariadb:/var/lib/mysql"