diff --git a/roles/web-app-matrix/tasks/main.yml b/roles/web-app-matrix/tasks/main.yml
index bd96fe46..6e39011e 100644
--- a/roles/web-app-matrix/tasks/main.yml
+++ b/roles/web-app-matrix/tasks/main.yml
@@ -57,7 +57,7 @@
 # The following taks are necessary because a clean setup is necessary
 - name: shut down docker compose project 
   command:
-    cmd: docker-compose -p "{{application_id}}" down
+    cmd: docker-compose -p "{{ matrix_project }}" down
     chdir: "{{ docker_compose.directories.instance }}"
 
 - name: "cleanup project folder"
@@ -112,13 +112,13 @@
 # @todo This should be moved to update-docker
 - name: docker compose pull
   command:
-    cmd: docker-compose -p "{{application_id}}" pull
+    cmd: docker-compose -p "{{ matrix_project }}" pull
     chdir: "{{docker_compose.directories.instance}}"
   when: mode_update | bool
 
 - name: docker compose up
   command:
-    cmd: "docker-compose -p {{application_id}} up -d --remove-orphans"
+    cmd: "docker-compose -p {{ matrix_project }} up -d --remove-orphans"
     chdir: "{{docker_compose.directories.instance}}"
   environment:
     COMPOSE_HTTP_TIMEOUT:   600
diff --git a/roles/web-app-matrix/vars/main.yml b/roles/web-app-matrix/vars/main.yml
index a1cb9284..9899d46e 100644
--- a/roles/web-app-matrix/vars/main.yml
+++ b/roles/web-app-matrix/vars/main.yml
@@ -9,4 +9,5 @@ matrix_synapse_name:      "{{ applications | get_app_conf(application_id, 'docke
 matrix_synapse_data:      "{{ applications | get_app_conf(application_id, 'docker.volumes.synapse', True) }}"
 matrix_element_version:   "{{ applications | get_app_conf(application_id, 'docker.services.element.version', True) }}"
 matrix_element_image:     "{{ applications | get_app_conf(application_id, 'docker.services.element.image', True) }}"
-matrix_element_name:      "{{ applications | get_app_conf(application_id, 'docker.services.element.name', True) }}"
\ No newline at end of file
+matrix_element_name:      "{{ applications | get_app_conf(application_id, 'docker.services.element.name', True) }}"
+matrix_project:           "{{application_id | get_entity_name }}"
\ No newline at end of file