diff --git a/i18n/translation-templates/README.pot b/i18n/translation-templates/README.pot
index b890d96fe..5dde2c52c 100644
--- a/i18n/translation-templates/README.pot
+++ b/i18n/translation-templates/README.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: matrix-docker-ansible-deploy \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-07-12 11:50+0000\n"
+"POT-Creation-Date: 2026-07-12 13:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -288,11 +288,23 @@ msgstr ""
 msgid "[Link](docs/configuring-playbook-client-fluffychat-web.md)"
 msgstr ""
 
-#: ../../../README.md:72
+#: ../../../README.md:0
+msgid "[Commet](https://github.com/commetchat/commet)"
+msgstr ""
+
+#: ../../../README.md:0
+msgid "Matrix web client"
+msgstr ""
+
+#: ../../../README.md:0
+msgid "[Link](docs/configuring-playbook-client-commet.md)"
+msgstr ""
+
+#: ../../../README.md:73
 msgid "Server Components"
 msgstr ""
 
-#: ../../../README.md:74
+#: ../../../README.md:75
 msgid "Services that run on the server to make the various parts of your installation work."
 msgstr ""
 
@@ -380,11 +392,11 @@ msgstr ""
 msgid "[Link](docs/configuring-playbook-matrix-rtc.md)"
 msgstr ""
 
-#: ../../../README.md:86
+#: ../../../README.md:87
 msgid "Authentication"
 msgstr ""
 
-#: ../../../README.md:88
+#: ../../../README.md:89
 msgid "Extend and modify how users are authenticated on your homeserver."
 msgstr ""
 
@@ -448,11 +460,11 @@ msgstr ""
 msgid "[Link](docs/configuring-playbook-synapse-simple-antispam.md)"
 msgstr ""
 
-#: ../../../README.md:98
+#: ../../../README.md:99
 msgid "File Storage"
 msgstr ""
 
-#: ../../../README.md:100
+#: ../../../README.md:101
 msgid "Use alternative file storage to the default `media_store` folder."
 msgstr ""
 
@@ -488,11 +500,11 @@ msgstr ""
 msgid "[Link](docs/configuring-playbook-matrix-media-repo.md)"
 msgstr ""
 
-#: ../../../README.md:108
+#: ../../../README.md:109
 msgid "Bridges"
 msgstr ""
 
-#: ../../../README.md:110
+#: ../../../README.md:111
 msgid "Bridges can be used to connect your Matrix installation with third-party communication networks."
 msgstr ""
 
@@ -796,11 +808,11 @@ msgstr ""
 msgid "[Link](docs/configuring-playbook-bridge-postmoogle.md)"
 msgstr ""
 
-#: ../../../README.md:140
+#: ../../../README.md:141
 msgid "Bots"
 msgstr ""
 
-#: ../../../README.md:142
+#: ../../../README.md:143
 msgid "Bots provide various additional functionality to your installation."
 msgstr ""
 
@@ -888,11 +900,11 @@ msgstr ""
 msgid "[Link](docs/configuring-playbook-bot-buscarron.md)"
 msgstr ""
 
-#: ../../../README.md:154
+#: ../../../README.md:155
 msgid "Administration"
 msgstr ""
 
-#: ../../../README.md:156
+#: ../../../README.md:157
 msgid "Services that help you in administrating and monitoring your Matrix installation."
 msgstr ""
 
@@ -980,11 +992,11 @@ msgstr ""
 msgid "[Link](docs/configuring-playbook-synapse-usage-exporter.md)"
 msgstr ""
 
-#: ../../../README.md:168
+#: ../../../README.md:169
 msgid "Misc"
 msgstr ""
 
-#: ../../../README.md:170
+#: ../../../README.md:171
 msgid "Various services that don't fit any other categories."
 msgstr ""
 
@@ -1108,54 +1120,54 @@ msgstr ""
 msgid "[Link](docs/configuring-playbook-element-call.md)"
 msgstr ""
 
-#: ../../../README.md:185
+#: ../../../README.md:186
 msgid "🆕 Changes"
 msgstr ""
 
-#: ../../../README.md:187
+#: ../../../README.md:188
 msgid "This playbook evolves over time, sometimes with backward-incompatible changes."
 msgstr ""
 
-#: ../../../README.md:189
+#: ../../../README.md:190
 msgid "When updating the playbook, refer to [the changelog](CHANGELOG.md) to catch up with what's new."
 msgstr ""
 
-#: ../../../README.md:191
+#: ../../../README.md:192
 msgid "🆘 Support"
 msgstr ""
 
-#: ../../../README.md:193
+#: ../../../README.md:194
 msgid "Matrix room: [#matrix-docker-ansible-deploy:devture.com](https://matrix.to/#/#matrix-docker-ansible-deploy:devture.com)"
 msgstr ""
 
-#: ../../../README.md:195
+#: ../../../README.md:196
 msgid "IRC channel: `#matrix-docker-ansible-deploy` on the [Libera Chat](https://libera.chat/) IRC network (irc.libera.chat:6697)"
 msgstr ""
 
-#: ../../../README.md:197
+#: ../../../README.md:198
 msgid "GitHub issues: [spantaleev/matrix-docker-ansible-deploy/issues](https://github.com/spantaleev/matrix-docker-ansible-deploy/issues)"
 msgstr ""
 
-#: ../../../README.md:199
+#: ../../../README.md:200
 msgid "🌐 Translation"
 msgstr ""
 
-#: ../../../README.md:201
+#: ../../../README.md:202
 msgid "See the [i18n/README.md](i18n/README.md) file for more information about translation."
 msgstr ""
 
-#: ../../../README.md:203
+#: ../../../README.md:204
 msgid "Translations are still work in progress."
 msgstr ""
 
-#: ../../../README.md:205
+#: ../../../README.md:206
 msgid "🤝 Related"
 msgstr ""
 
-#: ../../../README.md:207
+#: ../../../README.md:208
 msgid "You may also be interested in [mash-playbook](https://github.com/mother-of-all-self-hosting/mash-playbook) - another Ansible playbook for self-hosting non-Matrix services (see its [List of supported services](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/supported-services.md))."
 msgstr ""
 
-#: ../../../README.md:209
+#: ../../../README.md:210
 msgid "mash-playbook also makes use of [Traefik](./docs/configuring-playbook-traefik.md) as its reverse-proxy, so with minor [interoperability adjustments](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/interoperability.md), you can make matrix-docker-ansible-deploy and mash-playbook co-exist and host Matrix and non-Matrix services on the same server."
 msgstr ""
