diff --git a/roles/synapse/handlers/main.yml b/roles/synapse/handlers/main.yml
index 7a14c35..2bb3edc 100644
--- a/roles/synapse/handlers/main.yml
+++ b/roles/synapse/handlers/main.yml
@@ -1,4 +1,5 @@
 - name: restart synapse
+  listen: certificate changed
   service:
     name: synapse
     state: restarted
diff --git a/roles/synapse/meta/main.yml b/roles/synapse/meta/main.yml
new file mode 100644
index 0000000..0b72f2d
--- /dev/null
+++ b/roles/synapse/meta/main.yml
@@ -0,0 +1,9 @@
+dependencies:
+- role: cert
+  vars:
+    cert_src: '{{ matrix_tls_cert }}'
+    cert_dest: /etc/pki/tls/certs/{{ matrix_tls_cert|basename }}
+    cert_key_src: '{{ matrix_tls_key }}'
+    cert_key_dest: /etc/pki/tls/private/{{ matrix_tls_key|basename }}
+  when: matrix_tls_cert is defined
+  tags: synapse
diff --git a/synapse.yml b/synapse.yml
index bcd1691..8ce42af 100644
--- a/synapse.yml
+++ b/synapse.yml
@@ -2,13 +2,6 @@
   vars_files:
   - vault/synapse/{{ matrix_server_name }}
   roles:
-  - role: cert
-    cert_src: '{{ matrix_tls_cert }}'
-    cert_dest: /etc/pki/tls/certs/{{ matrix_tls_cert|basename }}
-    cert_key_src: '{{ matrix_tls_key }}'
-    cert_key_dest: /etc/pki/tls/private/{{ matrix_tls_key|basename }}
-    when: matrix_tls_cert is defined
-    tags: cert
   - apache
   - synapse
   tasks: