diff --git a/lib/libs/email/content/upload-subsequent-documents/emailTemplates/MedSpaCMS.tsx b/lib/libs/email/content/upload-subsequent-documents/emailTemplates/MedSpaCMS.tsx
new file mode 100644
index 0000000000..873c4c9acb
--- /dev/null
+++ b/lib/libs/email/content/upload-subsequent-documents/emailTemplates/MedSpaCMS.tsx
@@ -0,0 +1,33 @@
+import { CommonEmailVariables, Events } from "shared-types";
+import {
+  PackageDetails,
+  BasicFooter,
+  Attachments,
+  SubDocHowToAccess,
+} from "../../email-components";
+import { BaseEmailTemplate } from "../../email-templates";
+
+export const MedSpaCMSEmail = (props: {
+  variables: Events["UploadSubsequentDocuments"] & CommonEmailVariables;
+}) => {
+  const variables = props.variables;
+
+  return (
+    <BaseEmailTemplate
+      previewText={`Medicaid SPA ${variables.id}`}
+      heading={`New documents have been submitted for Medicaid SPA ${variables.id} in OneMAC.`}
+      applicationEndpointUrl={variables.applicationEndpointUrl}
+      footerContent={<BasicFooter />}
+    >
+      <PackageDetails
+        details={{
+          "State or Territory": variables.territory,
+          "Medicaid SPA Package ID": variables.id,
+          Summary: variables.additionalInformation,
+        }}
+      />
+      <Attachments attachments={variables.attachments} />
+      <SubDocHowToAccess appEndpointURL={variables.applicationEndpointUrl} />
+    </BaseEmailTemplate>
+  );
+};
diff --git a/lib/libs/email/content/upload-subsequent-documents/emailTemplates/MedSpaState.tsx b/lib/libs/email/content/upload-subsequent-documents/emailTemplates/MedSpaState.tsx
new file mode 100644
index 0000000000..412eea861c
--- /dev/null
+++ b/lib/libs/email/content/upload-subsequent-documents/emailTemplates/MedSpaState.tsx
@@ -0,0 +1,35 @@
+import { Events } from "shared-types";
+import { CommonEmailVariables } from "shared-types";
+import { Text } from "@react-email/components";
+import { PackageDetails, Attachments, BasicFooter } from "../../email-components";
+import { BaseEmailTemplate } from "../../email-templates";
+import { styles } from "../../email-styles";
+
+export const MedSpaStateEmail = (props: {
+  variables: Events["UploadSubsequentDocuments"] & CommonEmailVariables;
+}) => {
+  const variables = props.variables;
+
+  return (
+    <BaseEmailTemplate
+      previewText={`Additional documents submitted for Medicaid SPA ${variables.id}`}
+      heading={`You’ve successfully submitted the following to CMS reviewers for Medicaid SPA ${variables.id}`}
+      applicationEndpointUrl={variables.applicationEndpointUrl}
+      footerContent={<BasicFooter />}
+    >
+      <PackageDetails
+        details={{
+          "State or Territory": variables.territory,
+          Name: variables.submitterName,
+          "Email Address": variables.submitterEmail,
+          "Medicaid SPA Package ID": variables.id,
+          Summary: variables.additionalInformation,
+        }}
+      />
+      <Attachments attachments={variables.attachments} />
+      <Text style={{ ...styles.text.base, marginTop: "16px" }}>
+        If you have questions or did not expect this email, please contact your CPOC.
+      </Text>
+    </BaseEmailTemplate>
+  );
+};
diff --git a/lib/libs/email/content/upload-subsequent-documents/emailTemplates/index.tsx b/lib/libs/email/content/upload-subsequent-documents/emailTemplates/index.tsx
index 3136b593cb..4bdb9b9643 100644
--- a/lib/libs/email/content/upload-subsequent-documents/emailTemplates/index.tsx
+++ b/lib/libs/email/content/upload-subsequent-documents/emailTemplates/index.tsx
@@ -1,4 +1,6 @@
 export { ChipSpaCMSEmail } from "./ChipSpaCMS";
 export { ChipSpaStateEmail } from "./ChipSpaState";
+export { MedSpaCMSEmail } from "./MedSpaCMS";
+export { MedSpaStateEmail } from "./MedSpaState";
 export { AppKStateEmail } from "./AppKState";
 export { AppKCMSEmail } from "./AppKCMS";
