diff --git a/roles/matrix-common-after/tasks/main.yml b/roles/matrix-common-after/tasks/main.yml
index 3b5c5428..ea829fee 100644
--- a/roles/matrix-common-after/tasks/main.yml
+++ b/roles/matrix-common-after/tasks/main.yml
@@ -1,4 +1,8 @@
 - import_tasks: "{{ role_path }}/tasks/start.yml"
   when: run_start
   tags:
-    - start
\ No newline at end of file
+    - start
+
+- import_tasks: "{{ role_path }}/tasks/stop.yml"
+  tags:
+    - stop
diff --git a/roles/matrix-common-after/tasks/stop.yml b/roles/matrix-common-after/tasks/stop.yml
new file mode 100644
index 00000000..5ae0afbb
--- /dev/null
+++ b/roles/matrix-common-after/tasks/stop.yml
@@ -0,0 +1,7 @@
+---
+
+- name: Ensure Matrix services stopped
+  service:
+    name: "{{ item }}"
+    state: stopped
+  with_items: "{{ matrix_systemd_services_list }}"