diff --git a/bxl-shp/apps/docker-compose.matrix.yaml b/bxl-shp/apps/docker-compose.matrix.yaml
index 78a0917..4d1e3bf 100644
--- a/bxl-shp/apps/docker-compose.matrix.yaml
+++ b/bxl-shp/apps/docker-compose.matrix.yaml
@@ -41,6 +41,26 @@ services:
     networks:
     - external
 
+  matrix-maubot:
+    container_name: matrix-maubot
+    image: dock.mau.dev/maubot/maubot:latest
+    restart: unless-stopped
+    environment:
+    - TZ=Europe/Paris
+    volumes:
+    - $DATA/matrix/maubot:/data
+    labels:
+    - "traefik.enable=true"
+    - "traefik.http.routers.matrix-maubot.rule=Host(`maubot.bhasher.com`)"
+    - "traefik.http.routers.matrix-maubot.tls=true"
+    - "traefik.http.routers.matrix-maubot.tls.certresolver=http"
+    - "traefik.http.routers.matrix-maubot.entrypoints=internalsecure"
+    - "traefik.http.services.matrix-maubot.loadbalancer.server.port=29316"
+    networks:
+    - external
+    - storage
+    - matrix
+
   #mautrix-slack:
   #  container_name: mautrix-slack
   #  image: dock.mau.dev/mautrix/slack:latest
@@ -56,3 +76,5 @@ networks:
   matrix:
   external:
     external: true
+  storage:
+    external: true