diff --git a/docs/self-build.md b/docs/self-build.md
index b95f60a9b..44b660761 100644
--- a/docs/self-build.md
+++ b/docs/self-build.md
@@ -2,11 +2,11 @@
 
 The playbook supports the self building of a couple of components. This may be useful for architectures beside x86_64 that have no docker images right now (e g. the armv7 for the Raspberry Pi). Some roles have been updated, so they build the necessary image on the host. It needs more space, as some build tools need to be present (like Java, for mxisd).
 
-To use these modification there is a variable that needs to be switched to enable this functionality. Add this to your vars.yaml file:
-```
+To use these modification there is a variable that needs to be switched to enable this functionality. Add this to your `vars.yaml` file:
+```yaml
 matrix_container_images_self_build = true
 ```
-Setting that variable will self-build every role where applicable. Self-building can be set on a per-role basis as well.
+Setting that variable will self-build every role which supports self-building. Self-building can be set on a per-role basis as well.
 
 List of roles where self-building the docker image is currently possible:
 - synapse
diff --git a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
index c21ba216c..5a70c2e43 100644
--- a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
@@ -37,7 +37,7 @@
     force: "yes"
   when: "matrix_mautrix_facebook_enabled|bool and matrix_mautrix_facebook_container_image_self_build"
 
-- name: Ensure Mautrix Facebook Docker image is build
+- name: Ensure Mautrix Facebook Docker image is built
   docker_image:
     name: "{{ matrix_mautrix_facebook_docker_image }}"
     source: build
diff --git a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
index beed38a7b..db1fe736d 100644
--- a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
@@ -38,7 +38,7 @@
     force: "yes"
   when: "matrix_mautrix_hangouts_enabled|bool and matrix_mautrix_hangouts_container_image_self_build"
 
-- name: Ensure Mautrix Hangouts Docker image is build
+- name: Ensure Mautrix Hangouts Docker image is built
   docker_image:
     name: "{{ matrix_mautrix_hangouts_docker_image }}"
     source: build
diff --git a/roles/matrix-coturn/tasks/setup_coturn.yml b/roles/matrix-coturn/tasks/setup_coturn.yml
index bd6ef0c9e..d86e4b22f 100644
--- a/roles/matrix-coturn/tasks/setup_coturn.yml
+++ b/roles/matrix-coturn/tasks/setup_coturn.yml
@@ -31,7 +31,7 @@
     force: "yes"
   when: "matrix_coturn_enabled|bool and matrix_coturn_container_image_self_build"
 
-- name: Ensure Coturn Docker image is build
+- name: Ensure Coturn Docker image is built
   docker_image:
     name: "{{ matrix_coturn_docker_image }}"
     source: build
diff --git a/roles/matrix-riot-web/tasks/setup_riot_web.yml b/roles/matrix-riot-web/tasks/setup_riot_web.yml
index 2509dbc97..feccbe816 100644
--- a/roles/matrix-riot-web/tasks/setup_riot_web.yml
+++ b/roles/matrix-riot-web/tasks/setup_riot_web.yml
@@ -32,7 +32,7 @@
     force: "yes"
   when: "matrix_riot_web_enabled|bool and matrix_riot_web_container_image_self_build"
 
-- name: Ensure Riot Web Docker image is build
+- name: Ensure Riot Web Docker image is built
   docker_image:
     name: "{{ matrix_riot_web_docker_image }}"
     source: build
diff --git a/roles/matrix-synapse/tasks/synapse/setup_install.yml b/roles/matrix-synapse/tasks/synapse/setup_install.yml
index 41534d2b8..cf24cefb5 100644
--- a/roles/matrix-synapse/tasks/synapse/setup_install.yml
+++ b/roles/matrix-synapse/tasks/synapse/setup_install.yml
@@ -26,7 +26,7 @@
     force: "yes"
   when: "matrix_synapse_container_image_self_build"
 
-- name: Ensure Synapse Docker image is build
+- name: Ensure Synapse Docker image is built
   docker_image:
     name: "{{ matrix_synapse_docker_image }}"
     source: build