diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx
index 516a2b0475..91ac6b24c8 100644
--- a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx
+++ b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx
@@ -6,27 +6,22 @@ export const WaiverCMSEmail = ({
   variables,
 }: {
   variables: Events["WithdrawPackage"] & CommonEmailVariables;
-}) => {
-  const previewText = `Withdrawal of ${variables.authority} ${variables.id}`;
-  const heading =
-    "The OneMAC Submission Portal received a request to withdraw the package below. The package will no longer be considered for CMS review:";
-  return (
-    <BaseEmailTemplate
-      previewText={previewText}
-      heading={heading}
-      applicationEndpointUrl={variables.applicationEndpointUrl}
-      footerContent={<BasicFooter />}
-    >
-      <PackageDetails
-        details={{
-          "State or territory": variables.territory,
-          Name: variables.submitterName,
-          "Email Address": variables.submitterEmail,
-          "Waiver Number": variables.id,
-          Summary: variables.additionalInformation,
-        }}
-      />
-      <SpamWarning />
-    </BaseEmailTemplate>
-  );
-};
+}) => (
+  <BaseEmailTemplate
+    previewText={`Waiver Package ${variables.id} Withdraw Request`}
+    heading="The OneMAC Submission Portal received a request to withdraw the package below. The package will no longer be considered for CMS review:"
+    applicationEndpointUrl={variables.applicationEndpointUrl}
+    footerContent={<BasicFooter />}
+  >
+    <PackageDetails
+      details={{
+        "State or territory": variables.territory,
+        Name: variables.submitterName,
+        "Email Address": variables.submitterEmail,
+        "Waiver Number": variables.id,
+        Summary: variables.additionalInformation,
+      }}
+    />
+    <SpamWarning />
+  </BaseEmailTemplate>
+);
diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx
index 05bf261a4f..806cb5ad35 100644
--- a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx
+++ b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx
@@ -15,8 +15,10 @@ export const WaiverStateEmail = ({
 }) => {
   return (
     <BaseEmailTemplate
-      previewText={`Withdrawal of ${variables.authority} ${variables.id}`}
-      heading={`This is confirmation that you have requested to withdraw the package below. The package will no longer be considered for CMS review:`}
+      previewText={`Waiver Package ${variables.id} Withdraw Request`}
+      heading={
+        "This is confirmation that you have requested to withdraw the package below. The package will no longer be considered for CMS review:"
+      }
       applicationEndpointUrl={variables.applicationEndpointUrl}
       footerContent={<BasicFooter />}
     >