diff --git a/i18n/translation-templates/docs/configuring-playbook-client-commet.pot b/i18n/translation-templates/docs/configuring-playbook-client-commet.pot
new file mode 100644
index 000000000..b2827880d
--- /dev/null
+++ b/i18n/translation-templates/docs/configuring-playbook-client-commet.pot
@@ -0,0 +1,141 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2018-2026, Slavi Pantaleev, Aine Etke, MDAD community members
+# This file is distributed under the same license as the matrix-docker-ansible-deploy package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: matrix-docker-ansible-deploy \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2026-07-12 13:53+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../../docs/configuring-playbook-client-commet.md:7
+msgid "Setting up Commet (optional)"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:9
+msgid "The playbook can install and configure the [Commet](https://github.com/commetchat/commet) Matrix web client for you."
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:11
+msgid "Adjusting DNS records"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:13
+msgid "By default, this playbook installs Commet on the `commet.` subdomain (`commet.example.com`) and requires you to create a CNAME record for `commet`, which targets `matrix.example.com`."
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:15
+msgid "When setting, replace `example.com` with your own."
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:17
+msgid "Adjusting the playbook configuration"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:19
+msgid "To enable Commet, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file:"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:25
+msgid "Adjusting the Commet URL (optional)"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:27
+msgid "By tweaking the `matrix_client_commet_hostname` and `matrix_client_commet_path_prefix` variables, you can easily make the service available at a **different hostname and/or path** than the default one."
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:29
+msgid "Example additional configuration for your `vars.yml` file:"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:40
+msgid "After changing the domain, **you may need to adjust your DNS** records to point the Commet domain to the Matrix server."
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:42
+msgid "If you've decided to reuse the `matrix.` domain, you won't need to do any extra DNS configuration."
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:44
+msgid "**Note**: `matrix_client_commet_path_prefix` must either be `/` or not end with a slash (e.g. `/commet`)."
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:46
+msgid "Adjusting the default homeserver (optional)"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:48
+msgid "Commet is configured with a `default_homeserver` value. By default, the playbook uses `matrix.org`."
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:50
+msgid "To change it, add the following configuration to your `vars.yml` file:"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:56
+msgid "Adjusting the Commet version/branch to build (optional)"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:58
+msgid "When self-building the container image (`matrix_client_commet_container_image_self_build: true`), the playbook checks out the Commet source repository and builds an image from it."
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:60
+msgid "To build from a different git branch/tag/SHA, set `matrix_client_commet_version` in your `vars.yml` file:"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:67
+msgid "**Note**: by default, the image tag is derived from `matrix_client_commet_version` (`localhost/matrix-client-commet:{{ matrix_client_commet_version }}`). If your branch name contains `/` (e.g. `feature/foo`), override `matrix_client_commet_container_image` (and optionally `matrix_client_commet_container_image_self_build_version_tag`) to a Docker-tag-safe value."
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:69
+msgid "Extending the configuration"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:71
+msgid "There are some additional things you may wish to configure about the component."
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:73
+msgid "Take a look at:"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:75
+msgid "`roles/custom/matrix-client-commet/defaults/main.yml` for some variables that you can customize via your `vars.yml` file"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:76
+msgid "`roles/custom/matrix-client-commet/templates/global_config.json.j2` for the component's default runtime configuration"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:78
+msgid "Installing"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:80
+msgid "After configuring the playbook and potentially [adjusting your DNS records](#adjusting-dns-records), run the playbook with [playbook tags](playbook-tags.md) as below:"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:87
+msgid "The shortcut commands with the [`just` program](just.md) are also available: `just install-all` or `just setup-all`"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:89
+msgid "`just install-all` is useful for maintaining your setup quickly ([2x-5x faster](../CHANGELOG.md#2x-5x-performance-improvements-in-playbook-runtime) than `just setup-all`) when its components remain unchanged. If you adjust your `vars.yml` to remove other components, you'd need to run `just setup-all`, or these components will still remain installed. Note these shortcuts run the `ensure-matrix-users-created` tag too."
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:91
+msgid "Troubleshooting"
+msgstr ""
+
+#: ../../../docs/configuring-playbook-client-commet.md:93
+msgid "As with all other services, you can find the logs in [systemd-journald](https://www.freedesktop.org/software/systemd/man/systemd-journald.service.html) by logging in to the server with SSH and running `journalctl -fu matrix-client-commet`."
+msgstr ""
diff --git a/i18n/translation-templates/docs/configuring-playbook.pot b/i18n/translation-templates/docs/configuring-playbook.pot
index e6d9486b8..c46310a90 100644
--- a/i18n/translation-templates/docs/configuring-playbook.pot
+++ b/i18n/translation-templates/docs/configuring-playbook.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: matrix-docker-ansible-deploy \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-07-12 11:50+0000\n"
+"POT-Creation-Date: 2026-07-12 13:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -184,410 +184,414 @@ msgstr ""
 msgid "[Setting up FluffyChat Web](configuring-playbook-client-fluffychat-web.md), if you've enabled [FluffyChat Web](https://github.com/krille-chan/fluffychat), a cute cross-platform messenger (web, iOS, Android) for Matrix written in [Flutter](https://flutter.dev/)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:99
