diff --git a/templates/compose/mautic4.yaml b/templates/compose/mautic4.yaml
index f1e567453..68aa11bc1 100644
--- a/templates/compose/mautic4.yaml
+++ b/templates/compose/mautic4.yaml
@@ -2,7 +2,7 @@
 # slogan: Mautic v4 Open Source Marketing Automation
 # tags: php,mautic,marketing,automation,email,service,4,open,source,crm
 # logo: svgs/mautic.svg
-# port: 8880
+# port: 80
 
 services:
   rabbitmq:
@@ -16,31 +16,37 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: ${SERVICE_PASSWORD_64_MYSQL}
     volumes:
-      - database:/var/lib/mysql
+      - mautic-database-data:/var/lib/mysql
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci --sql-mode=""
-  mautic:
-    image: mautic/mautic:v4-fpm
-    volumes:
-      - mautic_data:/var/www/html
-    environment:
-      - SERVICE_FQDN_MAUTIC_80
-      - MAUTIC_DB_HOST=database
-      - MAUTIC_DB_USER=root
-      - MAUTIC_DB_PASSWORD=${SERVICE_PASSWORD_64_MYSQL}
-      - MAUTIC_DB_NAME=mautic4
-      - MAUTIC_RUN_MIGRATIONS=true
-      - MAUTIC_RUN_CRON_JOBS=false
-      - MAUTIC_RABIITMQ_HOST=rabbitmq
-      - MAUTIC_RABIITMQ_PORT=5672
-      - MAUTIC_RABIITMQ_USER=guest
-      - MAUTIC_RABIITMQ_PASSWORD=guest
-      - MAUTIC_RABIITMQ_VHOST=mautic
-      - MAUTIC_ADMIN_EMAIL=${MAUTIC_ADMIN_EMAIL}
-      - MAUTIC_ADMIN_PASSWORD=${SERVICE_PASSWORD_ADMIN}
-      - MAUTIC_ADMIN_FIRSTNAME=${MAUTIC_ADMIN_FIRSTNAME}
-      - MAUTIC_ADMIN_LASTNAME=${MAUTIC_ADMIN_LASTNAME}
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://127.0.0.1:80"]
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      interval: 2s
+      timeout: 10s
+      retries: 15
+
+  mautic:
+    image: mautic/mautic:v4-fpm
+    volumes:
+      - mautic-data:/var/www/html
+    environment:
+      - SERVICE_FQDN_MAUTIC_80
+      - MAUTIC_DB_HOST=database
+      - MAUTIC_DB_USER=${SERVICE_USER_MYSQL}
+      - MAUTIC_DB_PASSWORD=${SERVICE_PASSWORD_64_MYSQL}
+      - MAUTIC_DB_NAME=mautic4
+      - MAUTIC_RUN_MIGRATIONS=${MAUTIC_RUN_MIGRATIONS:-true}
+      - MAUTIC_RUN_CRON_JOBS=${MAUTIC_RUN_CRON_JOBS:-false}
+      - MAUTIC_RABIITMQ_HOST=rabbitmq
+      - MAUTIC_RABIITMQ_PORT=5672
+      - MAUTIC_RABIITMQ_USER=${SERVICE_USER_RABBITMQ}
+      - MAUTIC_RABIITMQ_PASSWORD=${SERVICE_PASSWORD_RABBITMQ}
+      - MAUTIC_RABIITMQ_VHOST=${RABBITMQ_DEFAULT_VHOST:-mautic}
+      - MAUTIC_ADMIN_EMAIL=${MAUTIC_ADMIN_EMAIL:-admin@example.com}
+      - MAUTIC_ADMIN_PASSWORD=${SERVICE_PASSWORD_ADMIN}
+      - MAUTIC_ADMIN_FIRSTNAME=${MAUTIC_ADMIN_FIRSTNAME:-Admin}
+      - MAUTIC_ADMIN_LASTNAME=${MAUTIC_ADMIN_LASTNAME:-User}
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://127.0.0.1:8880"]
       interval: 2s
       timeout: 10s
       retries: 15
diff --git a/templates/compose/mautic5.yaml b/templates/compose/mautic5.yaml
index 4cf7eef54..44daac3bd 100644
--- a/templates/compose/mautic5.yaml
+++ b/templates/compose/mautic5.yaml
@@ -2,10 +2,10 @@
 # slogan: Mautic v5 Open Source Marketing Automation
 # tags: php,mautic,marketing,automation,email,service,5,open,source,crm
 # logo: svgs/mautic.svg
-# port: 8880
+# port: 80
 
 services:
-  db:
+  mysql:
     image: 'mysql:8.0'
     environment:
       - 'MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_64_MYSQLROOT}'
@@ -24,12 +24,15 @@ services:
     image: 'rabbitmq:3'
     environment:
       - 'RABBITMQ_DEFAULT_VHOST=${RABBITMQ_DEFAULT_VHOST:-mautic}'
+    healthcheck:
+      test: rabbitmq-diagnostics -q ping
+      interval: 5s
+      timeout: 30s
+      retries: 10
     volumes:
       - 'rabbitmq-data:/var/lib/rabbitmq'
   mautic_web:
     image: 'mautic/mautic:latest'
-    ports:
-      - '8880:80'
     volumes:
       - 'mautic_data/config:/var/www/html/config:z'
       - 'mautic_data/logs:/var/www/html/var/logs:z'
@@ -43,7 +46,7 @@ services:
       - SERVICE_FQDN_MAUTIC_80
       - 'DOCKER_MAUTIC_LOAD_TEST_DATA=${MAUTIC_LOAD_TEST_DATA:-false}'
       - 'DOCKER_MAUTIC_RUN_MIGRATIONS=${MAUTIC_RUN_MIGRATIONS:-false}'
-      - 'MAUTIC_DB_HOST=${MYSQL_HOST:-db}'
+      - 'MAUTIC_DB_HOST=${MYSQL_HOST:-mysql}'
       - 'MAUTIC_DB_PORT=${MYSQL_PORT:-3306}'
       - 'MAUTIC_DB_DATABASE=${MYSQL_DATABASE:-mautic}'
       - 'MAUTIC_DB_USER=${SERVICE_USER_MYSQL}'
@@ -72,7 +75,7 @@ services:
       - 'mautic_data/cron:/opt/mautic/cron:z'
     environment:
       - DOCKER_MAUTIC_ROLE=mautic_cron
-      - 'MAUTIC_DB_HOST=${MYSQL_HOST:-db}'
+      - 'MAUTIC_DB_HOST=${MYSQL_HOST:-mysql}'
       - 'MAUTIC_DB_PORT=${MYSQL_PORT:-3306}'
       - 'MAUTIC_DB_DATABASE=${MYSQL_DATABASE:-mautic}'
       - 'MAUTIC_DB_USER=${SERVICE_USER_MYSQL}'
@@ -104,7 +107,7 @@ services:
       - 'mautic_data/cron:/opt/mautic/cron:z'
     environment:
       - DOCKER_MAUTIC_ROLE=mautic_worker
-      - 'MAUTIC_DB_HOST=${MYSQL_HOST:-db}'
+      - 'MAUTIC_DB_HOST=${MYSQL_HOST:-mysql}'
       - 'MAUTIC_DB_PORT=${MYSQL_PORT:-3306}'
       - 'MAUTIC_DB_DATABASE=${MYSQL_DATABASE:-mautic}'
       - 'MAUTIC_DB_USER=${SERVICE_USER_MYSQL}'