diff --git a/defaults/main.yml b/defaults/main.yml
index e95ca13..9555c19 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -15,3 +15,4 @@ matrix_synapse_docker_ports: ["8008:8008", "8448:8448"]
 matrix_synapse_docker_labels: {}
 matrix_synapse_extra_docker_volumes: []
 matrix_synapse_container_ref: "docker.io/matrixdotorg/synapse"
+matrix_synapse_container_name: "synapse"
diff --git a/handlers/main.yml b/handlers/main.yml
index 937962a..0c28982 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -13,7 +13,7 @@
 
 - name: "restart synapse using docker"
   docker_container:
-    name: synapse
+    name: "{{ matrix_synapse_container_name }}"
     state: started
     restart: yes
   when: matrix_synapse_supervision_method == "docker"
diff --git a/tasks/deployment.yml b/tasks/deployment.yml
index 87c100f..1919eae 100644
--- a/tasks/deployment.yml
+++ b/tasks/deployment.yml
@@ -55,7 +55,7 @@
 
 - name: install synapse with docker
   docker_container:
-    name: synapse
+    name: "{{ matrix_synapse_container_name }}"
     image: "{{ matrix_synapse_container_ref }}:{{ matrix_synapse_version }}"
     ports: "{{ matrix_synapse_docker_ports }}"
     labels: "{{ matrix_synapse_docker_labels }}"