-msgid "Authentication and user-related"
+#: ../../../docs/configuring-playbook.md:98
+msgid "[Setting up Commet](configuring-playbook-client-commet.md), if you've enabled [Commet](https://github.com/commetchat/commet), a Matrix web client"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:101
-msgid "Extend and modify how users are authenticated on your homeserver."
+msgid "Authentication and user-related"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:103
-msgid "[Setting up Matrix Authentication Service](configuring-playbook-matrix-authentication-service.md) (Next-generation auth for Matrix, based on OAuth 2.0/OIDC)"
+msgid "Extend and modify how users are authenticated on your homeserver."
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:105
-msgid "[Setting up Appservice Double Puppet](configuring-playbook-appservice-double-puppet.md)"
+msgid "[Setting up Matrix Authentication Service](configuring-playbook-matrix-authentication-service.md) (Next-generation auth for Matrix, based on OAuth 2.0/OIDC)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:107
-msgid "[Setting up Ketesa](configuring-playbook-ketesa.md)"
+msgid "[Setting up Appservice Double Puppet](configuring-playbook-appservice-double-puppet.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:109
-msgid "[Setting up the REST authentication password provider module](configuring-playbook-rest-auth.md) (advanced)"
+msgid "[Setting up Ketesa](configuring-playbook-ketesa.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:111
-msgid "[Setting up the Shared Secret Auth password provider module](configuring-playbook-shared-secret-auth.md) (advanced)"
+msgid "[Setting up the REST authentication password provider module](configuring-playbook-rest-auth.md) (advanced)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:113
-msgid "[Setting up the LDAP authentication password provider module](configuring-playbook-ldap-auth.md) (advanced)"
+msgid "[Setting up the Shared Secret Auth password provider module](configuring-playbook-shared-secret-auth.md) (advanced)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:115
-msgid "[Setting up Synapse Simple Antispam](configuring-playbook-synapse-simple-antispam.md) (advanced)"
+msgid "[Setting up the LDAP authentication password provider module](configuring-playbook-ldap-auth.md) (advanced)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:117
-msgid "[Setting up Matrix User Verification Service](configuring-playbook-user-verification-service.md) (advanced)"
+msgid "[Setting up Synapse Simple Antispam](configuring-playbook-synapse-simple-antispam.md) (advanced)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:119
-msgid "File Storage"
+msgid "[Setting up Matrix User Verification Service](configuring-playbook-user-verification-service.md) (advanced)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:121
-msgid "Use alternative file storage to the default `media_store` folder."
+msgid "File Storage"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:123
-msgid "[Storing Matrix media files using matrix-media-repo](configuring-playbook-matrix-media-repo.md)"
+msgid "Use alternative file storage to the default `media_store` folder."
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:125
-msgid "[Storing Synapse media files on Amazon S3 or another compatible Object Storage](configuring-playbook-s3.md)"
+msgid "[Storing Matrix media files using matrix-media-repo](configuring-playbook-matrix-media-repo.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:127
-msgid "[Storing Synapse media files on Amazon S3 with Goofys](configuring-playbook-s3-goofys.md)"
+msgid "[Storing Synapse media files on Amazon S3 or another compatible Object Storage](configuring-playbook-s3.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:129
-msgid "[Storing Synapse media files on Amazon S3 with synapse-s3-storage-provider](configuring-playbook-synapse-s3-storage-provider.md)"
+msgid "[Storing Synapse media files on Amazon S3 with Goofys](configuring-playbook-s3-goofys.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:131
-msgid "Bridging other networks"
+msgid "[Storing Synapse media files on Amazon S3 with synapse-s3-storage-provider](configuring-playbook-synapse-s3-storage-provider.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:133
-msgid "Bridges can be used to connect your Matrix installation with third-party communication networks."
+msgid "Bridging other networks"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:135
-msgid "[Setting up a Generic Mautrix Bridge](configuring-playbook-bridge-mautrix-bridges.md) — a common guide for configuring mautrix bridges"
+msgid "Bridges can be used to connect your Matrix installation with third-party communication networks."
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:137
-msgid "[Setting up Mautrix Bluesky bridging](configuring-playbook-bridge-mautrix-bluesky.md)"
+msgid "[Setting up a Generic Mautrix Bridge](configuring-playbook-bridge-mautrix-bridges.md) — a common guide for configuring mautrix bridges"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:139
-msgid "[Setting up Mautrix Discord bridging](configuring-playbook-bridge-mautrix-discord.md)"
+msgid "[Setting up Mautrix Bluesky bridging](configuring-playbook-bridge-mautrix-bluesky.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:141
-msgid "[Setting up Mautrix Telegram bridging](configuring-playbook-bridge-mautrix-telegram.md)"
+msgid "[Setting up Mautrix Discord bridging](configuring-playbook-bridge-mautrix-discord.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:143
-msgid "[Setting up Mautrix Slack bridging](configuring-playbook-bridge-mautrix-slack.md)"
+msgid "[Setting up Mautrix Telegram bridging](configuring-playbook-bridge-mautrix-telegram.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:145
-msgid "[Setting up Mautrix Google Messages bridging](configuring-playbook-bridge-mautrix-gmessages.md)"
+msgid "[Setting up Mautrix Slack bridging](configuring-playbook-bridge-mautrix-slack.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:147
-msgid "[Setting up Mautrix Whatsapp bridging](configuring-playbook-bridge-mautrix-whatsapp.md)"
+msgid "[Setting up Mautrix Google Messages bridging](configuring-playbook-bridge-mautrix-gmessages.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:149
-msgid "[Setting up Instagram bridging via Mautrix Meta](configuring-playbook-bridge-mautrix-meta-instagram.md)"
+msgid "[Setting up Mautrix Whatsapp bridging](configuring-playbook-bridge-mautrix-whatsapp.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:151
-msgid "[Setting up Messenger bridging via Mautrix Meta](configuring-playbook-bridge-mautrix-meta-messenger.md)"
+msgid "[Setting up Instagram bridging via Mautrix Meta](configuring-playbook-bridge-mautrix-meta-instagram.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:153
-msgid "[Setting up Mautrix Google Chat bridging](configuring-playbook-bridge-mautrix-googlechat.md)"
+msgid "[Setting up Messenger bridging via Mautrix Meta](configuring-playbook-bridge-mautrix-meta-messenger.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:155
-msgid "[Setting up Mautrix Twitter bridging](configuring-playbook-bridge-mautrix-twitter.md)"
+msgid "[Setting up Mautrix Google Chat bridging](configuring-playbook-bridge-mautrix-googlechat.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:157
-msgid "[Setting up Mautrix Signal bridging](configuring-playbook-bridge-mautrix-signal.md)"
+msgid "[Setting up Mautrix Twitter bridging](configuring-playbook-bridge-mautrix-twitter.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:159
-msgid "[Setting up Mautrix wsproxy for bridging Android SMS or Apple iMessage](configuring-playbook-bridge-mautrix-wsproxy.md)"
+msgid "[Setting up Mautrix Signal bridging](configuring-playbook-bridge-mautrix-signal.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:161
-msgid "[Setting up RustPush (iMessage) bridging](configuring-playbook-bridge-rustpush.md)"
+msgid "[Setting up Mautrix wsproxy for bridging Android SMS or Apple iMessage](configuring-playbook-bridge-mautrix-wsproxy.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:163
-msgid "[Setting up Appservice IRC bridging](configuring-playbook-bridge-appservice-irc.md)"
+msgid "[Setting up RustPush (iMessage) bridging](configuring-playbook-bridge-rustpush.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:165
-msgid "[Setting up Appservice Discord bridging](configuring-playbook-bridge-appservice-discord.md)"
+msgid "[Setting up Appservice IRC bridging](configuring-playbook-bridge-appservice-irc.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:167
-msgid "[Setting up Appservice Kakaotalk bridging](configuring-playbook-bridge-appservice-kakaotalk.md)"
+msgid "[Setting up Appservice Discord bridging](configuring-playbook-bridge-appservice-discord.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:169
-msgid "[Setting up Beeper LinkedIn bridging](configuring-playbook-bridge-beeper-linkedin.md)"
+msgid "[Setting up Appservice Kakaotalk bridging](configuring-playbook-bridge-appservice-kakaotalk.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:171
-msgid "[Setting up matrix-hookshot](configuring-playbook-bridge-hookshot.md) — a bridge between Matrix and multiple project management services, such as [GitHub](https://github.com), [GitLab](https://about.gitlab.com) and [JIRA](https://www.atlassian.com/software/jira)."
+msgid "[Setting up Beeper LinkedIn bridging](configuring-playbook-bridge-beeper-linkedin.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:173
-msgid "[Setting up MX Puppet GroupMe bridging](configuring-playbook-bridge-mx-puppet-groupme.md)"
+msgid "[Setting up matrix-hookshot](configuring-playbook-bridge-hookshot.md) — a bridge between Matrix and multiple project management services, such as [GitHub](https://github.com), [GitLab](https://about.gitlab.com) and [JIRA](https://www.atlassian.com/software/jira)."
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:175
-msgid "[Setting up Steam bridging](configuring-playbook-bridge-steam.md)"
+msgid "[Setting up MX Puppet GroupMe bridging](configuring-playbook-bridge-mx-puppet-groupme.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:177
-msgid "[Setting up MX Puppet Steam bridging](configuring-playbook-bridge-mx-puppet-steam.md)"
+msgid "[Setting up Steam bridging](configuring-playbook-bridge-steam.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:179
-msgid "[Setting up Postmoogle email bridging](configuring-playbook-bridge-postmoogle.md)"
+msgid "[Setting up MX Puppet Steam bridging](configuring-playbook-bridge-mx-puppet-steam.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:181
-msgid "[Setting up Matrix SMS bridging](configuring-playbook-bridge-matrix-bridge-sms.md)"
+msgid "[Setting up Postmoogle email bridging](configuring-playbook-bridge-postmoogle.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:183
-msgid "[Setting up Heisenbridge bouncer-style IRC bridging](configuring-playbook-bridge-heisenbridge.md)"
+msgid "[Setting up Matrix SMS bridging](configuring-playbook-bridge-matrix-bridge-sms.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:185
-msgid "[Setting up a Matrix <-> Meshtastic bridge](configuring-playbook-bridge-meshtastic-relay.md)"
+msgid "[Setting up Heisenbridge bouncer-style IRC bridging](configuring-playbook-bridge-heisenbridge.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:187
-msgid "[Setting up WeChat bridging](configuring-playbook-bridge-wechat.md)"
+msgid "[Setting up a Matrix <-> Meshtastic bridge](configuring-playbook-bridge-meshtastic-relay.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:189
-msgid "Bots"
+msgid "[Setting up WeChat bridging](configuring-playbook-bridge-wechat.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:191
-msgid "Bots provide various additional functionality to your installation."
+msgid "Bots"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:193
-msgid "[Setting up baibot](configuring-playbook-bot-baibot.md) — a bot through which you can talk to various [AI](https://en.wikipedia.org/wiki/Artificial_intelligence) / [Large Language Models](https://en.wikipedia.org/wiki/Large_language_model) services (the privacy-first [Venice](configuring-playbook-bot-baibot.md#venice) we recommend, [OpenAI](https://openai.com/)'s [ChatGPT](https://openai.com/blog/chatgpt/), and [others](https://github.com/etkecc/baibot/blob/main/docs/providers.md))"
+msgid "Bots provide various additional functionality to your installation."
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:195
-msgid "[Setting up matrix-reminder-bot](configuring-playbook-bot-matrix-reminder-bot.md) — a bot to remind you about stuff"
+msgid "[Setting up baibot](configuring-playbook-bot-baibot.md) — a bot through which you can talk to various [AI](https://en.wikipedia.org/wiki/Artificial_intelligence) / [Large Language Models](https://en.wikipedia.org/wiki/Large_language_model) services (the privacy-first [Venice](configuring-playbook-bot-baibot.md#venice) we recommend, [OpenAI](https://openai.com/)'s [ChatGPT](https://openai.com/blog/chatgpt/), and [others](https://github.com/etkecc/baibot/blob/main/docs/providers.md))"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:197
-msgid "[Setting up maubot](configuring-playbook-bot-maubot.md) — a plugin-based Matrix bot system"
+msgid "[Setting up matrix-reminder-bot](configuring-playbook-bot-matrix-reminder-bot.md) — a bot to remind you about stuff"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:199
-msgid "[Setting up Honoroit](configuring-playbook-bot-honoroit.md) — a helpdesk bot"
+msgid "[Setting up maubot](configuring-playbook-bot-maubot.md) — a plugin-based Matrix bot system"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:201
-msgid "[Setting up Mjolnir](configuring-playbook-bot-mjolnir.md) — a moderation tool/bot"
+msgid "[Setting up Honoroit](configuring-playbook-bot-honoroit.md) — a helpdesk bot"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:203
-msgid "[Setting up Draupnir](configuring-playbook-bot-draupnir.md) — a moderation tool/bot, forked from Mjolnir and maintained by its former leader developer"
+msgid "[Setting up Mjolnir](configuring-playbook-bot-mjolnir.md) — a moderation tool/bot"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:205
-msgid "[Setting up Draupnir for all/D4A](configuring-playbook-appservice-draupnir-for-all.md) — like the [Draupnir bot](configuring-playbook-bot-draupnir.md) mentioned above, but running in appservice mode and supporting multiple instances"
+msgid "[Setting up Draupnir](configuring-playbook-bot-draupnir.md) — a moderation tool/bot, forked from Mjolnir and maintained by its former leader developer"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:207
-msgid "[Setting up Buscarron](configuring-playbook-bot-buscarron.md) — a bot you can use to send any form (HTTP POST, HTML) to a (encrypted) Matrix room"
+msgid "[Setting up Draupnir for all/D4A](configuring-playbook-appservice-draupnir-for-all.md) — like the [Draupnir bot](configuring-playbook-bot-draupnir.md) mentioned above, but running in appservice mode and supporting multiple instances"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:209
-msgid "Administration"
+msgid "[Setting up Buscarron](configuring-playbook-bot-buscarron.md) — a bot you can use to send any form (HTTP POST, HTML) to a (encrypted) Matrix room"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:211
-msgid "Services that help you in administrating and monitoring your Matrix installation."
+msgid "Administration"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:213
-msgid "[Setting up Prometheus Alertmanager integration via matrix-alertmanager-receiver](configuring-playbook-alertmanager-receiver.md)"
+msgid "Services that help you in administrating and monitoring your Matrix installation."
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:215
-msgid "[Enabling metrics and graphs (Prometheus, Grafana) for your Matrix server](configuring-playbook-prometheus-grafana.md)"
+msgid "[Setting up Prometheus Alertmanager integration via matrix-alertmanager-receiver](configuring-playbook-alertmanager-receiver.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:217
-msgid "[Setting up the rageshake bug report server](configuring-playbook-rageshake.md)"
+msgid "[Enabling metrics and graphs (Prometheus, Grafana) for your Matrix server](configuring-playbook-prometheus-grafana.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:219
-msgid "[Enabling synapse-usage-exporter for Synapse usage statistics](configuring-playbook-synapse-usage-exporter.md)"
+msgid "[Setting up the rageshake bug report server](configuring-playbook-rageshake.md)"
 msgstr ""
 
 #: ../../../docs/configuring-playbook.md:221