diff --git a/lib/libs/email/preview/Upload Subsequent Documents/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Upload Subsequent Documents/CMS/CHIP_SPA.tsx
index 0ee8ce9d25..ceec9f1c25 100644
--- a/lib/libs/email/preview/Upload Subsequent Documents/CMS/CHIP_SPA.tsx	
+++ b/lib/libs/email/preview/Upload Subsequent Documents/CMS/CHIP_SPA.tsx	
@@ -1,4 +1,4 @@
-import { ChipSpaCMSEmail } from "lib/libs/email/content/upload-subsequent-documents/emailTemplates/ChipSpaCMS";
+import { ChipSpaCMSEmail } from "lib/libs/email/content/upload-subsequent-documents/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/upload-subsequent-documents";
 import * as attachments from "lib/libs/email/mock-data/attachments";
 
@@ -10,6 +10,7 @@ const ChipSpaCMSEmailPreview = () => {
         id: "CO-24-1234",
         event: "upload-subsequent-documents",
         actionType: "Amend",
+        authority: "CHIP SPA",
         attachments: {
           currentStatePlan: attachments.currentStatePlan,
           amendedLanguage: attachments.amendedLanguage,
diff --git a/lib/libs/email/preview/Upload Subsequent Documents/CMS/MED_SPA.tsx b/lib/libs/email/preview/Upload Subsequent Documents/CMS/MED_SPA.tsx
new file mode 100644
index 0000000000..7b41cf0a4d
--- /dev/null
+++ b/lib/libs/email/preview/Upload Subsequent Documents/CMS/MED_SPA.tsx	
@@ -0,0 +1,28 @@
+import { MedSpaCMSEmail } from "lib/libs/email/content/upload-subsequent-documents/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/upload-subsequent-documents";
+import * as attachments from "lib/libs/email/mock-data/attachments";
+
+const ChipSpaCMSEmailPreview = () => {
+  return (
+    <MedSpaCMSEmail
+      variables={{
+        ...emailTemplateValue,
+        id: "CO-24-1234",
+        event: "upload-subsequent-documents",
+        actionType: "Amend",
+        authority: "Medicaid SPA",
+        attachments: {
+          currentStatePlan: attachments.currentStatePlan,
+          amendedLanguage: attachments.amendedLanguage,
+          coverLetter: attachments.coverLetter,
+          budgetDocuments: attachments.budgetDocuments,
+          publicNotice: attachments.publicNotice,
+          tribalConsultation: attachments.tribalConsultation,
+          other: attachments.other,
+        },
+      }}
+    />
+  );
+};
+
+export default ChipSpaCMSEmailPreview;
diff --git a/lib/libs/email/preview/Upload Subsequent Documents/State/CHIP_SPA.tsx b/lib/libs/email/preview/Upload Subsequent Documents/State/CHIP_SPA.tsx
index 5c1b7e9471..053adeb217 100644
--- a/lib/libs/email/preview/Upload Subsequent Documents/State/CHIP_SPA.tsx	
+++ b/lib/libs/email/preview/Upload Subsequent Documents/State/CHIP_SPA.tsx	
@@ -9,6 +9,7 @@ const ChipSpaStateEmailPreview = () => {
         id: "CO-24-1234",
         event: "upload-subsequent-documents",
         actionType: "Amend",
+        authority: "CHIP SPA",
         attachments: {
           currentStatePlan: attachments.currentStatePlan,
           amendedLanguage: attachments.amendedLanguage,
diff --git a/lib/libs/email/preview/Upload Subsequent Documents/State/MED_SPA.tsx b/lib/libs/email/preview/Upload Subsequent Documents/State/MED_SPA.tsx
new file mode 100644
index 0000000000..44e2ac684c
--- /dev/null
+++ b/lib/libs/email/preview/Upload Subsequent Documents/State/MED_SPA.tsx	
@@ -0,0 +1,27 @@
+import { emailTemplateValue } from "lib/libs/email/mock-data/upload-subsequent-documents";
+import { MedSpaStateEmail } from "lib/libs/email/content/upload-subsequent-documents/emailTemplates";
+import * as attachments from "lib/libs/email/mock-data/attachments";
+const ChipSpaStateEmailPreview = () => {
+  return (
+    <MedSpaStateEmail
+      variables={{
+        ...emailTemplateValue,
+        id: "CO-24-1234",
+        event: "upload-subsequent-documents",
+        actionType: "Amend",
+        authority: "Medicaid SPA",
+        attachments: {
+          currentStatePlan: attachments.currentStatePlan,
+          amendedLanguage: attachments.amendedLanguage,
+          coverLetter: attachments.coverLetter,
+          budgetDocuments: attachments.budgetDocuments,
+          publicNotice: attachments.publicNotice,
+          tribalConsultation: attachments.tribalConsultation,
+          other: attachments.other,
+        },
+      }}
+    />
+  );
+};
+
+export default ChipSpaStateEmailPreview;