diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml
new file mode 100644
index 00000000..0b19bf4a
--- /dev/null
+++ b/roles/docker/tasks/services/matrix_riot.yml
@@ -0,0 +1,35 @@
+---
+
+- name: matrix network
+  docker_network:
+    name: matrix
+
+- name: matrix database volume
+  docker_volume:
+    name: matrix_db
+
+- name: matrix container
+  docker_container:
+    name: matrix
+    image: matrixdotorg/synapse:latest
+    env:
+      SYNAPSE_SERVER_NAME: my.matrix.host
+      SYNAPSE_REPORT_STATS: no
+      SYNAPSE_ENABLE_REGISTRATION: yes
+      SYNAPSE_LOG_LEVEL: INFO
+      POSTGRES_PASSWORD: "{{ postgres_passwords.matrix }}"
+
+- name: matrix database container
+  docker_container:
+    name: matrix_db
+    image: postgres:10
+    state: started
+    restart_policy: always
+    networks:
+      - name: nextcloud
+    volumes:
+      - matrix_db:/var/lib/postgresql/data
+    env:
+      POSTGRES_DB: somethingelse
+      POSTGRES_USER: matrix
+      POSTGRES_PASSWORD: "{{ postgres_passwords.matrix }}"