+msgid "[Enabling synapse-usage-exporter for Synapse usage statistics](configuring-playbook-synapse-usage-exporter.md)"
+msgstr ""
+
+#: ../../../docs/configuring-playbook.md:223
 msgid "Backups:"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:222
+#: ../../../docs/configuring-playbook.md:224
 msgid "[Setting up BorgBackup](configuring-playbook-backup-borg.md) — a full Matrix server backup solution, including the Postgres database"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:224
+#: ../../../docs/configuring-playbook.md:226
 msgid "[Setting up Postgres backup](configuring-playbook-postgres-backup.md) — a Postgres-database backup solution (note: does not include other files)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:226
+#: ../../../docs/configuring-playbook.md:228
 msgid "Other specialized services"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:228
+#: ../../../docs/configuring-playbook.md:230
 msgid "Various services that don't fit any other categories."
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:230
+#: ../../../docs/configuring-playbook.md:232
 msgid "[Setting up Element Call](configuring-playbook-element-call.md) — a native Matrix video conferencing application, built on top of the [Matrix RTC stack](configuring-playbook-matrix-rtc.md) (optional)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:232
+#: ../../../docs/configuring-playbook.md:234
 msgid "[Setting up LiveKit JWT Service](configuring-playbook-livekit-jwt-service.md) - a component of the [Matrix RTC stack](configuring-playbook-matrix-rtc.md) (optional)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:234
+#: ../../../docs/configuring-playbook.md:236
 msgid "[Setting up LiveKit Server](configuring-playbook-livekit-server.md) - a component of the [Matrix RTC stack](configuring-playbook-matrix-rtc.md) (optional)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:236
+#: ../../../docs/configuring-playbook.md:238
 msgid "[Setting up Matrix RTC](configuring-playbook-matrix-rtc.md) (optional)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:238
+#: ../../../docs/configuring-playbook.md:240
 msgid "[Setting up synapse-auto-compressor](configuring-playbook-synapse-auto-compressor.md) for compressing the database on Synapse homeservers"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:240
+#: ../../../docs/configuring-playbook.md:242
 msgid "[Setting up Matrix Corporal](configuring-playbook-matrix-corporal.md) (advanced)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:242
+#: ../../../docs/configuring-playbook.md:244
 msgid "[Setting up Matrix.to](configuring-playbook-matrixto.md)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:244
+#: ../../../docs/configuring-playbook.md:246
 msgid "[Setting up Etherpad](configuring-playbook-etherpad.md)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:246
+#: ../../../docs/configuring-playbook.md:248
 msgid "[Setting up the Jitsi video-conferencing platform](configuring-playbook-jitsi.md)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:248
+#: ../../../docs/configuring-playbook.md:250
 msgid "[Setting up Cactus Comments](configuring-playbook-cactus-comments.md) — a federated comment system built on Matrix"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:250
+#: ../../../docs/configuring-playbook.md:252
 msgid "[Setting up Pantalaimon (E2EE aware proxy daemon)](configuring-playbook-pantalaimon.md) (advanced)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:252
+#: ../../../docs/configuring-playbook.md:254
 msgid "[Setting up the Sygnal push gateway](configuring-playbook-sygnal.md)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:254
+#: ../../../docs/configuring-playbook.md:256
 msgid "[Setting up the ntfy push notifications server](configuring-playbook-ntfy.md)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:256
+#: ../../../docs/configuring-playbook.md:258
 msgid "Deprecated / unmaintained / removed services"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:258
+#: ../../../docs/configuring-playbook.md:260
 msgid "**Note**: since a deprecated or unmaintained service will not be updated, its bug or vulnerability will be unlikely to get patched. It is recommended to migrate from the service to an alternative if any, and make sure to do your own research before you decide to keep it running nonetheless."
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:260
+#: ../../../docs/configuring-playbook.md:262
 msgid "[Configuring conduwuit](configuring-playbook-conduwuit.md) (removed; this component has been abandoned and unmaintained)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:262
+#: ../../../docs/configuring-playbook.md:264
 msgid "[Setting up the Sliding Sync proxy](configuring-playbook-sliding-sync-proxy.md) for clients which require Sliding Sync support (like old Element X versions, before it got switched to Simplified Sliding Sync)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:264
+#: ../../../docs/configuring-playbook.md:266
 msgid "[Setting up Appservice Slack bridging](configuring-playbook-bridge-appservice-slack.md) (removed; this component has been discontinued)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:266
+#: ../../../docs/configuring-playbook.md:268
 msgid "[Setting up Appservice Webhooks bridging](configuring-playbook-bridge-appservice-webhooks.md) (deprecated; the bridge's author suggests taking a look at [matrix-hookshot](https://github.com/matrix-org/matrix-hookshot) as a replacement, which can also be [installed using this playbook](configuring-playbook-bridge-hookshot.md))"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:268
+#: ../../../docs/configuring-playbook.md:270
 msgid "[Setting up the Dimension integration manager](configuring-playbook-dimension.md) ([unmaintained](https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2806#issuecomment-1673559299); after [installing](installing.md))"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:270
+#: ../../../docs/configuring-playbook.md:272
 msgid "[Setting up Email2Matrix](configuring-playbook-email2matrix.md) (removed; the author suggests taking a look at [Postmoogle](https://github.com/etkecc/postmoogle) as a replacement, which can also be [installed using this playbook](configuring-playbook-bridge-postmoogle.md))"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:272
+#: ../../../docs/configuring-playbook.md:274
 msgid "[Setting up Go-NEB](configuring-playbook-bot-go-neb.md) (unmaintained; the bridge's author suggests taking a look at [matrix-hookshot](https://github.com/matrix-org/matrix-hookshot) as a replacement, which can also be [installed using this playbook](configuring-playbook-bridge-hookshot.md))"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:274
+#: ../../../docs/configuring-playbook.md:276
 msgid "[Setting up Go Skype Bridge bridging](configuring-playbook-bridge-go-skype-bridge.md) (removed; Skype has been discontinued since May 2025)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:276
+#: ../../../docs/configuring-playbook.md:278
 msgid "[Setting up ma1sd Identity Server](configuring-playbook-ma1sd.md) (removed; this component has been unmaintained for a long time, so it has been removed from the playbook.)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:278
+#: ../../../docs/configuring-playbook.md:280
 msgid "[Setting up matrix-bot-chatgpt](configuring-playbook-bot-chatgpt.md) (unmaintained; the bridge's author suggests taking a look at [baibot](https://github.com/etkecc/baibot) as a replacement, which can also be [installed using this playbook](configuring-playbook-bot-baibot.md))"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:280
+#: ../../../docs/configuring-playbook.md:282
 msgid "[Setting up matrix-ldap-registration-proxy](configuring-playbook-matrix-ldap-registration-proxy.md) (removed; the repository of the source code has been removed)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:282
+#: ../../../docs/configuring-playbook.md:284
 msgid "[Setting up matrix-registration](configuring-playbook-matrix-registration.md) (removed; this component has been unmaintained)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:284
+#: ../../../docs/configuring-playbook.md:286
 msgid "[Setting up matrix-registration-bot](configuring-playbook-bot-matrix-registration-bot.md) (removed; this component has been unmaintained)"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:286
+#: ../../../docs/configuring-playbook.md:288
 msgid "[Setting up Mautrix Facebook bridging](configuring-playbook-bridge-mautrix-facebook.md) (deprecated in favor of the Messenger/Instagram bridge with [mautrix-meta-messenger](configuring-playbook-bridge-mautrix-meta-messenger.md))"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:288
+#: ../../../docs/configuring-playbook.md:290
 msgid "[Setting up Mautrix Instagram bridging](configuring-playbook-bridge-mautrix-instagram.md) (deprecated in favor of the Messenger/Instagram bridge with [mautrix-meta-instagram](configuring-playbook-bridge-mautrix-meta-instagram.md))"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:290
+#: ../../../docs/configuring-playbook.md:292
 msgid "[Setting up MX Puppet Discord bridging](configuring-playbook-bridge-mx-puppet-discord.md) (removed; this component has been unmaintained for a long time, so it has been removed from the playbook. Consider [setting up Mautrix Discord bridging](configuring-playbook-bridge-mautrix-discord.md))"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:292
+#: ../../../docs/configuring-playbook.md:294
 msgid "[Setting up MX Puppet Instagram bridging](configuring-playbook-bridge-mx-puppet-instagram.md) (removed; this component has been unmaintained for a long time, so it has been removed from the playbook. Consider [setting up Instagram bridging via Mautrix Meta](configuring-playbook-bridge-mautrix-meta-instagram.md))"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:294
