diff --git a/roles/matrix/tasks/common.yml b/roles/matrix/tasks/common.yml
index f1fb83d..5531ad7 100644
--- a/roles/matrix/tasks/common.yml
+++ b/roles/matrix/tasks/common.yml
@@ -12,3 +12,11 @@
     - '{{ matrix__lib_dir }}'
     - '{{ matrix__log_dir }}'
     - '{{ matrix__run_dir }}'
+
+- name: Recreate Matrix rundirs
+  template:
+    src: '../templates/tmpfiles.d/matrix.conf'
+    dest: '/etc/tmpfiles.d/matrix.conf'
+    mode: 'u=rw,g=r,o=r'
+    owner: root
+    group: root
diff --git a/roles/matrix/templates/tmpfiles.d/matrix.conf b/roles/matrix/templates/tmpfiles.d/matrix.conf
new file mode 100644
index 0000000..2ad0653
--- /dev/null
+++ b/roles/matrix/templates/tmpfiles.d/matrix.conf
@@ -0,0 +1,2 @@
+d {{ matrix__run_dir }} 0775 root root
+d {{ matrix__synapse__run_dir }} 0775 matrix-synapse matrix-synapse