diff --git a/corporate/lib/stripe.py b/corporate/lib/stripe.py
index 97e631b0a2..993db9b6e7 100644
--- a/corporate/lib/stripe.py
+++ b/corporate/lib/stripe.py
@@ -4859,9 +4859,10 @@ def invoice_plans_as_needed(event_time: Optional[datetime] = None) -> None:
                     "billing_entity": billing_session.billing_entity_display_name,
                     "end_date": plan.end_date.strftime("%Y-%m-%d"),
                     "support_url": billing_session.support_url(),
+                    "notice_reason": "fixed_price_plan_ends_soon",
                 }
                 send_email(
-                    "zerver/emails/reminder_to_review_plan",
+                    "zerver/emails/internal_billing_notice",
                     to_emails=[BILLING_SUPPORT_EMAIL],
                     from_address=FromAddress.tokenized_no_reply_address(),
                     context=context,
@@ -4881,9 +4882,10 @@ def invoice_plans_as_needed(event_time: Optional[datetime] = None) -> None:
                     context = {
                         "support_url": billing_session.support_url(),
                         "last_audit_log_update": last_audit_log_update_string,
+                        "notice_reason": "invoice_overdue",
                     }
                     send_email(
-                        "zerver/emails/invoice_overdue",
+                        "zerver/emails/internal_billing_notice",
                         to_emails=[BILLING_SUPPORT_EMAIL],
                         from_address=FromAddress.tokenized_no_reply_address(),
                         context=context,
diff --git a/templates/zerver/emails/reminder_to_review_plan.html b/templates/zerver/emails/internal_billing_notice.html
similarity index 61%
rename from templates/zerver/emails/reminder_to_review_plan.html
rename to templates/zerver/emails/internal_billing_notice.html
index 67902cc453..96562db280 100644
--- a/templates/zerver/emails/reminder_to_review_plan.html
+++ b/templates/zerver/emails/internal_billing_notice.html
@@ -1,7 +1,12 @@
 {% extends "zerver/emails/email_base_default.html" %}
 
 {% block content %}
+
+{% if notice_reason == "fixed_price_plan_ends_soon" %}
 <p>Reminder to re-evaluate the pricing and configure a new fixed-price plan accordingly.</p>
+{% elif notice_reason == "invoice_overdue" %}
+<b>Last data upload</b>: {{ last_audit_log_update }}
+{% endif %}
 
 <br /><br />
 
diff --git a/templates/zerver/emails/internal_billing_notice.subject.txt b/templates/zerver/emails/internal_billing_notice.subject.txt
new file mode 100644
index 0000000000..4cb465d50a
--- /dev/null
+++ b/templates/zerver/emails/internal_billing_notice.subject.txt
@@ -0,0 +1,5 @@
+{% if notice_reason == "fixed_price_plan_ends_soon" %}
+Fixed-price plan for {{billing_entity}} ends on {{end_date}}
+{% elif notice_reason == "invoice_overdue" %}
+Invoice overdue due to stale data
+{% endif %}
diff --git a/templates/zerver/emails/internal_billing_notice.txt b/templates/zerver/emails/internal_billing_notice.txt
new file mode 100644
index 0000000000..b38acf9bbd
--- /dev/null
+++ b/templates/zerver/emails/internal_billing_notice.txt
@@ -0,0 +1,7 @@
+{% if notice_reason == "fixed_price_plan_ends_soon" %}
+Reminder to re-evaluate the pricing and configure a new fixed-price plan accordingly.
+{% elif notice_reason == "invoice_overdue" %}
+Last data upload: {{ last_audit_log_update }}
+{% endif %}
+
+Support URL: {{ support_url }}
diff --git a/templates/zerver/emails/invoice_overdue.html b/templates/zerver/emails/invoice_overdue.html
deleted file mode 100644
index 8e8b20124b..0000000000
--- a/templates/zerver/emails/invoice_overdue.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "zerver/emails/email_base_default.html" %}
-
-{% block content %}
-<b>Support URL</b>: <a href="{{ support_url }}">{{ support_url }}</a>
-
-<br /><br />
-
-<b>Last data upload</b>: {{ last_audit_log_update }}
-
-{% endblock %}
diff --git a/templates/zerver/emails/invoice_overdue.subject.txt b/templates/zerver/emails/invoice_overdue.subject.txt
deleted file mode 100644
index 56ace1e4a2..0000000000
--- a/templates/zerver/emails/invoice_overdue.subject.txt
+++ /dev/null
@@ -1 +0,0 @@
-Invoice overdue due to stale data
diff --git a/templates/zerver/emails/invoice_overdue.txt b/templates/zerver/emails/invoice_overdue.txt
deleted file mode 100644
index 7c7633be97..0000000000
--- a/templates/zerver/emails/invoice_overdue.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Support URL: {{ support_url }}
-
-Last data upload: {{ last_audit_log_update }}
diff --git a/templates/zerver/emails/reminder_to_review_plan.subject.txt b/templates/zerver/emails/reminder_to_review_plan.subject.txt
deleted file mode 100644
index c5ea2f9702..0000000000
--- a/templates/zerver/emails/reminder_to_review_plan.subject.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fixed-price plan for {{billing_entity}} ends on {{end_date}}
diff --git a/templates/zerver/emails/reminder_to_review_plan.txt b/templates/zerver/emails/reminder_to_review_plan.txt
deleted file mode 100644
index 2fa99af132..0000000000
--- a/templates/zerver/emails/reminder_to_review_plan.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Reminder to re-evaluate the pricing and configure a new fixed-price plan accordingly.
-
-Support URL: {{ support_url }}