+#: ../../../docs/configuring-playbook.md:296
 msgid "[Setting up MX Puppet Skype bridging](configuring-playbook-bridge-mx-puppet-skype.md) (removed; this component has been broken for a long time, so it has been removed from the playbook. Consider [setting up Go Skype Bridge bridging](configuring-playbook-bridge-go-skype-bridge.md))"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:296
+#: ../../../docs/configuring-playbook.md:298
 msgid "[Setting up MX Puppet Slack bridging](configuring-playbook-bridge-mx-puppet-slack.md) (removed; this component has been unmaintained for a long time, so it has been removed from the playbook. Consider [setting up Mautrix Slack bridging](configuring-playbook-bridge-mautrix-slack.md))"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:298
+#: ../../../docs/configuring-playbook.md:300
 msgid "[Setting up MX Puppet Twitter bridging](configuring-playbook-bridge-mx-puppet-twitter.md) (removed; this component has been unmaintained for a long time, so it has been removed from the playbook. Consider [setting up Mautrix Twitter bridging](configuring-playbook-bridge-mautrix-twitter.md))"
 msgstr ""
 
-#: ../../../docs/configuring-playbook.md:300
+#: ../../../docs/configuring-playbook.md:302
 msgid "[Setting up Synapse Auto Invite Accept](configuring-playbook-synapse-auto-accept-invite.md) (removed; since Synapse [v1.109.0](https://github.com/element-hq/synapse/releases/tag/v1.109.0) the same feature is available natively.)"
 msgstr ""
diff --git a/i18n/translation-templates/docs/installing.pot b/i18n/translation-templates/docs/installing.pot
index 4d9c1eee4..afbbfcac0 100644
--- a/i18n/translation-templates/docs/installing.pot
+++ b/i18n/translation-templates/docs/installing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: matrix-docker-ansible-deploy \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-29 17:50+0000\n"
+"POT-Creation-Date: 2026-07-12 13:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -77,245 +77,249 @@ msgid "If you **do** use SSH keys for authentication, **and** use a non-root use
 msgstr ""
 
 #: ../../../docs/installing.md:44
-msgid "There 2 ways to start the installation process — depending on whether you're [Installing a brand new server (without importing data)](#installing-a-brand-new-server-without-importing-data) or [Installing a server into which you'll import old data](#installing-a-server-into-which-youll-import-old-data)."
+msgid "Instead of typing the sudo password on each run (`-K`) or storing it in plain text in the inventory hosts file, you can also pull it from the [pass](https://www.passwordstore.org/) password manager by adding `ansible_become_password='{{ lookup(\"community.general.passwordstore\", \"path/to/password\") }}'` to your host line. See the [passwordstore lookup documentation](https://docs.ansible.com/ansible/latest/collections/community/general/passwordstore_lookup.html) for more details."
 msgstr ""
 
 #: ../../../docs/installing.md:46
-msgid "**Note**: if you are migrating from an old server to a new one, take a look at [this guide](maintenance-migrating.md) instead. This is an easier and more straightforward way than installing a server and importing old data into it."
+msgid "There 2 ways to start the installation process — depending on whether you're [Installing a brand new server (without importing data)](#installing-a-brand-new-server-without-importing-data) or [Installing a server into which you'll import old data](#installing-a-server-into-which-youll-import-old-data)."
 msgstr ""
 
 #: ../../../docs/installing.md:48
-msgid "Installing a brand new server (without importing data)"
+msgid "**Note**: if you are migrating from an old server to a new one, take a look at [this guide](maintenance-migrating.md) instead. This is an easier and more straightforward way than installing a server and importing old data into it."
 msgstr ""
 
 #: ../../../docs/installing.md:50
+msgid "Installing a brand new server (without importing data)"
+msgstr ""
+
+#: ../../../docs/installing.md:52
 msgid "If this is **a brand new** Matrix server and you **won't be importing old data into it**, run all these tags:"
 msgstr ""
 
-#: ../../../docs/installing.md:56
+#: ../../../docs/installing.md:58
 msgid "This will do a full installation and start all Matrix services."
 msgstr ""
 
-#: ../../../docs/installing.md:58
+#: ../../../docs/installing.md:60
 msgid "**Note**: if the command does not work as expected, make sure that you have properly installed and configured software required to run the playbook, as described on [Prerequisites](prerequisites.md)."
 msgstr ""
 
-#: ../../../docs/installing.md:60
+#: ../../../docs/installing.md:62
 msgid "Installing a server into which you'll import old data"
 msgstr ""
 
-#: ../../../docs/installing.md:62
+#: ../../../docs/installing.md:64
 msgid "If you will be importing data into your newly created Matrix server, install it, but **do not** start its services just yet. Starting its services or messing with its database now will affect your data import later on."
 msgstr ""
 
-#: ../../../docs/installing.md:64
+#: ../../../docs/installing.md:66
 msgid "To do the installation **without** starting services, run `ansible-playbook` with the `install-all` tag only:"
 msgstr ""
 
-#: ../../../docs/installing.md:71
+#: ../../../docs/installing.md:73
 msgid "Do not run the just \"recipe\" `just install-all` instead, because it automatically starts services at the end of execution. See: [Difference between playbook tags and shortcuts](just.md#difference-between-playbook-tags-and-shortcuts)"
 msgstr ""
 
-#: ../../../docs/installing.md:73
+#: ../../../docs/installing.md:75
 msgid "When this command completes, services won't be running yet."
 msgstr ""
 
-#: ../../../docs/installing.md:75
+#: ../../../docs/installing.md:77
 msgid "You can now:"
 msgstr ""
 
-#: ../../../docs/installing.md:77
+#: ../../../docs/installing.md:79
 msgid "[Importing an existing SQLite database (from another Synapse installation)](importing-synapse-sqlite.md) (optional)"
 msgstr ""
 
-#: ../../../docs/installing.md:79
+#: ../../../docs/installing.md:81
 msgid "[Importing an existing Postgres database (from another installation)](importing-postgres.md) (optional)"
 msgstr ""
 
-#: ../../../docs/installing.md:81
+#: ../../../docs/installing.md:83
 msgid "[Importing `media_store` data files from an existing Synapse installation](importing-synapse-media-store.md) (optional)"
 msgstr ""
 
-#: ../../../docs/installing.md:83
+#: ../../../docs/installing.md:85
 msgid "… and then proceed to starting all services:"
 msgstr ""
 
-#: ../../../docs/installing.md:89
+#: ../../../docs/installing.md:91
 msgid "Create your user account"
 msgstr ""
 
-#: ../../../docs/installing.md:91
+#: ../../../docs/installing.md:93
 msgid "ℹ️ *You can skip this step if you have installed a server and imported old data to it.*"
 msgstr ""
 
-#: ../../../docs/installing.md:93
+#: ../../../docs/installing.md:95
 msgid "As you have configured your brand new server and the client, you need to **create your user account** on your Matrix server."
 msgstr ""
 
-#: ../../../docs/installing.md:95
+#: ../../../docs/installing.md:97
 msgid "After creating the user account, you can log in to it with [Element Web](configuring-playbook-client-element-web.md) that this playbook has installed for you at this URL: `https://element.example.com/`."
 msgstr ""
 
-#: ../../../docs/installing.md:97
+#: ../../../docs/installing.md:99
 msgid "To create your user account (as an administrator of the server) via this Ansible playbook, run the command below on your local computer."
 msgstr ""
 
-#: ../../../docs/installing.md:99
+#: ../../../docs/installing.md:101
 msgid "**Notes**:"
 msgstr ""
 
-#: ../../../docs/installing.md:100
+#: ../../../docs/installing.md:102
 msgid "Make sure to adjust `YOUR_USERNAME_HERE` and `YOUR_PASSWORD_HERE`"
 msgstr ""
 
-#: ../../../docs/installing.md:101
+#: ../../../docs/installing.md:103
 msgid "For `YOUR_USERNAME_HERE`, use a plain username like `alice`, not your full ID (`@alice:example.com`)"
 msgstr ""
 
-#: ../../../docs/installing.md:102
+#: ../../../docs/installing.md:104
 msgid "Use `admin=yes` to make your user account an administrator of the Matrix server"
 msgstr ""
 
-#: ../../../docs/installing.md:110
+#: ../../../docs/installing.md:112
 msgid "Feel free to create as many accounts (for friends, family, etc.) as you want. Still, perhaps you should grant full administrative access to your account only (with `admin=yes`), and others should be created with `admin=no`."
 msgstr ""
 
-#: ../../../docs/installing.md:112
+#: ../../../docs/installing.md:114
 msgid "For more information, see the documentation for [registering users](registering-users.md)."
 msgstr ""
 
-#: ../../../docs/installing.md:114
+#: ../../../docs/installing.md:116
 msgid "Finalize the installation"
 msgstr ""
 
-#: ../../../docs/installing.md:116
+#: ../../../docs/installing.md:118
 msgid "Now you've configured Matrix services and your user account, you need to **finalize the installation process** by [setting up Matrix delegation (redirection)](howto-server-delegation.md), so that your Matrix server (`matrix.example.com`) can present itself as the base domain (`example.com`) in the Matrix network."
 msgstr ""
 
