diff --git a/doc/manual/en/Download.raw.wiki b/doc/manual/en/Download.raw.wiki
index d29e85a7f..623caea35 100644
--- a/doc/manual/en/Download.raw.wiki
+++ b/doc/manual/en/Download.raw.wiki
@@ -44,25 +44,11 @@ It is important to verify the images you have downloaded to ensure that the file
 
   * First open a terminal and import the public keys of the !FreedomBox developers who built the images:
   {{{
-$ gpg --recv-keys BCBEBD57A11F70B23782BC5736C361440C9BC971
-
-$ gpg --recv-keys 7D6ADB750F91085589484BE677C0C75E7B650808
-
-# This is the FreedomBox CI server's key
-$ gpg --recv-keys 013D86D8BA32EAB4A6691BF85D4153D6FE188FC8
-}}}
-  If this command shows an error such as ''new key but contains no user ID - skipped'', then use a different keyserver to download the keys:
-  {{{
-$ gpg --keyserver keys.gnupg.net --recv-keys BCBEBD57A11F70B23782BC5736C361440C9BC971
-$ gpg --keyserver keys.gnupg.net --recv-keys 7D6ADB750F91085589484BE677C0C75E7B650808
-$ gpg --keyserver keys.gnupg.net --recv-keys 013D86D8BA32EAB4A6691BF85D4153D6FE188FC8
-  }}}
-  Or
-  {{{
 $ gpg --keyserver keyserver.ubuntu.com --recv-keys BCBEBD57A11F70B23782BC5736C361440C9BC971
 $ gpg --keyserver keyserver.ubuntu.com --recv-keys 7D6ADB750F91085589484BE677C0C75E7B650808
+# This is the FreedomBox CI server's key
 $ gpg --keyserver keyserver.ubuntu.com --recv-keys 013D86D8BA32EAB4A6691BF85D4153D6FE188FC8
-  }}}
+}}}
   * Next, verify the fingerprint of the public keys:
   {{{
 $ gpg --fingerprint BCBEBD57A11F70B23782BC5736C361440C9BC971
diff --git a/doc/manual/en/ReleaseNotes.raw.wiki b/doc/manual/en/ReleaseNotes.raw.wiki
index 838e5cbf2..c5c45d25f 100644
--- a/doc/manual/en/ReleaseNotes.raw.wiki
+++ b/doc/manual/en/ReleaseNotes.raw.wiki
@@ -10,6 +10,20 @@ For more technical details, see the [[https://salsa.debian.org/freedombox-team/f
 
 The following are the release notes for each !FreedomBox version.
 
+== FreedomBox 21.8 (2021-08-30) ==
+
+=== Highlights ===
+
+ * wordpress: New app to manage a !WordPress site/blog
+
+=== Other Changes ===
+
+ * d/control: Drop wireless-tools as recommends
+ * email: Basic app to manage an email server
+   - Email server app is currently disabled by default, so it is not yet visible in the interface.
+ * locale: Update translations for Norwegian Bokmål, Ukrainian
+ * security: Remove display of past vulnerabilities
+
 == FreedomBox 21.7 (2021-08-16) ==
 
 === Highlights ===
diff --git a/doc/manual/en/ejabberd.raw.wiki b/doc/manual/en/ejabberd.raw.wiki
index 5ed1a8d27..2662cbe2c 100644
--- a/doc/manual/en/ejabberd.raw.wiki
+++ b/doc/manual/en/ejabberd.raw.wiki
@@ -40,12 +40,6 @@ Once you have a Domain Name, you can tell your !FreedomBox to use it by setting
 
 Please note that [[FreedomBox/Manual/PageKite|PageKite]] does not support the XMPP protocol at this time.
 
-=== Use Let's encrypt certificate for ejabberd ===
-
-If your !FreedomBox server uses a Let's Encrypt certificate, you will also want to use it for ejabberd. To do so, as your !FreedomBox admin, go to '''System''' > '''Let's Encrypt''', and select the checkbox at `Use certificate for ejabberd`:
-
-{{attachment:certificate-for-ejabberd.png|Use of certificate for Ejabberd}}
-
 === Registering FreedomBox users to use XMPP ===
 
 Currently, all users created through !FreedomBox will be able to login to the XMPP server. You can add new users through the System module [[FreedomBox/Manual/Users|Users and Groups]]. It does not matter which Groups are selected for the new user.
diff --git a/doc/manual/en/images/certificate-for-ejabberd.png b/doc/manual/en/images/certificate-for-ejabberd.png
deleted file mode 100644
index 5e68901e3..000000000
Binary files a/doc/manual/en/images/certificate-for-ejabberd.png and /dev/null differ
diff --git a/doc/manual/es/Download.raw.wiki b/doc/manual/es/Download.raw.wiki
index 713f24e92..3b0775e7e 100644
--- a/doc/manual/es/Download.raw.wiki
+++ b/doc/manual/es/Download.raw.wiki
@@ -41,25 +41,11 @@ Es importante verificar las imágenes que has descargado para asegurar que el fi
 
   * Primero abre un terminal e importa las claves publicas de los desarrolladores de !FreedomBox que construyeron las imágenes:
   {{{
-$ gpg --recv-keys BCBEBD57A11F70B23782BC5736C361440C9BC971
-
-$ gpg --recv-keys 7D6ADB750F91085589484BE677C0C75E7B650808
-
-# Esta es la clave del servidor de integración contínua de FreedomBox
-$ gpg --recv-keys 013D86D8BA32EAB4A6691BF85D4153D6FE188FC8
-}}}
-  Si este comando muestra un error como ''new key but contains no user ID - skipped'' usa un servidor de claves diferente para descargarlas:
-  {{{
-$ gpg --keyserver keys.gnupg.net --recv-keys BCBEBD57A11F70B23782BC5736C361440C9BC971
-$ gpg --keyserver keys.gnupg.net --recv-keys 7D6ADB750F91085589484BE677C0C75E7B650808
-$ gpg --keyserver keys.gnupg.net --recv-keys 013D86D8BA32EAB4A6691BF85D4153D6FE188FC8
-  }}}
-  O
-  {{{
 $ gpg --keyserver keyserver.ubuntu.com --recv-keys BCBEBD57A11F70B23782BC5736C361440C9BC971
 $ gpg --keyserver keyserver.ubuntu.com --recv-keys 7D6ADB750F91085589484BE677C0C75E7B650808
+# Esta es la clave del servidor de integración contínua de FreedomBox
 $ gpg --keyserver keyserver.ubuntu.com --recv-keys 013D86D8BA32EAB4A6691BF85D4153D6FE188FC8
-  }}}
+}}}
   * A continuación, verifica la huella de las claves públicas:
   {{{
 $ gpg --fingerprint BCBEBD57A11F70B23782BC5736C361440C9BC971
diff --git a/doc/manual/es/ReleaseNotes.raw.wiki b/doc/manual/es/ReleaseNotes.raw.wiki
index 838e5cbf2..c5c45d25f 100644
--- a/doc/manual/es/ReleaseNotes.raw.wiki
+++ b/doc/manual/es/ReleaseNotes.raw.wiki
@@ -10,6 +10,20 @@ For more technical details, see the [[https://salsa.debian.org/freedombox-team/f
 
 The following are the release notes for each !FreedomBox version.
 
+== FreedomBox 21.8 (2021-08-30) ==
+
+=== Highlights ===
+
+ * wordpress: New app to manage a !WordPress site/blog
+
+=== Other Changes ===
+
+ * d/control: Drop wireless-tools as recommends
+ * email: Basic app to manage an email server
+   - Email server app is currently disabled by default, so it is not yet visible in the interface.
+ * locale: Update translations for Norwegian Bokmål, Ukrainian
+ * security: Remove display of past vulnerabilities
+
 == FreedomBox 21.7 (2021-08-16) ==
 
 === Highlights ===
diff --git a/doc/manual/es/ejabberd.raw.wiki b/doc/manual/es/ejabberd.raw.wiki
index baea0f7aa..287633db3 100644
--- a/doc/manual/es/ejabberd.raw.wiki
+++ b/doc/manual/es/ejabberd.raw.wiki
@@ -38,12 +38,6 @@ Una vez tengas ya tu Nombre de Dominio puedes decirle a tu !FreedomBox que lo us
 
 Ten en cuenta que de momento [[es/FreedomBox/Manual/PageKite|PageKite]] no soporta el protocolo XMPP.
 
-=== Usar certificado Let's encrypt para ejabberd ===
-
-Si tu servidor !FreedomBox usa certificado Let's Encrypt querrás emplearlo también para ejabberd. Para ello, ve como admin de !FreedomBox a '''Sistema''' > '''Let's Encrypt''' y marca la caja `Usar certificado para ejabberd`:
-
-{{attachment:FreedomBox/Manual/ejabberd/certificate-for-ejabberd.png|Uso de certificado para Ejabberd}}
-
 === Habilitar a usuarios para usar XMPP ===
 
 Actualmente todos los usuarios creados con !FreedomBox podrán ingresar al servidor XMPP. Puedes añadir usuarios nuevos con el módulo [[es/FreedomBox/Manual/Users|Usuarios y Grupos]] del Sistema. Los grupos seleccionados para el usuario nuevo no importan.
diff --git a/doc/manual/es/images/certificate-for-ejabberd.png b/doc/manual/es/images/certificate-for-ejabberd.png
deleted file mode 100644
index 5e68901e3..000000000
Binary files a/doc/manual/es/images/certificate-for-ejabberd.png and /dev/null differ