diff --git a/playbook.yml b/playbook.yml
index 6e09710..a5059d6 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -11,6 +11,6 @@
 #    - { role: cloud, tags: ["cloud"] }
     - { role: home_assistant, tags: ["home_assistant"] }
     - { role: n8n, tags: ["n8n"] }
-#    - { role: matrix, tags: ["matrix"] }
+    - { role: matrix, tags: ["matrix"] }
 #    - { role: iptables, tags: ["iptables"] }
 #    - { role: clean, tags: ["clean"] }
diff --git a/roles/home_assistant/templates/docker-compose.yml.j2 b/roles/home_assistant/templates/docker-compose.yml.j2
index 023944d..9a3ac01 100644
--- a/roles/home_assistant/templates/docker-compose.yml.j2
+++ b/roles/home_assistant/templates/docker-compose.yml.j2
@@ -21,6 +21,3 @@ services:
       - "traefik.http.routers.homeassistant-secure.tls.certresolver=sslResolver"
       # - "traefik.http.routers.homeassistant-secure.service=homeassistant"
       - "traefik.http.services.homeassistant.loadbalancer.server.port=8123"
-
-volumes:
-  home_assistant_config:
\ No newline at end of file
diff --git a/roles/matrix/templates/docker-compose.yml.j2 b/roles/matrix/templates/docker-compose.yml.j2
index 3410511..7e1d65e 100644
--- a/roles/matrix/templates/docker-compose.yml.j2
+++ b/roles/matrix/templates/docker-compose.yml.j2
@@ -7,7 +7,7 @@ services:
     networks:
       - internal
     volumes:
-      - db:/var/lib/postgresql/data
+      - {{ server.work_dir }}/matrix/db:/var/lib/postgresql/data
     environment:
       - POSTGRES_DB=synapse
       - POSTGRES_USER=synapse
@@ -23,10 +23,10 @@ services:
       - internal
       - proxy
     volumes:
-      - matrix:/data
-      - mautrix_facebook:/facebook_data
-      - mautrix_instagram:/instagram_data
-      - mautrix_discord:/discord_data
+      - {{ server.work_dir }}/matrix/base:/data
+      - {{ server.work_dir }}/matrix/mautrix_facebook:/facebook_data
+      - {{ server.work_dir }}/matrix/mautrix_instagram:/instagram_data
+      - {{ server.work_dir }}/matrix/mautrix_discord:/discord_data
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.matrix-secure.entrypoints=https"
@@ -56,12 +56,33 @@ services:
       - "traefik.http.routers.matrix-wellknown.middlewares=cors-headers@docker"
       - "traefik.docker.network=proxy"
 
-volumes:
-  db:
-  matrix:
-  mautrix_facebook:
-  mautrix_instagram:
-  mautrix_discord:
+  # BRIDGE
+  mautrix-facebook:
+    container_name: mautrix-facebook
+    image: dock.mau.dev/mautrix/facebook:v0.4.1
+    restart: unless-stopped
+    networks:
+      - internal
+    volumes:
+      - {{ server.work_dir }}/matrix/mautrix_facebook:/data
+
+  mautrix-instagram:
+    container_name: mautrix-instagram
+    image: dock.mau.dev/mautrix/instagram:v0.2.3
+    restart: unless-stopped
+    networks:
+      - internal
+    volumes:
+      - {{ server.work_dir }}/matrix/mautrix_instagram:/data
+
+  mautrix-discord:
+    container_name: mautrix-discord
+    image: dock.mau.dev/mautrix/discord:v0.2.0
+    restart: unless-stopped
+    networks:
+      - internal
+    volumes:
+      - {{ server.work_dir }}/matrix/mautrix_discord:/data
 
 networks:
   internal:
diff --git a/roles/n8n/templates/docker-compose.yml.j2 b/roles/n8n/templates/docker-compose.yml.j2
index d6b84a6..b2e2d32 100644
--- a/roles/n8n/templates/docker-compose.yml.j2
+++ b/roles/n8n/templates/docker-compose.yml.j2
@@ -40,10 +40,6 @@ services:
       - DB_POSTGRESDB_USER=n8n
       - DB_POSTGRESDB_PASSWORD=n8n
 
-volumes:
-  n8n:
-  db:
-
 networks:
   internal:
   proxy:
diff --git a/roles/protonmail/templates/docker-compose.yml.j2 b/roles/protonmail/templates/docker-compose.yml.j2
index 4ef7426..319305b 100644
--- a/roles/protonmail/templates/docker-compose.yml.j2
+++ b/roles/protonmail/templates/docker-compose.yml.j2
@@ -10,9 +10,6 @@ services:
     volumes:
       - {{ server.work_dir }}/protonmail/base:/root
 
-volumes:
-  protonmail:
-
 networks:
   protonmail:
       external: true