diff --git a/packages/emails/src/billing.test.tsx b/packages/emails/src/billing.test.tsx
index 3601fae5..7586ea2e 100644
--- a/packages/emails/src/billing.test.tsx
+++ b/packages/emails/src/billing.test.tsx
@@ -471,6 +471,10 @@ describe("send plumbing", () => {
     });
     expect(id).toBe("email_123");
     const [payload, options] = send.calls[0].args;
+    expect(payload.from).toBe(
+      "openstatus <notifications@notifications.openstatus.dev>",
+    );
+    expect(payload.replyTo).toBe("ping@openstatus.dev");
     expect(payload.scheduledAt).toBe("2026-09-22T00:00:00.000Z");
     expect(options).toEqual({
       idempotencyKey: "stripe:evt_2:plan-ending-soon",
@@ -503,9 +507,9 @@ describe("send plumbing", () => {
     });
     const [payload, options] = send.calls[0].args;
     expect(payload.from).toBe(
-      "Thibault from openstatus <thibault@notifications.openstatus.dev>",
+      "openstatus <notifications@notifications.openstatus.dev>",
     );
-    expect(payload.replyTo).toBe("thibault@openstatus.dev");
+    expect(payload.replyTo).toBe("ping@openstatus.dev");
     expect(payload.subject).toBe(
       "Your trial ends on 25 Sep — add a payment method to keep starter",
     );
diff --git a/packages/emails/src/billing.tsx b/packages/emails/src/billing.tsx
index bb006074..f4cc46a9 100644
--- a/packages/emails/src/billing.tsx
+++ b/packages/emails/src/billing.tsx
@@ -197,8 +197,8 @@ export async function schedulePlanEndingSoon(
   if (!scheduledAt) return;
   return sendEmail(
     {
-      from: SIGNED_FROM,
-      reply_to: SIGNED_REPLY_TO,
+      from: SYSTEM_FROM,
+      reply_to: SUPPORT_EMAIL,
       to,
       subject: planEndingSoonSubject(props),
       react: <PlanEndingSoonEmail {...props} />,
@@ -217,8 +217,8 @@ export async function sendTrialEnding(
   const { to, eventId, ...props } = req;
   return sendEmail(
     {
-      from: SIGNED_FROM,
-      reply_to: SIGNED_REPLY_TO,
+      from: SYSTEM_FROM,
+      reply_to: SUPPORT_EMAIL,
       to,
       subject: trialEndingSubject(props),
       react: <TrialEndingEmail {...props} />,