diff --git a/docs/email.md b/docs/email.md
index 5aa097ae..61bda2c9 100644
--- a/docs/email.md
+++ b/docs/email.md
@@ -251,61 +251,6 @@ Tuta will [delete inactive free accounts](https://tuta.com/support#inactive-acco
Tuta offers the business version of [Tuta to non-profit organizations](https://tuta.com/blog/secure-email-for-non-profit) for free or with a heavy discount.
-## Self-Hosting Email
-
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
-
-### Stalwart
-
-
-
-{ align=right }
-
-**Stalwart** is a newer mail server written in Rust which supports JMAP in addition to the standard IMAP, POP3, and SMTP. It has a wide variety of configuration options, but it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
-
-[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
-[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
-
-
-
-Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
-
-Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
-
-### Mailcow
-
-
-
-{ align=right }
-
-**Mailcow** is a more advanced mail server perfect for those with a bit more Linux experience. It has everything you need in a Docker container: a mail server with DKIM support, antivirus and spam monitoring, webmail and ActiveSync with SOGo, and web-based administration with 2FA support.
-
-[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
-[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
-
-
-
-### Mail-in-a-Box
-
-
-
-{ align=right }
-
-**Mail-in-a-Box** is an automated setup script for deploying a mail server on Ubuntu. Its goal is to make it easier for people to set up their own mail server.
-
-[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
-[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
-[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
-
-
-
## Criteria
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/docs/self-hosting/email-servers.md b/docs/self-hosting/email-servers.md
new file mode 100644
index 00000000..7cf55f78
--- /dev/null
+++ b/docs/self-hosting/email-servers.md
@@ -0,0 +1,65 @@
+---
+title: Email Servers
+meta_title: "Self-Hosted Email - Privacy Guides"
+icon: material/email
+description: For our more technical readers, self-hosting your own email can provide additional privacy assurances by having maximum control over your data.
+cover: email.webp
+---
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
+
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+## Stalwart
+
+
+
+{ align=right }
+
+**Stalwart** is a newer mail server written in Rust which supports JMAP in addition to the standard IMAP, POP3, and SMTP. It has a wide variety of configuration options, but also defaults to very reasonable settings in terms of both security and features, making it easy to use immediately. It has web-based administration with TOTP 2FA support and allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory (WKD) on your domain, and if you use an email client which supports PGP and WKD for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](../email.md#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](../email-clients.md) or find an open-source webmail to self-host, like Nextcloud's Mail app.
+
+We use Stalwart for our own internal email at *Privacy Guides*.
+
+## Mailcow
+
+
+
+{ align=right }
+
+**Mailcow** is an advanced mail server perfect for those with Linux experience. It has everything you need in a Docker container: a mail server with DKIM support, antivirus and spam monitoring, webmail and ActiveSync with SOGo, and web-based administration with 2FA support.
+
+[:octicons-home-16: Homepage](https://mailcow.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://docs.mailcow.email){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mailcow/mailcow-dockerized){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://servercow.de/mailcow?lang=en#sal){ .card-link title="Contribute" }
+
+
+
+## Mail-in-a-Box
+
+
+
+{ align=right }
+
+**Mail-in-a-Box** is an automated setup script for deploying a mail server on Ubuntu. Its goal is to make it easier for people to set up their own mail server.
+
+[:octicons-home-16: Homepage](https://mailinabox.email){ .md-button .md-button--primary }
+[:octicons-info-16:](https://mailinabox.email/guide.html){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/mail-in-a-box/mailinabox){ .card-link title="Source Code" }
+
+
diff --git a/docs/self-hosting/index.md b/docs/self-hosting/index.md
new file mode 100644
index 00000000..7874dc23
--- /dev/null
+++ b/docs/self-hosting/index.md
@@ -0,0 +1,169 @@
+---
+title: Self-Hosting
+meta_title: "Self-Hosted Software and Services - Privacy Guides"
+description: For our more technical readers, self-hosted software and services can provide additional privacy assurances since you have maximum control over your data.
+cover: router.webp
+---
+Protects against the following threat(s):
+
+- [:material-server-network: Service Providers](../basics/common-threats.md#privacy-from-service-providers){ .pg-teal }
+
+Using **self-hosted software and services** can be a way to achieve a higher level of privacy through digital sovereignty, particularly independence from cloud servers controlled by product developers or vendors. By self-hosting, we mean hosting applications and data on your own hardware.
+
+Self-hosting your own solutions requires advanced technical knowledge and a deep understanding of the associated risks. By becoming the host for yourself and possibly others, you take on responsibilities you might not otherwise have. Self-hosting privacy software improperly can leave you worse off than using e.g. an end-to-end encrypted service provider, so it is best avoided if you are not already comfortable doing so.
+
+## :material-email: Email Servers
+
+
+
+[Learn more :material-arrow-right-drop-circle:](email-servers.md)
+
+## :material-account-supervisor-circle-outline: Social Networks
+
+Self-hosting your own instance of a social network software can help circumvent potential [censorship on a server level](../social-networks.md#censorship-resistance) by a public server's administrator or admin team.
+
+### Mastodon
+
+
+
+{ align=right }
+
+**Mastodon** is a social network based on open web protocols and free, open-source software. It uses the decentralized **:simple-activitypub: ActivityPub** protocol.
+
+[:octicons-home-16:](https://joinmastodon.org){ .card-link title="Homepage" }
+[:octicons-info-16:](https://docs.joinmastodon.org/admin/prerequisites){ .card-link title="Admin Documentation" }
+
+
+
+Mastodon [integrates with the Tor network](https://docs.joinmastodon.org/admin/optional/tor) for more extreme scenarios where even your underlying hosting provider is subject to censorship, but this may limit who can access your content to only other servers which integrate with Tor (like most other hidden services).
+
+Mastodon benefits greatly from a large and active self-hosting community, and its administration is comprehensively documented. While many other ActivityPub platforms can require extensive technical knowledge to run and troubleshoot, Mastodon has very stable and tested releases, and it can generally be run securely without issue by anyone who can use the Linux command line and follow step-by-step instructions.
+
+### Element
+
+
+
+{ align=right }
+
+**Element** is the flagship client for the **:simple-matrix: Matrix** protocol, an open standard that enables decentralized communication by way of federated chat rooms.
+
+[:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+[:octicons-info-16:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+[:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }
+
+
+
+## :material-flip-to-front: Frontends
+
+Self-hosting your own instance of a web-based frontend can help you circumvent rate limits that you may encounter on high-traffic, public instances. It is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+
+
+
+## More Tools...
+
+Tool recommendations in other categories of the website also provide a self-hosted option, so you could consider this if you are confident in your ability to host the software after reading their documentation.
+
+
diff --git a/docs/tools.md b/docs/tools.md
index 5619fa81..ced3968d 100644
--- a/docs/tools.md
+++ b/docs/tools.md
@@ -9,6 +9,9 @@ description: A complete list of the privacy tools, services, software, and hardw
If you're looking for a specific solution to something, these are the hardware and software tools we recommend in a variety of categories. Our recommended privacy tools are primarily chosen based on security features, with additional emphasis on decentralized and open-source tools. They are applicable to a variety of threat models ranging from protection against global mass surveillance programs and avoiding big tech companies to mitigating attacks, but only you can determine what will work best for your needs.
+
+
+
[VPN Providers](vpn.md){ .md-button }
[Password Managers](passwords.md){ .md-button }
[Email Providers](email.md){ .md-button }
@@ -16,6 +19,19 @@ If you're looking for a specific solution to something, these are the hardware a
[DNS Servers](dns.md){ .md-button }
[Email Aliasing Services](email-aliasing.md){ .md-button }
[Photo Organization Tools](photo-management.md){ .md-button }
+
+
+
+
+
+
+
+
+[Self-hosting recommendations](self-hosting/index.md) have been moved to their own category.
+
+
+
+
If you want assistance figuring out the best privacy tools and alternative programs for your needs, start a discussion on our [forum](https://discuss.privacyguides.net) or our [Matrix](https://matrix.to/#/#privacyguides:matrix.org) community!
@@ -217,19 +233,8 @@ If you're looking for added **security**, you should always ensure you're connec
- { .twemoji loading=lazy } [Addy.io](email-aliasing.md#addyio)
- { .twemoji loading=lazy } [SimpleLogin](email-aliasing.md#simplelogin)
-
-
@@ -422,7 +427,7 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
-#### Cross-platform Tools
+#### Cross-Platform Tools
@@ -486,9 +491,9 @@ For encrypting your OS drive, we typically recommend using the encryption tool y
- { .twemoji loading=lazy } [Drip](health-and-wellness.md#drip)
- { .twemoji loading=lazy } [Euki](health-and-wellness.md#euki)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health](health-and-wellness.md#apple-health)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health](health-and-wellness.md#apple-health)
- { .twemoji loading=lazy }{ .twemoji loading=lazy } [Gadgetbridge](health-and-wellness.md#gadgetbridge)
-- { .twemoji loading=lazy } { .twemoji loading=lazy }[Apple Health Records](health-and-wellness.md#apple-health-records)
+- { .twemoji loading=lazy } { .twemoji loading=lazy } [Apple Health Records](health-and-wellness.md#apple-health-records)
- { .twemoji loading=lazy } [CommonHealth](health-and-wellness.md#commonhealth)
diff --git a/mkdocs.yml b/mkdocs.yml
index b6ca6ceb..4de3534d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -393,6 +393,9 @@ nav:
- "os/windows/group-policies.md"
- !ENV [NAV_RECOMMENDATIONS, "Recommendations"]:
- "tools.md"
+ - !ENV [NAV_SELF_HOSTING, "Self-Hosting"]:
+ - "self-hosting/index.md"
+ - "self-hosting/email-servers.md"
- !ENV [NAV_INTERNET_BROWSING, "Internet Browsing"]:
- "tor.md"
- "desktop-browsers.md"
diff --git a/theme/assets/img/email/mail-in-a-box.svg b/theme/assets/img/self-hosting/mail-in-a-box.svg
similarity index 100%
rename from theme/assets/img/email/mail-in-a-box.svg
rename to theme/assets/img/self-hosting/mail-in-a-box.svg
diff --git a/theme/assets/img/email/mailcow.svg b/theme/assets/img/self-hosting/mailcow.svg
similarity index 99%
rename from theme/assets/img/email/mailcow.svg
rename to theme/assets/img/self-hosting/mailcow.svg
index fc00d42d..62b1f0a0 100644
--- a/theme/assets/img/email/mailcow.svg
+++ b/theme/assets/img/self-hosting/mailcow.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/theme/assets/img/email/stalwart.svg b/theme/assets/img/self-hosting/stalwart.svg
similarity index 100%
rename from theme/assets/img/email/stalwart.svg
rename to theme/assets/img/self-hosting/stalwart.svg