diff --git a/quadlets/penpot/penpot-backend.env b/quadlets/penpot/penpot-backend.env
index b91e566..f95e296 100644
--- a/quadlets/penpot/penpot-backend.env
+++ b/quadlets/penpot/penpot-backend.env
@@ -57,9 +57,9 @@ PENPOT_TELEMETRY_REFERER=compose
 ## provider. Emails are used to confirm user registrations & invitations. Look below
 ## how the mailcatch service is configured.
 
-PENPOT_SMTP_DEFAULT_FROM=no-reply@example.com
-PENPOT_SMTP_DEFAULT_REPLY_TO=no-reply@example.com
-PENPOT_SMTP_HOST=penpot-mailcatch
+PENPOT_SMTP_DEFAULT_FROM=no-reply@penpot.example.com
+PENPOT_SMTP_DEFAULT_REPLY_TO=no-reply@penpot.example.com
+PENPOT_SMTP_HOST=penpot-mailcatcher
 PENPOT_SMTP_PORT=1025
 PENPOT_SMTP_USERNAME=
 PENPOT_SMTP_PASSWORD=
diff --git a/quadlets/penpot/penpot-mailcatch.container b/quadlets/penpot/penpot-mailcatcher.container
similarity index 90%
rename from quadlets/penpot/penpot-mailcatch.container
rename to quadlets/penpot/penpot-mailcatcher.container
index cfe8f7c..2895294 100644
--- a/quadlets/penpot/penpot-mailcatch.container
+++ b/quadlets/penpot/penpot-mailcatcher.container
@@ -1,5 +1,5 @@
 [Unit]
-Description=Penpot mailcatch
+Description=Penpot mailcatcher
 
 [Service]
 Restart=on-failure