-#: ../../../docs/installing.md:118
+#: ../../../docs/installing.md:120
 msgid "This is required for federation to work! Without a proper configuration, your server will effectively not be part of the Matrix network."
 msgstr ""
 
-#: ../../../docs/installing.md:120
+#: ../../../docs/installing.md:122
 msgid "To configure the delegation, you have these two options. Choose one of them according to your situation."
 msgstr ""
 
-#: ../../../docs/installing.md:122
+#: ../../../docs/installing.md:124
 msgid "If you can afford to point the base domain at the Matrix server, follow the instructions below which guide you into [serving the base domain](configuring-playbook-base-domain-serving.md) from the integrated web server. It will enable you to use a Matrix user ID like `@alice:example.com` while hosting services on a subdomain like `matrix.example.com`."
 msgstr ""
 
-#: ../../../docs/installing.md:123
+#: ../../../docs/installing.md:125
 msgid "Alternatively, if you're using the base domain for other purposes and cannot point it to the Matrix server (and thus cannot \"serve the base domain\" from it), you most likely need to [manually install well-known files on the base domain's server](configuring-well-known.md#manually-installing-well-known-files-on-the-base-domains-server), but feel free to familiarize yourself with all [server delegation (redirection) options](howto-server-delegation.md)."
 msgstr ""
 
-#: ../../../docs/installing.md:125
+#: ../../../docs/installing.md:127
 msgid "To have the base domain served from the integrated web server, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file:"
 msgstr ""
 
-#: ../../../docs/installing.md:131
+#: ../../../docs/installing.md:133
 msgid "After configuring the playbook, run the command below:"
 msgstr ""
 
-#: ../../../docs/installing.md:137
+#: ../../../docs/installing.md:139
 msgid "**If an error is not returned, the installation has completed and the services have been started successfully**🎉"
 msgstr ""
 
-#: ../../../docs/installing.md:139
+#: ../../../docs/installing.md:141
 msgid "Things to do next"
 msgstr ""
 
-#: ../../../docs/installing.md:141
+#: ../../../docs/installing.md:143
 msgid "After completing the installation, you can:"
 msgstr ""
 
-#: ../../../docs/installing.md:143
+#: ../../../docs/installing.md:145
 msgid "[check if services work](maintenance-and-troubleshooting.md#how-to-check-if-services-work)"
 msgstr ""
 
-#: ../../../docs/installing.md:144
+#: ../../../docs/installing.md:146
 msgid "or [set up additional services](configuring-playbook.md#other-configuration-options) (bridges to other chat networks, bots, etc.)"
 msgstr ""
 
-#: ../../../docs/installing.md:145
+#: ../../../docs/installing.md:147
 msgid "or learn how to [upgrade services when new versions are released](maintenance-upgrading-services.md)"
 msgstr ""
 
-#: ../../../docs/installing.md:146
+#: ../../../docs/installing.md:148
 msgid "or learn how to [maintain your server](faq.md#maintenance)"
 msgstr ""
 
-#: ../../../docs/installing.md:147
+#: ../../../docs/installing.md:149
 msgid "or join some Matrix rooms:"
 msgstr ""
 
-#: ../../../docs/installing.md:148
+#: ../../../docs/installing.md:150
 msgid "via the *Explore rooms* feature in Element Web or some other clients, or by discovering them using this [matrix-static list](https://view.matrix.org). **Note**: joining large rooms may overload small servers. For tuning guidance on constrained hosts, see [Limit joining heavy rooms on constrained hosts](configuring-playbook-synapse.md#limit-joining-heavy-rooms-on-constrained-hosts)."
 msgstr ""
 
-#: ../../../docs/installing.md:150
+#: ../../../docs/installing.md:152
 msgid "or come say Hi in our support room — [#matrix-docker-ansible-deploy:devture.com](https://matrix.to/#/#matrix-docker-ansible-deploy:devture.com). You might learn something or get to help someone else new to Matrix hosting."
 msgstr ""
 
-#: ../../../docs/installing.md:151
+#: ../../../docs/installing.md:153
 msgid "or help make this playbook better by contributing (code, documentation, or [coffee/beer](https://liberapay.com/s.pantaleev/donate))"
 msgstr ""
 
-#: ../../../docs/installing.md:153
+#: ../../../docs/installing.md:155
 msgid "Installing native Matrix clients on your computer"
 msgstr ""
 
-#: ../../../docs/installing.md:155
+#: ../../../docs/installing.md:157
 msgid "As the playbook's aim is to help you to install and manage Matrix services on your server, if you are looking for dedicated native Matrix clients which run on your computer, you need to install ones by yourself. There is a convenient list which introduces known Matrix clients on this page: <https://matrix.org/ecosystem/clients/>"
 msgstr ""
 
-#: ../../../docs/installing.md:157
+#: ../../../docs/installing.md:159
 msgid "If you feel overwhelmed by the variety and the number of the available clients, you might want to install [**Komai**](https://github.com/etkecc/komai), a desktop-first Matrix chat application maintained by the team behind the playbook. It is stable, and just works without quirks!"
 msgstr ""
 
-#: ../../../docs/installing.md:159
+#: ../../../docs/installing.md:161
 msgid "⚠️ Keep the playbook and services up-to-date"
 msgstr ""
 
-#: ../../../docs/installing.md:161
+#: ../../../docs/installing.md:163
 msgid "While this playbook helps you to set up Matrix services and maintain them, it will **not** automatically run the maintenance task for you. You will need to update the playbook and re-run it **manually**."
 msgstr ""
 
-#: ../../../docs/installing.md:163
+#: ../../../docs/installing.md:165
 msgid "The upstream projects, which this playbook makes use of, occasionally if not often suffer from security vulnerabilities."
 msgstr ""
 
-#: ../../../docs/installing.md:165
+#: ../../../docs/installing.md:167
 msgid "Since it is unsafe to keep outdated services running on the server connected to the internet, please consider to update the playbook and re-run it periodically, in order to keep the services up-to-date."
 msgstr ""
 
-#: ../../../docs/installing.md:167
+#: ../../../docs/installing.md:169
 msgid "Also, do not forget to update your system regularly. While this playbook may install basic services, such as Docker, it will not interfere further with system maintenance. Keeping the system itself up-to-date is out of scope for this playbook."
 msgstr ""
 
-#: ../../../docs/installing.md:169
+#: ../../../docs/installing.md:171
 msgid "For more information about upgrading or maintaining services with the playbook, take a look at this page: [Upgrading the Matrix services](maintenance-upgrading-services.md)"
 msgstr ""
 
-#: ../../../docs/installing.md:171
+#: ../../../docs/installing.md:173
 msgid "Feel free to **re-run the setup command any time** you think something is wrong with the server configuration. Ansible will take your configuration and update your server to match."
 msgstr ""
 
-#: ../../../docs/installing.md:177
+#: ../../../docs/installing.md:179
 msgid "**Note**: see [this page on the playbook tags](playbook-tags.md) for more information about those tags."
 msgstr ""
 
-#: ../../../docs/installing.md:179
+#: ../../../docs/installing.md:181
 msgid "Make full use of `just` shortcut commands"
 msgstr ""
 
-#: ../../../docs/installing.md:181
+#: ../../../docs/installing.md:183
 msgid "After you get familiar with reconfiguring and re-running the playbook to maintain the server, upgrade its services, etc., you probably would like to make use of `just` shortcut commands for faster input."
 msgstr ""
 
-#: ../../../docs/installing.md:183
+#: ../../../docs/installing.md:185
 msgid "For example, `just install-all` is useful for maintaining your setup quickly ([2x-5x faster](../CHANGELOG.md#2x-5x-performance-improvements-in-playbook-runtime) than `just setup-all`) when its components remain unchanged. If you adjust your `vars.yml` to remove other components, you'd need to run `just setup-all`, or these components will still remain installed."
 msgstr ""
 
-#: ../../../docs/installing.md:185
+#: ../../../docs/installing.md:187
 msgid "You can learn about the shortcut commands on this page: [Running `just` commands](just.md)"
 msgstr ""
