diff --git a/templates/compose/mattermost.yaml b/templates/compose/mattermost.yaml
index 2eda3e4f5..f53e1b499 100644
--- a/templates/compose/mattermost.yaml
+++ b/templates/compose/mattermost.yaml
@@ -1,4 +1,3 @@
-# ignore: true
 # documentation: https://docs.mattermost.com
 # slogan: Mattermost is an open source, self-hosted Slack-alternative.
 # tags: mattermost,slack,alternative
@@ -7,18 +6,26 @@
 
 services:
   mattermost:
-    image: mattermost/mattermost-team-edition:release-9
+    image: mattermost/mattermost-team-edition:release-10
+    platform: linux/amd64
     volumes:
       - mattermost-data:/mattermost
     environment:
-      - SERVICE_FQDN_MATTERMOST
+      - SERVICE_FQDN_MATTERMOST_8065
+      - MM_SERVICESETTINGS_SITEURL=${SERVICE_FQDN_MATTERMOST}
       - TZ=${TZ:-UTC}
       - MM_SQLSETTINGS_DRIVERNAME=postgres
       - MM_SQLSETTINGS_DATASOURCE=postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgres:5432/$POSTGRES_DB?sslmode=disable&connect_timeout=10
       - MM_BLEVESETTINGS_INDEXDIR=/mattermost/bleve-indexes
-      - MM_SERVICESETTINGS_SITEURL=$SERVICE_FQDN_MATTERMOST
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://127.0.0.1:8065"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+
   postgres:
     image: postgres:16-alpine
     volumes: