diff --git a/docker-compose.yml b/docker-compose.yml
index ea2862b..f09b2b1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,16 @@
 services:
-
   synapse:
     image: docker.io/matrixdotorg/synapse:v1.127.0@sha256:264746a8c0297d9c0d8d42425c6eaae6f53f27b015476a2f8474cd36fc19a93a
     restart: unless-stopped
     environment:
       - SYNAPSE_CONFIG_PATH=/data/homeserver.yaml
     volumes:
-      - synapse_data:/data
+      - data:/data
       - uploads:/data/uploads
       - media:/data/media
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.matrix.rule=Host(`${DC_MATRIX_SYNAPSE_HOSTNAME:?}`)"
+      - "traefik.http.routers.matrix.rule=Host(`${DC_MATRIX_HOSTNAME:?}`)"
       - "traefik.http.routers.matrix.entrypoints=websecure"
     depends_on:
       - db
@@ -19,25 +18,6 @@ services:
       - traefik
       - matrix
 
-  mas:
-    image: ghcr.io/element-hq/matrix-authentication-service:latest
-    restart: unless-stopped
-    volumes:
-      - mas_data:/data
-    environment:
-      - MAS_CONFIG=/data/config.yaml
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.mas.entrypoints=websecure"
-      - "traefik.http.routers.mas.priority=200"
-      - "traefik.http.routers.mas.rule=Host(`${DC_MATRIX_MAS_HOSTNAME:?}`) || (Host(`${DC_MATRIX_SYNAPSE_HOSTNAME:?}`) && PathRegexp(`/_matrix/client/.*/(login|logout|refresh)`))"
-      - "traefik.http.services.mas.loadbalancer.server.port=8080"
-    networks:
-      - traefik
-      - matrix
-    depends_on:
-      - db
-
   db:
     image: postgres:17.4@sha256:7f29c02ba9eeff4de9a9f414d803faa0e6fe5e8d15ebe217e3e418c82e652b35
     restart: unless-stopped
@@ -90,8 +70,7 @@ services:
   #     - synapse
 
 volumes:
-  mas_data:
-  synapse_data:
+  data:
   uploads:
   media:
   schemas: