diff --git a/changes/23309-mastodon-in-email-templates b/changes/23309-mastodon-in-email-templates
new file mode 100644
index 000000000000..6eac06da3e60
--- /dev/null
+++ b/changes/23309-mastodon-in-email-templates
@@ -0,0 +1 @@
+* Added Mastodon icon and URL to server email templates.
diff --git a/server/mail/templates/change_email_confirmation.html b/server/mail/templates/change_email_confirmation.html
index d557c06180de..917e45a8a2a3 100644
--- a/server/mail/templates/change_email_confirmation.html
+++ b/server/mail/templates/change_email_confirmation.html
@@ -143,6 +143,13 @@ <h1>Confirm your updated email address</h1>
                       src="{{.AssetURL}}/fleet-mark-color-40x40@2x.png"
                     />
                   </a>
+                  <a href="https://discuss.systems/@Fleet" target="_blank">
+                    <img
+                      alt="Mastodon logo"
+                      style="height: 20px; width: 20px; padding-right: 20px"
+                      src="{{.AssetURL}}/mastodon-logo-50x40@2x.png"
+                    />
+                  </a>
                   <a href="https://twitter.com/fleetctl" target="_blank">
                     <img
                       alt="X logo"
diff --git a/server/mail/templates/invite_token.html b/server/mail/templates/invite_token.html
index 1ec737480739..1be6dba03df3 100644
--- a/server/mail/templates/invite_token.html
+++ b/server/mail/templates/invite_token.html
@@ -176,6 +176,13 @@ <h1>You have been invited to Fleet!</h1>
                       src="{{.AssetURL}}/fleet-mark-color-40x40@2x.png"
                     />
                   </a>
+                  <a href="https://discuss.systems/@Fleet" target="_blank">
+                    <img
+                      alt="Mastodon logo"
+                      style="height: 20px; width: 20px; padding-right: 20px"
+                      src="{{.AssetURL}}/mastodon-logo-50x40@2x.png"
+                    />
+                  </a>
                   <a href="https://twitter.com/fleetctl" target="_blank">
                     <img
                       alt="X logo"
diff --git a/server/mail/templates/mfa.html b/server/mail/templates/mfa.html
index a0441d856c51..63eb9ba2efa9 100644
--- a/server/mail/templates/mfa.html
+++ b/server/mail/templates/mfa.html
@@ -148,6 +148,13 @@ <h1>Log in to Fleet</h1>
                       src="{{.AssetURL}}/fleet-mark-color-40x40@2x.png"
                     />
                   </a>
+                  <a href="https://discuss.systems/@Fleet" target="_blank">
+                    <img
+                      alt="Mastodon logo"
+                      style="height: 20px; width: 20px; padding-right: 20px"
+                      src="{{.AssetURL}}/mastodon-logo-50x40@2x.png"
+                    />
+                  </a>
                   <a href="https://twitter.com/fleetctl" target="_blank">
                     <img
                       alt="X logo"
diff --git a/server/mail/templates/password_reset.html b/server/mail/templates/password_reset.html
index ab652bb844ab..8797a2974d73 100644
--- a/server/mail/templates/password_reset.html
+++ b/server/mail/templates/password_reset.html
@@ -148,6 +148,13 @@ <h1>Reset your Fleet password</h1>
                       src="{{.AssetURL}}/fleet-mark-color-40x40@2x.png"
                     />
                   </a>
+                  <a href="https://discuss.systems/@Fleet" target="_blank">
+                    <img
+                      alt="Mastodon logo"
+                      style="height: 20px; width: 20px; padding-right: 20px"
+                      src="{{.AssetURL}}/mastodon-logo-50x40@2x.png"
+                    />
+                  </a>
                   <a href="https://twitter.com/fleetctl" target="_blank">
                     <img
                       alt="X logo"
diff --git a/server/mail/templates/smtp_setup.html b/server/mail/templates/smtp_setup.html
index 8ea22c2175fd..b52b6ba0ba33 100644
--- a/server/mail/templates/smtp_setup.html
+++ b/server/mail/templates/smtp_setup.html
@@ -122,6 +122,13 @@ <h1>Fleet SMTP setup confirmed</h1>
                       src="{{.AssetURL}}/fleet-mark-color-40x40@2x.png"
                     />
                   </a>
+                  <a href="https://discuss.systems/@Fleet" target="_blank">
+                    <img
+                      alt="Mastodon logo"
+                      style="height: 20px; width: 20px; padding-right: 20px"
+                      src="{{.AssetURL}}/mastodon-logo-50x40@2x.png"
+                    />
+                  </a>
                   <a href="https://twitter.com/fleetctl" target="_blank">
                     <img
                       alt="X logo"
diff --git a/website/assets/images/permanent/mastodon-logo-50x40@2x.png b/website/assets/images/permanent/mastodon-logo-50x40@2x.png
new file mode 100644
index 000000000000..5a0e6124fc05
Binary files /dev/null and b/website/assets/images/permanent/mastodon-logo-50x40@2x.png differ