diff --git a/roles/matrix/handlers/main.yml b/roles/matrix/handlers/main.yml
new file mode 100644
index 0000000..cd8cefa
--- /dev/null
+++ b/roles/matrix/handlers/main.yml
@@ -0,0 +1,9 @@
+#!/usr/bin/ansible-playbook
+# vim:ft=ansible:
+---
+- name: restart synapse
+  systemd:
+    daemon_reload: yes
+    name: matrix-synapse.service
+    state: restarted
+  become: yes
diff --git a/roles/matrix/tasks/main.yml b/roles/matrix/tasks/main.yml
index 0c8295c..1eb3ee1 100644
--- a/roles/matrix/tasks/main.yml
+++ b/roles/matrix/tasks/main.yml
@@ -21,6 +21,18 @@
               - "matrix-synapse-py3"
     - name: Set up Apache
       block:
+        - name: Template out config
+          template:
+            src: "apache2-matrix.conf"
+            dest: "/etc/apache2/conf-available/matrix.conf
+          notify: restart apache
+        - name: Enable configs
+          command:
+            cmd: a2enconf "{{ item }}"
+            creates: "/etc/apache2/conf-enabled/{{ item }}.load"
+          loop:
+            - matrix
+          notify: restart apache
         - name: Enable modules
           command:
             cmd: a2enmod "{{ item }}"
diff --git a/roles/matrix/templates/apache2-matrix.conf b/roles/matrix/templates/apache2-matrix.conf
new file mode 100644
index 0000000..71dfb95
--- /dev/null
+++ b/roles/matrix/templates/apache2-matrix.conf
@@ -0,0 +1,3 @@
+# Configuration for Matrix over Synapse
+# vim:ft=apache:
+Listen 8448
diff --git a/roles/matrix/templates/shared_secrets.yaml b/roles/matrix/templates/shared_secrets.yaml
new file mode 100644
index 0000000..e0e986e
--- /dev/null
+++ b/roles/matrix/templates/shared_secrets.yaml
@@ -0,0 +1,3 @@
+# This file contains shared secrets so you can leave them out of homeserver.yaml
+registration_shared_secret: {{ matrix_reg_secret.stdout }}
+turn_shared_secret: {{ matrix_turn_secret.stdout }}