diff --git a/i18n/translation-templates/docs/quick-start.pot b/i18n/translation-templates/docs/quick-start.pot
index 1870146f8..43325f0bb 100644
--- a/i18n/translation-templates/docs/quick-start.pot
+++ b/i18n/translation-templates/docs/quick-start.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: matrix-docker-ansible-deploy \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-05-07 11:16+0000\n"
+"POT-Creation-Date: 2026-07-12 13:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -213,229 +213,265 @@ msgid "For your convenience, we have prepared example files of them ([`vars.yml`
 msgstr ""
 
 #: ../../../docs/quick-start.md:92
-msgid "To start quickly based on these example files, go into the `matrix-docker-ansible-deploy` directory and follow the instructions below:"
+msgid "To start quickly based on these example files, go into the `matrix-docker-ansible-deploy` directory and initialize your configuration, either automatically or manually."
 msgstr ""
 
 #: ../../../docs/quick-start.md:94
-msgid "Create a directory to hold your configuration: `mkdir -p inventory/host_vars/matrix.example.com` where `example.com` is your \"base domain\""
-msgstr ""
-
-#: ../../../docs/quick-start.md:95
-msgid "Copy the sample configuration file: `cp examples/vars.yml inventory/host_vars/matrix.example.com/vars.yml`"
+msgid "To initialize it automatically (with the base domain and server address pre-filled and secrets generated for you), run:"
 msgstr ""
 
 #: ../../../docs/quick-start.md:96
-msgid "Copy the sample inventory hosts file: `cp examples/hosts inventory/hosts`"
+msgid "either: `just add-inventory-host example.com 1.2.3.4` (if you have the [`just`](just.md) tool)"
 msgstr ""
 
 #: ../../../docs/quick-start.md:97
-msgid "Edit the configuration file (`inventory/host_vars/matrix.example.com/vars.yml`)"
+msgid "or: `make add-inventory-host domain=example.com ip=1.2.3.4` (if you have the `make` program)"
 msgstr ""
 
-#: ../../../docs/quick-start.md:98
-msgid "Edit the inventory hosts file (`inventory/hosts`)"
+#: ../../../docs/quick-start.md:99
+msgid "… where `example.com` is your \"base domain\" (not `matrix.example.com`) and `1.2.3.4` is your server's external IP address (or domain name)."
 msgstr ""
 
-#: ../../../docs/quick-start.md:100
-msgid "Before editing these 2 files, make sure to read explanations on them to understand what needs to be configured."
-msgstr ""
-
-#: ../../../docs/quick-start.md:102
-msgid "**💡 Notes:**"
+#: ../../../docs/quick-start.md:101
+msgid "Given a base domain of `example.com`, this creates:"
 msgstr ""
 
 #: ../../../docs/quick-start.md:103
-msgid "If you are not in control of anything on the base domain, you would need to set additional configuration on `vars.yml`. For more information, see [How do I install on matrix.example.com without involving the base domain?](faq.md#how-do-i-install-on-matrix-example-com-without-involving-the-base-domain) on our FAQ."
+msgid "an entry for `matrix.example.com` (the Matrix server's default hostname: `matrix.` + your base domain) in the inventory hosts file (`inventory/hosts`)"
 msgstr ""
 
 #: ../../../docs/quick-start.md:104
-msgid "Certain configuration decisions (like the base domain configured in `matrix_domain` and homeserver implementation configured in `matrix_homeserver_implementation`) are final. If you make the wrong choice and wish to change it, you'll have to run the Uninstalling step and start over."
+msgid "a configuration file (`inventory/host_vars/matrix.example.com/vars.yml`) containing `matrix_domain: example.com` and automatically generated secrets"
 msgstr ""
 
-#: ../../../docs/quick-start.md:105
-msgid "Instead of configuring a lot of things all at once, we recommend starting with the basic (default) settings in order to get yourself familiar with how the playbook works. After making sure that everything works as expected, you can add (and remove) advanced settings / features and run the playbook as many times as you wish."
+#: ../../../docs/quick-start.md:106
+msgid "Afterward, edit these 2 files to adjust them further, as necessary. Existing configuration is never overwritten (the command refuses to run if the host is already in your inventory), so it can also be used for adding more hosts later."
 msgstr ""
 
-#: ../../../docs/quick-start.md:107
-msgid "Install"
+#: ../../../docs/quick-start.md:108
+msgid "To initialize it manually, follow the instructions below:"
 msgstr ""
 
-#: ../../../docs/quick-start.md:109
-msgid "<sup>This section is optimized for this quick-start guide and is derived from the following full-documentation page: [Installing](installing.md)</sup>"
+#: ../../../docs/quick-start.md:110
+msgid "Create a directory to hold your configuration: `mkdir -p inventory/host_vars/matrix.example.com` where `example.com` is your \"base domain\""
 msgstr ""
 
 #: ../../../docs/quick-start.md:111
-msgid "After editing `vars.yml` and `hosts` files, let's start the **installation** procedure."
+msgid "Copy the sample configuration file: `cp examples/vars.yml inventory/host_vars/matrix.example.com/vars.yml`"
+msgstr ""
+
+#: ../../../docs/quick-start.md:112
+msgid "Copy the sample inventory hosts file: `cp examples/hosts inventory/hosts`"
 msgstr ""
 
 #: ../../../docs/quick-start.md:113
-msgid "Update Ansible roles"
+msgid "Edit the configuration file (`inventory/host_vars/matrix.example.com/vars.yml`)"
 msgstr ""
 
-#: ../../../docs/quick-start.md:115
-msgid "Before installing, you need to update the Ansible roles that this playbook uses and fetches from outside."
+#: ../../../docs/quick-start.md:114
+msgid "Edit the inventory hosts file (`inventory/hosts`)"
 msgstr ""
 
-#: ../../../docs/quick-start.md:117
-msgid "To update your playbook directory and all upstream Ansible roles, run:"
+#: ../../../docs/quick-start.md:116
+msgid "Before editing these 2 files, make sure to read explanations on them to understand what needs to be configured."
+msgstr ""
+
+#: ../../../docs/quick-start.md:118
+msgid "**💡 Notes:**"
 msgstr ""
 
 #: ../../../docs/quick-start.md:119
-msgid "either: `just update`"
+msgid "If you are not in control of anything on the base domain, you would need to set additional configuration on `vars.yml`. For more information, see [How do I install on matrix.example.com without involving the base domain?](faq.md#how-do-i-install-on-matrix-example-com-without-involving-the-base-domain) on our FAQ."
 msgstr ""
 
 #: ../../../docs/quick-start.md:120
-msgid "or: a combination of `git pull` and `just roles` (or `make roles` if you have `make` program on your computer instead of `just`)"
+msgid "Certain configuration decisions (like the base domain configured in `matrix_domain` and homeserver implementation configured in `matrix_homeserver_implementation`) are final. If you make the wrong choice and wish to change it, you'll have to run the Uninstalling step and start over."
 msgstr ""
 
-#: ../../../docs/quick-start.md:122
-msgid "If you don't have either `just` tool or `make` program, you can run the `ansible-galaxy` tool directly after updating the playbook: `git pull; rm -rf roles/galaxy; ansible-galaxy install -r requirements.yml -p roles/galaxy/ --force`"
+#: ../../../docs/quick-start.md:121
+msgid "Instead of configuring a lot of things all at once, we recommend starting with the basic (default) settings in order to get yourself familiar with how the playbook works. After making sure that everything works as expected, you can add (and remove) advanced settings / features and run the playbook as many times as you wish."
 msgstr ""
 
-#: ../../../docs/quick-start.md:124
-msgid "Run installation command"
+#: ../../../docs/quick-start.md:123
+msgid "Install"
 msgstr ""
 
-#: ../../../docs/quick-start.md:126
-msgid "Then, run the command below to start installation:"
+#: ../../../docs/quick-start.md:125
+msgid "<sup>This section is optimized for this quick-start guide and is derived from the following full-documentation page: [Installing](installing.md)</sup>"
 msgstr ""
 
-#: ../../../docs/quick-start.md:132
-msgid "If you **don't** use SSH keys for authentication, but rather a regular password, you may need to add `--ask-pass` to the command."
+#: ../../../docs/quick-start.md:127
+msgid "After editing `vars.yml` and `hosts` files, let's start the **installation** procedure."
 msgstr ""
 
-#: ../../../docs/quick-start.md:134
-msgid "If you **do** use SSH keys for authentication, **and** use a non-root user to *become* root (sudo), you may need to add `-K` (`--ask-become-pass`) to the command."
+#: ../../../docs/quick-start.md:129
+msgid "Update Ansible roles"
+msgstr ""
+
+#: ../../../docs/quick-start.md:131
+msgid "Before installing, you need to update the Ansible roles that this playbook uses and fetches from outside."
+msgstr ""
+
+#: ../../../docs/quick-start.md:133
+msgid "To update your playbook directory and all upstream Ansible roles, run:"
+msgstr ""
+
+#: ../../../docs/quick-start.md:135
+msgid "either: `just update`"
 msgstr ""
 
 #: ../../../docs/quick-start.md:136
-msgid "Wait until the command completes. If it's all green, everything should be running properly."
+msgid "or: a combination of `git pull` and `just roles` (or `make roles` if you have `make` program on your computer instead of `just`)"
 msgstr ""
 
 #: ../../../docs/quick-start.md:138
-msgid "Create your user account"
+msgid "If you don't have either `just` tool or `make` program, you can run the `ansible-galaxy` tool directly after updating the playbook: `git pull; rm -rf roles/galaxy; ansible-galaxy install -r requirements.yml -p roles/galaxy/ --force`"
 msgstr ""
 
 #: ../../../docs/quick-start.md:140
-msgid "<sup>This section is optimized for this quick-start guide and is derived from the following full-documentation page: [Registering users](registering-users.md)</sup>"
+msgid "Run installation command"
 msgstr ""
 
 #: ../../../docs/quick-start.md:142
-msgid "As you have configured your brand new server and the client, you need to **create your user account** on your Matrix server."
-msgstr ""
-
-#: ../../../docs/quick-start.md:144
-msgid "To create your user account (as an administrator of the server) via this Ansible playbook, run the command below on your local computer."
-msgstr ""
-
-#: ../../../docs/quick-start.md:146
-msgid "**💡 Notes**:"
-msgstr ""
-
-#: ../../../docs/quick-start.md:147
-msgid "Make sure to adjust `YOUR_USERNAME_HERE` and `YOUR_PASSWORD_HERE`"
+msgid "Then, run the command below to start installation:"
 msgstr ""
 
 #: ../../../docs/quick-start.md:148
-msgid "For `YOUR_USERNAME_HERE`, use a plain username like `alice`, not your full ID (`@alice:example.com`)"
+msgid "If you **don't** use SSH keys for authentication, but rather a regular password, you may need to add `--ask-pass` to the command."
+msgstr ""
+
+#: ../../../docs/quick-start.md:150
+msgid "If you **do** use SSH keys for authentication, **and** use a non-root user to *become* root (sudo), you may need to add `-K` (`--ask-become-pass`) to the command."
+msgstr ""
+
+#: ../../../docs/quick-start.md:152
+msgid "Wait until the command completes. If it's all green, everything should be running properly."
+msgstr ""
+
+#: ../../../docs/quick-start.md:154
+msgid "Create your user account"
+msgstr ""
+
+#: ../../../docs/quick-start.md:156
+msgid "<sup>This section is optimized for this quick-start guide and is derived from the following full-documentation page: [Registering users](registering-users.md)</sup>"
+msgstr ""
+
+#: ../../../docs/quick-start.md:158
+msgid "As you have configured your brand new server and the client, you need to **create your user account** on your Matrix server."
 msgstr ""
 
 #: ../../../docs/quick-start.md:160
-msgid "Finalize server installation"
+msgid "To create your user account (as an administrator of the server) via this Ansible playbook, run the command below on your local computer."
 msgstr ""
 
 #: ../../../docs/quick-start.md:162
-msgid "<sup>This section is optimized for this quick-start guide and is derived from the following full-documentation page: [Server Delegation](howto-server-delegation.md)</sup>"
+msgid "**💡 Notes**:"
+msgstr ""
+
+#: ../../../docs/quick-start.md:163
+msgid "Make sure to adjust `YOUR_USERNAME_HERE` and `YOUR_PASSWORD_HERE`"
 msgstr ""
 
 #: ../../../docs/quick-start.md:164
+msgid "For `YOUR_USERNAME_HERE`, use a plain username like `alice`, not your full ID (`@alice:example.com`)"
+msgstr ""
+
+#: ../../../docs/quick-start.md:176
+msgid "Finalize server installation"
+msgstr ""
+
+#: ../../../docs/quick-start.md:178
+msgid "<sup>This section is optimized for this quick-start guide and is derived from the following full-documentation page: [Server Delegation](howto-server-delegation.md)</sup>"
+msgstr ""
+
+#: ../../../docs/quick-start.md:180
 msgid "Now that you've configured Matrix services and your user account, you need to **finalize the installation process** by [setting up Matrix delegation (redirection)](howto-server-delegation.md), so that your Matrix server (`matrix.example.com`) can present itself as the base domain (`example.com`) in the Matrix network."
 msgstr ""
 
-#: ../../../docs/quick-start.md:166
+#: ../../../docs/quick-start.md:182
 msgid "**This is required for federation to work!** Without a proper configuration, your server will effectively not be part of the Matrix network."
 msgstr ""
 
-#: ../../../docs/quick-start.md:168
+#: ../../../docs/quick-start.md:184
 msgid "To configure the delegation, you have these two options. Choose one of them according to your situation."
 msgstr ""
 
-#: ../../../docs/quick-start.md:170
+#: ../../../docs/quick-start.md:186
 msgid "If you can afford to point the base domain at the Matrix server, follow the instruction below which guides you into [serving the base domain](configuring-playbook-base-domain-serving.md) from the integrated web server."
 msgstr ""
 
-#: ../../../docs/quick-start.md:171
+#: ../../../docs/quick-start.md:187
 msgid "Alternatively, if you're using the base domain for other purposes and cannot point it to the Matrix server (and thus cannot \"serve the base domain\" from it), you most likely need to [manually install well-known files on the base domain's server](configuring-well-known.md#manually-installing-well-known-files-on-the-base-domains-server)."
 msgstr ""
 
-#: ../../../docs/quick-start.md:173
+#: ../../../docs/quick-start.md:189
 msgid "To have the base domain served from the integrated web server, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file:"
 msgstr ""
 
-#: ../../../docs/quick-start.md:179
+#: ../../../docs/quick-start.md:195
 msgid "After configuring the playbook, run the command below and wait until it finishes:"
 msgstr ""
 
-#: ../../../docs/quick-start.md:185
+#: ../../../docs/quick-start.md:201
 msgid "💡 Running the `install-matrix-static-files` playbook tag (as done here) is an optimized version of running [the full setup command](#run-installation-command)."
 msgstr ""
 
-#: ../../../docs/quick-start.md:187
+#: ../../../docs/quick-start.md:203
 msgid "After the command finishes, you can also check whether your server federates with the Matrix network by using the [Federation Tester](https://federationtester.matrix.org/) against your base domain (`example.com`), not the `matrix.example.com` subdomain."
 msgstr ""
 
-#: ../../../docs/quick-start.md:189
+#: ../../../docs/quick-start.md:205
 msgid "Re-run the full setup command any time"
 msgstr ""
 
-#: ../../../docs/quick-start.md:191
+#: ../../../docs/quick-start.md:207
 msgid "If you think something is wrong with the server configuration, feel free to re-run the setup command any time:"
 msgstr ""
 
-#: ../../../docs/quick-start.md:197
+#: ../../../docs/quick-start.md:213
 msgid "Log in to your user account"
 msgstr ""
 
-#: ../../../docs/quick-start.md:199
+#: ../../../docs/quick-start.md:215
 msgid "Finally, let's make sure that you can log in to the created account with the specified password."
 msgstr ""
 
-#: ../../../docs/quick-start.md:201
+#: ../../../docs/quick-start.md:217
 msgid "You should be able to log in to it with your own [Element Web](configuring-playbook-client-element-web.md) client which you have set up at `element.example.com` by running the playbook. Open the URL (`https://element.example.com`) in a web browser and enter your credentials to log in."
 msgstr ""
 
-#: ../../../docs/quick-start.md:203
+#: ../../../docs/quick-start.md:219
 msgid "**If you successfully logged in to your account, the installation and configuration have completed successfully**🎉"
 msgstr ""
 
-#: ../../../docs/quick-start.md:205
+#: ../../../docs/quick-start.md:221
 msgid "Come say Hi👋 in our support room — [#matrix-docker-ansible-deploy:devture.com](https://matrix.to/#/#matrix-docker-ansible-deploy:devture.com). You might learn something or get to help someone else new to Matrix hosting."
 msgstr ""
 
-#: ../../../docs/quick-start.md:207
+#: ../../../docs/quick-start.md:223
 msgid "Things to do next"
 msgstr ""
 
-#: ../../../docs/quick-start.md:209
+#: ../../../docs/quick-start.md:225
 msgid "Once you get familiar with the playbook, you might probably want to set up additional services such as a bridge on your server."
 msgstr ""
 
-#: ../../../docs/quick-start.md:211
+#: ../../../docs/quick-start.md:227
 msgid "As this page intends to be a quick start guide which explains how to start the core Matrix services, it does not cover a topic like how to set them up. Take a look at the list of [things to do next](installing.md#things-to-do-next) to learn more."
 msgstr ""
 
-#: ../../../docs/quick-start.md:213
+#: ../../../docs/quick-start.md:229
 msgid "⚠️Keep the playbook and services up-to-date"
 msgstr ""
 
-#: ../../../docs/quick-start.md:215
+#: ../../../docs/quick-start.md:231
 msgid "While this playbook helps you to set up Matrix services and maintain them, it will **not** automatically run the maintenance task for you. You will need to update the playbook and re-run it **manually**."
 msgstr ""
 
-#: ../../../docs/quick-start.md:217
+#: ../../../docs/quick-start.md:233
 msgid "Since it is unsafe to keep outdated services running on the server connected to the internet, please consider to update the playbook and re-run it periodically, in order to keep the services up-to-date."
 msgstr ""
 
-#: ../../../docs/quick-start.md:219
+#: ../../../docs/quick-start.md:235
 msgid "For more information about upgrading or maintaining services with the playbook, take a look at this page: [Upgrading the Matrix services](maintenance-upgrading-services.md)"
 msgstr ""