diff --git a/docs/maintenance-and-troubleshooting.md b/docs/maintenance-and-troubleshooting.md
index bccf3e2ee..ae90fba23 100644
--- a/docs/maintenance-and-troubleshooting.md
+++ b/docs/maintenance-and-troubleshooting.md
@@ -33,6 +33,12 @@ matrix_synapse_root_log_level: "INFO"
 
 Re-run the playbook after making these configuration changes.
 
+## Remove unused Docker data
+
+You can free some disk space from Docker, see [docker system prune](https://docs.docker.com/engine/reference/commandline/system_prune/) for more information.
+```bash
+ansible-playbook -i inventory/hosts setup.yml --tags=run-docker-prune
+```
 
 ## Postgres
 
diff --git a/roles/matrix-common-after/tasks/main.yml b/roles/matrix-common-after/tasks/main.yml
index 197ab6a9d..d77d56a18 100644
--- a/roles/matrix-common-after/tasks/main.yml
+++ b/roles/matrix-common-after/tasks/main.yml
@@ -11,3 +11,7 @@
 - import_tasks: "{{ role_path }}/tasks/dump_runtime_results.yml"
   tags:
     - always
+
+- import_tasks: "{{ role_path }}/tasks/run_docker_prune.yml"
+  tags:
+    - run-docker-prune
diff --git a/roles/matrix-common-after/tasks/run_docker_prune.yml b/roles/matrix-common-after/tasks/run_docker_prune.yml
new file mode 100644
index 000000000..a7e35a03b
--- /dev/null
+++ b/roles/matrix-common-after/tasks/run_docker_prune.yml
@@ -0,0 +1,4 @@
+---
+
+- name: Run Docker System Prune
+  command: "{{ matrix_host_command_docker }} system prune -a -f"