diff --git a/playbook.yml b/playbook.yml
index ccc7aa0d..304b6ff8 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -16,6 +16,7 @@
       - passit
       - gitea
       - postfix
+      - matrix_riot
 
     smtp_host: postfix
     smtp_port: 587
diff --git a/roles/docker/files/configs/riot-config.json b/roles/docker/files/configs/riot-config.json
index dd259d48..c3b5ca7c 100644
--- a/roles/docker/files/configs/riot-config.json
+++ b/roles/docker/files/configs/riot-config.json
@@ -27,11 +27,11 @@
     "piwik": false,
     "roomDirectory": {
         "servers": [
-            "matrix.data.coop"
+            "{{ base_domain }}"
         ]
     },
     "enable_presence_by_hs_url": {
-        "https://matrix.data.coop": false
+        "https://{{ matrix.domain }}": false
     },
     "terms_and_conditions_links": [
         {
diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml
index 8d7afa65..97789968 100644
--- a/roles/docker/tasks/services/matrix_riot.yml
+++ b/roles/docker/tasks/services/matrix_riot.yml
@@ -44,9 +44,10 @@
     networks:
       - name: matrix
     published_ports:
+      - 8008:8008
       - 8448:8448
     env:
-      SYNAPSE_SERVER_NAME: "{{ matrix.domain }}"
+      SYNAPSE_SERVER_NAME: "{{ base_domain }}"
       SYNAPSE_REPORT_STATS: "False"
       SYNAPSE_ENABLE_REGISTRATION: "True"
       SYNAPSE_LOG_LEVEL: "INFO"