diff --git a/__tests__/components/distribution-plan-tool/ReviewDistributionPlanTableSubscription.test.tsx b/__tests__/components/distribution-plan-tool/ReviewDistributionPlanTableSubscription.test.tsx
index 207c5b0f3c..ed4f099b21 100644
--- a/__tests__/components/distribution-plan-tool/ReviewDistributionPlanTableSubscription.test.tsx
+++ b/__tests__/components/distribution-plan-tool/ReviewDistributionPlanTableSubscription.test.tsx
@@ -6,26 +6,9 @@ jest.mock("@/services/api/common-api", () => ({
 
 import * as ReviewDistributionPlanTableSubscriptionModule from "@/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscription";
 import { ApiIdentity } from "@/generated/models/ApiIdentity";
-const { download, isSubscriptionsAdmin, SubscriptionConfirm } =
+const { download, isSubscriptionsAdmin } =
   ReviewDistributionPlanTableSubscriptionModule;
 
-jest.mock("react-bootstrap", () => ({
-  __esModule: true,
-  Modal: Object.assign(
-    ({ show, children }: any) => (show ? <div>{children}</div> : null),
-    {
-      Header: ({ children }: any) => <div>{children}</div>,
-      Title: ({ children }: any) => <div>{children}</div>,
-      Body: ({ children }: any) => <div>{children}</div>,
-      Footer: ({ children }: any) => <div>{children}</div>,
-    }
-  ),
-  Button: (p: any) => <button {...p}>{p.children}</button>,
-  Col: (p: any) => <div>{p.children}</div>,
-  Container: (p: any) => <div>{p.children}</div>,
-  Row: (p: any) => <div>{p.children}</div>,
-}));
-
 describe("ReviewDistributionPlanTableSubscription utilities", () => {
   it("checks subscriptions admin wallets", () => {
     const profile: Partial<ApiIdentity> = { wallets: [{ wallet: "0xabc" }] };
@@ -70,50 +53,6 @@ jest.mock("@/components/distribution-plan-tool/common/CircleLoader", () => ({
   default: () => <div data-testid="circle-loader">Loading...</div>,
 }));
 
-test("SubscriptionConfirm extracts token id from plan name", () => {
-  render(
-    <SubscriptionConfirm
-      title="t"
-      plan={{ id: "1", name: "Meme 123 drop" } as any}
-      show={true}
-      handleClose={jest.fn()}
-      onConfirm={jest.fn()}
-    />
-  );
-  const input = screen.getByRole("spinbutton") as HTMLInputElement;
-  expect(input.value).toBe("123");
-});
-
-test("SubscriptionConfirm displays token id as text when confirmedTokenId is provided", () => {
-  render(
-    <SubscriptionConfirm
-      title="t"
-      plan={{ id: "1", name: "Meme 123 drop" } as any}
-      show={true}
-      handleClose={jest.fn()}
-      confirmedTokenId="456"
-      onConfirm={jest.fn()}
-    />
-  );
-  expect(screen.queryByRole("spinbutton")).not.toBeInTheDocument();
-  expect(screen.getByText("456")).toBeInTheDocument();
-});
-
-test("SubscriptionConfirm shows input when confirmedTokenId is not provided", () => {
-  render(
-    <SubscriptionConfirm
-      title="t"
-      plan={{ id: "1", name: "Meme 123 drop" } as any}
-      show={true}
-      handleClose={jest.fn()}
-      onConfirm={jest.fn()}
-    />
-  );
-  const input = screen.getByRole("spinbutton") as HTMLInputElement;
-  expect(input).toBeInTheDocument();
-  expect(input.value).toBe("123");
-});
-
 describe("SubscriptionLinks", () => {
   const mockSetToast = jest.fn();
   const mockAuthCtx = {
@@ -124,7 +63,11 @@ describe("SubscriptionLinks", () => {
   };
 
   const mockPlan = { id: "plan1", name: "Meme 123 drop" } as any;
-  const mockDistCtx = {
+  const mockDistCtxWithTokenId = {
+    confirmedTokenId: "123",
+  } as any;
+
+  const mockDistCtxNoTokenId = {
     confirmedTokenId: null,
   } as any;
 
@@ -146,7 +89,7 @@ describe("SubscriptionLinks", () => {
     jest.restoreAllMocks();
   });
 
-  it("renders Public Subscriptions button for public phase", () => {
+  it("renders Public Subscriptions button for public phase when token is confirmed", () => {
     const publicPhase = {
       id: "phase1",
       name: "public",
@@ -155,7 +98,7 @@ describe("SubscriptionLinks", () => {
     } as any;
 
     render(
-      <DistributionPlanToolContext.Provider value={mockDistCtx}>
+      <DistributionPlanToolContext.Provider value={mockDistCtxWithTokenId}>
         <AuthContext.Provider value={mockAuthCtx as any}>
           <SubscriptionLinks plan={mockPlan} phase={publicPhase} />
         </AuthContext.Provider>
@@ -165,8 +108,7 @@ describe("SubscriptionLinks", () => {
     expect(screen.getByText("Public Subscriptions")).toBeInTheDocument();
   });
 
-  it("shows confirm modal when Public Subscriptions button is clicked", async () => {
-    const user = userEvent.setup();
+  it("does not render when token is not confirmed", () => {
     const publicPhase = {
       id: "phase1",
       name: "public",
@@ -174,24 +116,18 @@ describe("SubscriptionLinks", () => {
       phaseId: PUBLIC_SUBSCRIPTIONS_PHASE_ID,
     } as any;
 
-    render(
-      <DistributionPlanToolContext.Provider value={mockDistCtx}>
+    const { container } = render(
+      <DistributionPlanToolContext.Provider value={mockDistCtxNoTokenId}>
         <AuthContext.Provider value={mockAuthCtx as any}>
           <SubscriptionLinks plan={mockPlan} phase={publicPhase} />
         </AuthContext.Provider>
       </DistributionPlanToolContext.Provider>
     );
 
-    await user.click(screen.getByText("Public Subscriptions"));
-
-    await waitFor(() => {
-      expect(
-        screen.getByText("Confirm Download Public Subscriptions Info")
-      ).toBeInTheDocument();
-    });
+    expect(container.innerHTML).toBe("");
   });
 
-  it("calls download and shows toast when Public Subscriptions is confirmed", async () => {
+  it("calls download directly when button is clicked", async () => {
     const user = userEvent.setup();
 
     jest
@@ -215,7 +151,7 @@ describe("SubscriptionLinks", () => {
     } as any;
 
     render(
-      <DistributionPlanToolContext.Provider value={mockDistCtx}>
+      <DistributionPlanToolContext.Provider value={mockDistCtxWithTokenId}>
         <AuthContext.Provider value={mockAuthCtx as any}>
           <SubscriptionLinks plan={mockPlan} phase={publicPhase} />
         </AuthContext.Provider>
@@ -224,14 +160,6 @@ describe("SubscriptionLinks", () => {
 
     await user.click(screen.getByText("Public Subscriptions"));
 
-    await waitFor(() => {
-      expect(
-        screen.getByText("Confirm Download Public Subscriptions Info")
-      ).toBeInTheDocument();
-    });
-
-    await user.click(screen.getByText("Looks good"));
-
     await waitFor(() => {
       expect(mockSetToast).toHaveBeenCalledWith({
         type: "success",
@@ -256,7 +184,7 @@ describe("SubscriptionLinks", () => {
     } as any;
 
     const { container } = render(
-      <DistributionPlanToolContext.Provider value={mockDistCtx}>
+      <DistributionPlanToolContext.Provider value={mockDistCtxWithTokenId}>
         <AuthContext.Provider value={nonAdminCtx as any}>
           <SubscriptionLinks plan={mockPlan} phase={publicPhase} />
         </AuthContext.Provider>
@@ -266,11 +194,27 @@ describe("SubscriptionLinks", () => {
     expect(container.innerHTML).toBe("");
   });
 
-  it("displays token id as text when confirmedTokenId is provided in context", async () => {
+  it("shows loading state during download", async () => {
     const user = userEvent.setup();
-    const distCtxWithTokenId = {
-      confirmedTokenId: "789",
-    } as any;
+
+    jest
+      .spyOn(
+        ReviewDistributionPlanTableSubscriptionModule,
+        "isSubscriptionsAdmin"
+      )
+      .mockReturnValue(true);
+
+    let resolveDownload: (value: { success: boolean; message: string }) => void;
+    const downloadPromise = new Promise<{ success: boolean; message: string }>(
+      (resolve) => {
+        resolveDownload = resolve;
+      }
+    );
+
+    jest
+      .spyOn(ReviewDistributionPlanTableSubscriptionModule, "download")
+      .mockReturnValue(downloadPromise);
+
     const publicPhase = {
       id: "phase1",
       name: "public",
@@ -279,7 +223,7 @@ describe("SubscriptionLinks", () => {
     } as any;
 
     render(
-      <DistributionPlanToolContext.Provider value={distCtxWithTokenId}>
+      <DistributionPlanToolContext.Provider value={mockDistCtxWithTokenId}>
         <AuthContext.Provider value={mockAuthCtx as any}>
           <SubscriptionLinks plan={mockPlan} phase={publicPhase} />
         </AuthContext.Provider>
@@ -289,12 +233,13 @@ describe("SubscriptionLinks", () => {
     await user.click(screen.getByText("Public Subscriptions"));
 
     await waitFor(() => {
-      expect(
-        screen.getByText("Confirm Download Public Subscriptions Info")
-      ).toBeInTheDocument();
+      expect(screen.getByText("Downloading")).toBeInTheDocument();
     });
 
-    expect(screen.queryByRole("spinbutton")).not.toBeInTheDocument();
-    expect(screen.getByText("789")).toBeInTheDocument();
+    resolveDownload!({ success: true, message: "Done" });
+
+    await waitFor(() => {
+      expect(screen.getByText("Public Subscriptions")).toBeInTheDocument();
+    });
   });
 });
diff --git a/__tests__/components/distribution-plan-tool/ReviewDistributionPlanTableSubscriptionFooter.test.tsx b/__tests__/components/distribution-plan-tool/ReviewDistributionPlanTableSubscriptionFooter.test.tsx
index 44ae12ce50..e66d8dff0d 100644
--- a/__tests__/components/distribution-plan-tool/ReviewDistributionPlanTableSubscriptionFooter.test.tsx
+++ b/__tests__/components/distribution-plan-tool/ReviewDistributionPlanTableSubscriptionFooter.test.tsx
@@ -8,13 +8,6 @@ import { useMemo, useState } from "react";
 jest.mock(
   "@/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscription",
   () => ({
-    SubscriptionConfirm: (props: any) =>
-      props.show ? (
-        <button
-          data-testid={props.title}
-          onClick={() => props.onConfirm?.("c", "t")}
-        />
-      ) : null,
     download: jest.fn(async () => ({ success: true, message: "ok" })),
     isSubscriptionsAdmin: jest.fn(),
   })
@@ -54,7 +47,7 @@ jest.mock(
         <div data-testid="Confirm Token ID">
           <button
             data-testid="confirm-token-id-button"
-            onClick={() => props.onConfirm("contract", "123")}>
+            onClick={() => props.onConfirm("123")}>
             Confirm
           </button>
         </div>
@@ -138,7 +131,7 @@ test("displays contract and token id after confirmation", async () => {
   });
 });
 
-test("shows confirm modals when buttons clicked", async () => {
+test("shows upload modals when upload buttons clicked", async () => {
   const user = userEvent.setup();
   (isSubscriptionsAdmin as jest.Mock).mockReturnValue(true);
   render(<TestWrapper />);
@@ -155,14 +148,7 @@ test("shows confirm modals when buttons clicked", async () => {
       screen.getByTestId("Upload Distribution Photos")
     ).toBeInTheDocument();
   });
-  await user.click(screen.getByText("Reset Subscriptions"));
-  await waitFor(() => {
-    expect(screen.getByTestId("Reset Subscriptions")).toBeInTheDocument();
-  });
-  await user.click(screen.getByText("Finalize Distribution"));
-  await waitFor(() => {
-    expect(screen.getByTestId("Finalize Distribution")).toBeInTheDocument();
-  });
+
   await user.click(screen.getByText("Upload Automatic Airdrops"));
   await waitFor(() => {
     expect(screen.getByTestId("Automatic Airdrops")).toBeInTheDocument();
@@ -187,7 +173,7 @@ test("change token id button opens confirm modal", async () => {
   });
 });
 
-test("resetSubscriptions posts data and shows toast", async () => {
+test("resetSubscriptions posts data and shows toast directly", async () => {
   const user = userEvent.setup();
   (isSubscriptionsAdmin as jest.Mock).mockReturnValue(true);
   const commonApiPost = jest.fn().mockResolvedValue({});
@@ -208,13 +194,54 @@ test("resetSubscriptions posts data and shows toast", async () => {
   });
 
   await user.click(screen.getByText("Reset Subscriptions"));
+
+  await waitFor(() => {
+    expect(commonApiPost).toHaveBeenCalledWith(
+      expect.objectContaining({
+        endpoint: expect.stringContaining("/reset"),
+      })
+    );
+    expect(authCtx.setToast).toHaveBeenCalledWith({
+      type: "success",
+      message: "Subscriptions reset successfully.",
+    });
+  });
+});
+
+test("finalizeDistribution posts data and shows toast directly", async () => {
+  const user = userEvent.setup();
+  (isSubscriptionsAdmin as jest.Mock).mockReturnValue(true);
+  const commonApiPost = jest
+    .fn()
+    .mockResolvedValue({ success: true, message: "Normalized" });
+  jest
+    .spyOn(require("@/services/api/common-api"), "commonApiPost")
+    .mockImplementation(commonApiPost);
+
+  jest
+    .spyOn(require("@/services/api/common-api"), "commonApiFetch")
+    .mockResolvedValue({ photos_count: 0, is_normalized: false });
+
+  render(<TestWrapper />);
+
+  await user.click(screen.getByTestId("confirm-token-id-button"));
+
   await waitFor(() => {
-    expect(screen.getByTestId("Reset Subscriptions")).toBeInTheDocument();
+    expect(screen.getByText("Finalize Distribution")).toBeInTheDocument();
   });
-  await user.click(screen.getByTestId("Reset Subscriptions"));
+
+  await user.click(screen.getByText("Finalize Distribution"));
+
   await waitFor(() => {
-    expect(commonApiPost).toHaveBeenCalled();
-    expect(authCtx.setToast).toHaveBeenCalled();
+    expect(commonApiPost).toHaveBeenCalledWith(
+      expect.objectContaining({
+        endpoint: expect.stringContaining("/normalize"),
+      })
+    );
+    expect(authCtx.setToast).toHaveBeenCalledWith({
+      type: "success",
+      message: "Normalized",
+    });
   });
 });
 
diff --git a/__tests__/components/distribution-plan-tool/ReviewDistributionPlanTableSubscriptionFooterConfirmTokenId.test.tsx b/__tests__/components/distribution-plan-tool/ReviewDistributionPlanTableSubscriptionFooterConfirmTokenId.test.tsx
index 9436d02b0d..6b54093828 100644
--- a/__tests__/components/distribution-plan-tool/ReviewDistributionPlanTableSubscriptionFooterConfirmTokenId.test.tsx
+++ b/__tests__/components/distribution-plan-tool/ReviewDistributionPlanTableSubscriptionFooterConfirmTokenId.test.tsx
@@ -50,7 +50,7 @@ describe("ConfirmTokenIdModal", () => {
     );
     const confirmButton = screen.getByText("Confirm");
     await user.click(confirmButton);
-    expect(mockOnConfirm).toHaveBeenCalledWith(expect.any(String), "123");
+    expect(mockOnConfirm).toHaveBeenCalledWith("123");
   });
 
   it("calls onConfirm when Enter key is pressed with valid token id", async () => {
@@ -65,7 +65,7 @@ describe("ConfirmTokenIdModal", () => {
     const input = screen.getByRole("spinbutton");
     input.focus();
     await user.keyboard("{Enter}");
-    expect(mockOnConfirm).toHaveBeenCalledWith(expect.any(String), "123");
+    expect(mockOnConfirm).toHaveBeenCalledWith("123");
   });
 
   it("does not call onConfirm when Enter key is pressed with invalid token id", async () => {
diff --git a/__tests__/components/distribution/Distribution.test.tsx b/__tests__/components/distribution/Distribution.test.tsx
index 7b981e84d2..178f28a128 100644
--- a/__tests__/components/distribution/Distribution.test.tsx
+++ b/__tests__/components/distribution/Distribution.test.tsx
@@ -11,6 +11,19 @@ jest.mock("@/components/not-found/NotFound", () => ({
   ),
 }));
 
+const mockSetTitle = jest.fn();
+jest.mock("@/contexts/TitleContext", () => ({
+  __esModule: true,
+  useTitle: () => ({
+    title: "Test Title",
+    setTitle: mockSetTitle,
+    notificationCount: 0,
+    setNotificationCount: jest.fn(),
+    setWaveData: jest.fn(),
+    setStreamHasNewItems: jest.fn(),
+  }),
+}));
+
 // Mock useParams to return different values for different tests
 const mockUseParams = jest.fn(() => ({ id: "123" }));
 jest.mock("next/navigation", () => ({
@@ -756,4 +769,42 @@ describe("DistributionPage", () => {
       });
     });
   });
+
+  describe("Title Management", () => {
+    it("sets title when valid nft id is present", async () => {
+      mockUseParams.mockReturnValue({ id: "123" });
+      mockFetchAllPages.mockResolvedValue([]);
+      mockFetchUrl.mockResolvedValue({ count: 0, data: [] });
+
+      render(
+        <DistributionPage header="Test Collection" contract="0x123" link="" />
+      );
+
+      await waitFor(() => {
+        expect(mockSetTitle).toHaveBeenCalledWith(
+          "Test Collection #123 | DISTRIBUTION"
+        );
+      });
+    });
+
+    it("does not set title when nft id is invalid", () => {
+      mockUseParams.mockReturnValue({ id: "invalid" });
+      mockFetchAllPages.mockResolvedValue([]);
+      mockFetchUrl.mockResolvedValue({ count: 0, data: [] });
+
+      render(<DistributionPage header="Test" contract="0x123" link="" />);
+
+      expect(mockSetTitle).not.toHaveBeenCalled();
+    });
+
+    it("does not set title when nft id is missing", () => {
+      mockUseParams.mockReturnValue({ id: "" });
+      mockFetchAllPages.mockResolvedValue([]);
+      mockFetchUrl.mockResolvedValue({ count: 0, data: [] });
+
+      render(<DistributionPage header="Test" contract="0x123" link="" />);
+
+      expect(mockSetTitle).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscription.tsx b/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscription.tsx
index 571b7fb863..47ea33ca1c 100644
--- a/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscription.tsx
+++ b/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscription.tsx
@@ -6,14 +6,9 @@ import CircleLoader from "@/components/distribution-plan-tool/common/CircleLoade
 import { DistributionPlanToolContext } from "@/components/distribution-plan-tool/DistributionPlanToolContext";
 import { MEMES_CONTRACT, SUBSCRIPTIONS_ADMIN_WALLETS } from "@/constants";
 import { ApiIdentity } from "@/generated/models/ApiIdentity";
-import {
-  areEqualAddresses,
-  extractAllNumbers,
-  formatAddress,
-} from "@/helpers/Helpers";
+import { areEqualAddresses } from "@/helpers/Helpers";
 import { commonApiFetch } from "@/services/api/common-api";
 import { useContext, useState } from "react";
-import { Button, Col, Container, Modal, Row } from "react-bootstrap";
 import { PUBLIC_SUBSCRIPTIONS_PHASE_ID } from "./constants";
 import {
   ReviewDistributionPlanTableItem,
@@ -40,156 +35,59 @@ export function SubscriptionLinks(
   const { connectedProfile, setToast } = useContext(AuthContext);
   const { confirmedTokenId } = useContext(DistributionPlanToolContext);
 
-  const [showConfirm, setShowConfirm] = useState(false);
   const [downloading, setDownloading] = useState(false);
 
   if (
     !isSubscriptionsAdmin(connectedProfile) ||
-    props.phase.type !== ReviewDistributionPlanTableItemType.PHASE
+    props.phase.type !== ReviewDistributionPlanTableItemType.PHASE ||
+    !confirmedTokenId
   ) {
     return <></>;
   }
 
   const isPublic = props.phase.phaseId === PUBLIC_SUBSCRIPTIONS_PHASE_ID;
-
-  return (
-    <>
-      <button
-        onClick={() => setShowConfirm(true)}
-        disabled={downloading}
-        type="button"
-        className="tw-px-3 tw-group tw-rounded-full tw-group tw-flex tw-items-center tw-justify-center tw-h-8 tw-text-xs tw-font-medium tw-border-none tw-ring-1 tw-ring-inset tw-text-white tw-bg-blue-500 tw-ring-iron-500/50 hover:tw-bg-blue-500/50 tw-ease-out tw-transition tw-duration-300">
-        {downloading ? (
-          <span className="d-flex gap-2 align-items-center">
-            <CircleLoader />
-            <span>Downloading</span>
-          </span>
-        ) : (
-          <>{isPublic ? "Public Subscriptions" : "Subscription Lists"}</>
-        )}
-      </button>
-      <SubscriptionConfirm
-        title={
-          isPublic ? "Download Public Subscriptions" : "Download Subscriptions"
-        }
-        plan={props.plan}
-        show={showConfirm}
-        handleClose={() => setShowConfirm(false)}
-        confirmedTokenId={confirmedTokenId}
-        onConfirm={async (contract: string, tokenId: string) => {
-          setShowConfirm(false);
-          setDownloading(true);
-          try {
-            const downloadResponse = await download(
-              contract,
-              tokenId,
-              props.plan.id,
-              isPublic ? "public" : props.phase.id,
-              isPublic ? "public" : props.phase.name
-            );
-            setToast({
-              type: downloadResponse.success ? "success" : "error",
-              message: downloadResponse.message,
-            });
-          } catch (error: any) {
-            console.error("Download failed", error);
-            setToast({
-              type: "error",
-              message: "Something went wrong.",
-            });
-          } finally {
-            setDownloading(false);
-          }
-        }}
-      />
-    </>
-  );
-}
-
-export function SubscriptionConfirm(
-  props: Readonly<{
-    title: string;
-    plan: AllowlistDescription;
-    show: boolean;
-    handleClose(): void;
-    isNormalized?: boolean | undefined;
-    confirmedTokenId?: string | null | undefined;
-    onConfirm(contract: string, tokenId: string): void;
-  }>
-) {
   const contract = MEMES_CONTRACT;
-  const numbers = extractAllNumbers(props.plan.name);
-  const defaultTokenId = numbers.length > 0 ? numbers[0]!.toString() : "";
-  const [tokenId, setTokenId] = useState<string>(
-    props.confirmedTokenId ?? defaultTokenId
-  );
 
-  const displayTokenId = props.confirmedTokenId ?? tokenId;
+  const handleDownload = async () => {
+    setDownloading(true);
+    try {
+      const downloadResponse = await download(
+        contract,
+        confirmedTokenId,
+        props.plan.id,
+        isPublic ? "public" : props.phase.id,
+        isPublic ? "public" : props.phase.name
+      );
+      setToast({
+        type: downloadResponse.success ? "success" : "error",
+        message: downloadResponse.message,
+      });
+    } catch (error) {
+      console.error("Download failed", error);
+      setToast({
+        type: "error",
+        message: "Something went wrong.",
+      });
+    } finally {
+      setDownloading(false);
+    }
+  };
 
   return (
-    <Modal show={props.show} onHide={props.handleClose}>
-      <Modal.Header closeButton>
-        <Modal.Title className="tw-text-lg tw-font-semibold">
-          Confirm {props.title} Info
-        </Modal.Title>
-      </Modal.Header>
-      <hr className="mb-0 mt-0" />
-      <Modal.Body>
-        <Container>
-          <Row className="pt-2 pb-2">
-            <Col>
-              Contract: The Memes - <span>{formatAddress(contract)}</span>
-            </Col>
-          </Row>
-          <Row className="pt-2 pb-2">
-            <Col>
-              Token ID:{" "}
-              {props.confirmedTokenId !== undefined &&
-              props.confirmedTokenId !== null ? (
-                <span>{displayTokenId}</span>
-              ) : (
-                <input
-                  style={{
-                    color: "black",
-                    width: "100px",
-                  }}
-                  min={1}
-                  step={1}
-                  type="number"
-                  value={tokenId}
-                  onChange={(e) => {
-                    setTokenId(e.target.value);
-                  }}
-                />
-              )}
-            </Col>
-          </Row>
-          {props.isNormalized !== undefined && props.isNormalized && (
-            <Row className="pt-2 pb-2">
-              <Col>
-                <div className="alert alert-warning mb-0 border border-dark">
-                  ⚠️ Distribution is already normalized. This will recalculate
-                  and overwrite existing normalized data.
-                </div>
-              </Col>
-            </Row>
-          )}
-        </Container>
-      </Modal.Body>
-      <Modal.Footer>
-        <Button variant="secondary" onClick={props.handleClose}>
-          Close
-        </Button>
-        <Button
-          disabled={
-            !displayTokenId || Number.isNaN(Number.parseInt(displayTokenId, 10))
-          }
-          variant="primary"
-          onClick={() => props.onConfirm(contract, displayTokenId)}>
-          Looks good
-        </Button>
-      </Modal.Footer>
-    </Modal>
+    <button
+      onClick={handleDownload}
+      disabled={downloading}
+      type="button"
+      className="tw-px-3 tw-group tw-rounded-full tw-group tw-flex tw-items-center tw-justify-center tw-h-8 tw-text-xs tw-font-medium tw-border-none tw-ring-1 tw-ring-inset tw-text-white tw-bg-blue-500 tw-ring-iron-500/50 hover:tw-bg-blue-500/50 tw-ease-out tw-transition tw-duration-300">
+      {downloading ? (
+        <span className="d-flex gap-2 align-items-center">
+          <CircleLoader />
+          <span>Downloading</span>
+        </span>
+      ) : (
+        <>{isPublic ? "Public Subscriptions" : "Subscription Lists"}</>
+      )}
+    </button>
   );
 }
 
diff --git a/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscriptionFooter.tsx b/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscriptionFooter.tsx
index 04294236ac..8a698b5787 100644
--- a/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscriptionFooter.tsx
+++ b/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscriptionFooter.tsx
@@ -4,25 +4,24 @@ import { AuthContext } from "@/components/auth/Auth";
 import CircleLoader from "@/components/distribution-plan-tool/common/CircleLoader";
 import { DistributionPlanToolContext } from "@/components/distribution-plan-tool/DistributionPlanToolContext";
 import { MEMES_CONTRACT } from "@/constants";
+import { DistributionOverview } from "@/generated/models/DistributionOverview";
 import { formatAddress } from "@/helpers/Helpers";
-import {
-  commonApiFetch,
-  commonApiPost,
-  commonApiPostForm,
-} from "@/services/api/common-api";
+import { commonApiFetch, commonApiPost } from "@/services/api/common-api";
+import { uploadDistributionPhotos } from "@/services/distribution/distributionPhotoUpload";
 import { useCallback, useContext, useEffect, useState } from "react";
-import {
-  SubscriptionConfirm,
-  isSubscriptionsAdmin,
-} from "./ReviewDistributionPlanTableSubscription";
+import { isSubscriptionsAdmin } from "./ReviewDistributionPlanTableSubscription";
 import { AutomaticAirdropsModal } from "./ReviewDistributionPlanTableSubscriptionFooterAutomaticAirdrops";
 import { ConfirmTokenIdModal } from "./ReviewDistributionPlanTableSubscriptionFooterConfirmTokenId";
 import { UploadDistributionPhotosModal } from "./ReviewDistributionPlanTableSubscriptionFooterUploadPhotos";
 
-interface DistributionOverview {
-  photos_count: number;
-  is_normalized: boolean;
-  automatic_airdrops: number;
+function getErrorMessage(error: unknown): string {
+  if (typeof error === "string") {
+    return error;
+  }
+  if (error instanceof Error) {
+    return error.message;
+  }
+  return "Something went wrong.";
 }
 
 export function ReviewDistributionPlanTableSubscriptionFooter() {
@@ -30,11 +29,8 @@ export function ReviewDistributionPlanTableSubscriptionFooter() {
     useContext(DistributionPlanToolContext);
   const { connectedProfile, setToast } = useContext(AuthContext);
 
-  const [showSubscriptionsReset, setShowSubscriptionsReset] = useState(false);
   const [showUploadPhotos, setShowUploadPhotos] = useState(false);
   const [showAutomaticAirdrops, setShowAutomaticAirdrops] = useState(false);
-  const [showFinalizeDistribution, setShowFinalizeDistribution] =
-    useState(false);
   const [showConfirmTokenId, setShowConfirmTokenId] = useState(false);
   const [isResetting, setIsResetting] = useState(false);
   const [isUploading, setIsUploading] = useState(false);
@@ -92,7 +88,6 @@ export function ReviewDistributionPlanTableSubscriptionFooter() {
     tokenId: string,
     planId: string
   ) => {
-    setShowSubscriptionsReset(false);
     setIsResetting(true);
     try {
       await commonApiPost({
@@ -105,16 +100,53 @@ export function ReviewDistributionPlanTableSubscriptionFooter() {
       });
 
       await refreshOverview(contract, tokenId);
-    } catch (error: any) {
+    } catch (error: unknown) {
       setToast({
         type: "error",
-        message: `Reset failed: ${error}`,
+        message: `Reset failed: ${getErrorMessage(error)}`,
       });
     } finally {
       setIsResetting(false);
     }
   };
 
+  const finalizeDistribution = async (contract: string, tokenId: string) => {
+    setIsFinalizing(true);
+    try {
+      const response = await commonApiPost<
+        Record<string, never>,
+        {
+          success: boolean;
+          message?: string;
+          error?: string;
+        }
+      >({
+        endpoint: `distributions/${contract}/${tokenId}/normalize`,
+        body: {},
+      });
+
+      if (response.success) {
+        setToast({
+          type: "success",
+          message: response.message || "Distribution normalized successfully",
+        });
+        await refreshOverview(contract, tokenId);
+      } else {
+        setToast({
+          type: "error",
+          message: response.error || "Normalization failed",
+        });
+      }
+    } catch (error: unknown) {
+      setToast({
+        type: "error",
+        message: getErrorMessage(error),
+      });
+    } finally {
+      setIsFinalizing(false);
+    }
+  };
+
   if (!isSubscriptionsAdmin(connectedProfile)) {
     return <></>;
   }
@@ -151,7 +183,10 @@ export function ReviewDistributionPlanTableSubscriptionFooter() {
             Change Token ID
           </button>
           <button
-            onClick={() => setShowSubscriptionsReset(true)}
+            onClick={() =>
+              distributionPlan &&
+              resetSubscriptions(contract, confirmedTokenId, distributionPlan.id)
+            }
             disabled={isResetting}
             type="button"
             className="tw-px-3 tw-group tw-rounded-full tw-group tw-flex tw-items-center tw-justify-center tw-h-8 tw-text-sm tw-font-medium tw-border-none tw-ring-1 tw-ring-inset tw-text-iron-900 tw-bg-[#f87171] tw-ring-[#f87171]/20 hover:tw-bg-[#7f1d1d] hover:tw-text-iron-100 tw-ease-out tw-transition tw-duration-300"
@@ -188,7 +223,8 @@ export function ReviewDistributionPlanTableSubscriptionFooter() {
                 </span>
               ) : (
                 <span className="tw-ml-2">
-                  ({overview?.automatic_airdrops ?? 0})
+                  (Addresses: {overview?.automatic_airdrops_addresses ?? 0} |
+                  Count: {overview?.automatic_airdrops_count ?? 0})
                 </span>
               )}
             </>
@@ -221,7 +257,7 @@ export function ReviewDistributionPlanTableSubscriptionFooter() {
       </div>
       <div className="mt-2 d-flex align-items-center justify-content-end gap-2">
         <button
-          onClick={() => setShowFinalizeDistribution(true)}
+          onClick={() => finalizeDistribution(contract, confirmedTokenId)}
           disabled={isFinalizing}
           type="button"
           className="tw-px-3 tw-group tw-rounded-full tw-group tw-flex tw-items-center tw-justify-center tw-h-8 tw-text-sm tw-font-medium tw-border-none tw-ring-1 tw-ring-inset tw-text-iron-900 tw-bg-[#86efac] tw-ring-[#86efac]/20 hover:tw-bg-[#14532d] hover:tw-text-iron-100 tw-ease-out tw-transition tw-duration-300"
@@ -268,40 +304,21 @@ export function ReviewDistributionPlanTableSubscriptionFooter() {
               setShowUploadPhotos(false);
               setIsUploading(true);
               try {
-                const formData = new FormData();
-                files.forEach((file) => {
-                  formData.append("photos", file);
+                const uploadedUrls = await uploadDistributionPhotos({
+                  contract,
+                  tokenId,
+                  files,
                 });
 
-                const response = await commonApiPostForm<{
-                  success: boolean;
-                  photos?: string[] | undefined;
-                  error?: string | undefined;
-                }>({
-                  endpoint: `distribution_photos/${contract}/${tokenId}`,
-                  body: formData,
+                setToast({
+                  type: "success",
+                  message: `Successfully uploaded ${uploadedUrls.length} photo(s)`,
                 });
-
-                if (response.success && response.photos) {
-                  setToast({
-                    type: "success",
-                    message: `Successfully uploaded ${response.photos.length} photo(s)`,
-                  });
-                  await refreshOverview(contract, tokenId);
-                } else {
-                  setToast({
-                    type: "error",
-                    message: response.error || "Upload failed",
-                  });
-                }
-              } catch (error: any) {
-                const errorMessage =
-                  typeof error === "string"
-                    ? error
-                    : error?.message || "Something went wrong.";
+                await refreshOverview(contract, tokenId);
+              } catch (error: unknown) {
                 setToast({
                   type: "error",
-                  message: errorMessage,
+                  message: getErrorMessage(error),
                 });
               } finally {
                 setIsUploading(false);
@@ -347,81 +364,16 @@ export function ReviewDistributionPlanTableSubscriptionFooter() {
                     message: response.error || "Upload failed",
                   });
                 }
-              } catch (error: any) {
-                const errorMessage =
-                  typeof error === "string"
-                    ? error
-                    : error?.message || "Something went wrong.";
+              } catch (error: unknown) {
                 setToast({
                   type: "error",
-                  message: errorMessage,
+                  message: getErrorMessage(error),
                 });
               } finally {
                 setIsUploadingAirdrops(false);
               }
             }}
           />
-          <SubscriptionConfirm
-            title="Reset Subscriptions"
-            plan={distributionPlan}
-            show={showSubscriptionsReset}
-            handleClose={() => setShowSubscriptionsReset(false)}
-            confirmedTokenId={confirmedTokenId}
-            onConfirm={(contract: string, tokenId: string) =>
-              resetSubscriptions(contract, tokenId, distributionPlan.id)
-            }
-          />
-          <SubscriptionConfirm
-            title="Finalize Distribution"
-            plan={distributionPlan}
-            show={showFinalizeDistribution}
-            handleClose={() => setShowFinalizeDistribution(false)}
-            isNormalized={overview?.is_normalized ?? false}
-            confirmedTokenId={confirmedTokenId}
-            onConfirm={async (contract: string, tokenId: string) => {
-              setShowFinalizeDistribution(false);
-              setIsFinalizing(true);
-              try {
-                const response = await commonApiPost<
-                  Record<string, never>,
-                  {
-                    success: boolean;
-                    message?: string | undefined;
-                    error?: string | undefined;
-                  }
-                >({
-                  endpoint: `distributions/${contract}/${tokenId}/normalize`,
-                  body: {},
-                });
-
-                if (response.success) {
-                  setToast({
-                    type: "success",
-                    message:
-                      response.message ||
-                      "Distribution normalized successfully",
-                  });
-                  await refreshOverview(contract, tokenId);
-                } else {
-                  setToast({
-                    type: "error",
-                    message: response.error || "Normalization failed",
-                  });
-                }
-              } catch (error: any) {
-                const errorMessage =
-                  typeof error === "string"
-                    ? error
-                    : error?.message || "Something went wrong.";
-                setToast({
-                  type: "error",
-                  message: errorMessage,
-                });
-              } finally {
-                setIsFinalizing(false);
-              }
-            }}
-          />
         </>
       )}
     </div>
diff --git a/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscriptionFooterAutomaticAirdrops.tsx b/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscriptionFooterAutomaticAirdrops.tsx
index 3d72275111..ed46d68af2 100644
--- a/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscriptionFooterAutomaticAirdrops.tsx
+++ b/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscriptionFooterAutomaticAirdrops.tsx
@@ -46,9 +46,28 @@ export function AutomaticAirdropsModal(
     return /^0x[a-f0-9]{40}$/i.test(address.trim());
   };
 
-  const parseCsv = (csvContent: string): CsvRow[] => {
-    const lines = csvContent.split(/\r?\n/).filter((line) => line.trim());
+  const isHeaderRow = (line: string): boolean => {
+    const parts = line.split(",").map((part) => part.trim().toLowerCase());
+    if (parts.length < 2) return false;
+    const validFirstCol = parts[0] === "address" || parts[0] === "wallet";
+    const validSecondCol = parts[1] === "count" || parts[1] === "value";
+    return validFirstCol && validSecondCol;
+  };
+
+  const parseCsv = (
+    csvContent: string
+  ): { rows: CsvRow[]; hadHeader: boolean } => {
+    let lines = csvContent.split(/\r?\n/).filter((line) => line.trim());
     const rows: CsvRow[] = [];
+    let hadHeader = false;
+
+    const firstLine = lines[0];
+    if (firstLine && isHeaderRow(firstLine)) {
+      hadHeader = true;
+      lines = lines.slice(1);
+    }
+
+    const lineOffset = hadHeader ? 2 : 1;
 
     lines.forEach((line, index) => {
       const trimmedLine = line.trim();
@@ -58,7 +77,7 @@ export function AutomaticAirdropsModal(
       if (parts.length < 2) {
         throw new Error(
           `Line ${
-            index + 1
+            index + lineOffset
           }: Expected format "address,count" but found "${trimmedLine}"`
         );
       }
@@ -68,7 +87,7 @@ export function AutomaticAirdropsModal(
 
       if (!isValidAddress(address!)) {
         throw new Error(
-          `Line ${index + 1}: Invalid Ethereum address "${address}"`
+          `Line ${index + lineOffset}: Invalid Ethereum address "${address}"`
         );
       }
 
@@ -76,7 +95,7 @@ export function AutomaticAirdropsModal(
       if (Number.isNaN(count) || count < 0) {
         throw new Error(
           `Line ${
-            index + 1
+            index + lineOffset
           }: Invalid count "${countStr}". Must be a non-negative integer.`
         );
       }
@@ -87,7 +106,7 @@ export function AutomaticAirdropsModal(
       });
     });
 
-    return rows;
+    return { rows, hadHeader };
   };
 
   const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
@@ -113,7 +132,7 @@ export function AutomaticAirdropsModal(
       .text()
       .then((csvContent) => {
         try {
-          const rows = parseCsv(csvContent);
+          const { rows } = parseCsv(csvContent);
           setSelectedFile(file);
           setParsedRows(rows);
           setFileError(null);
@@ -148,10 +167,11 @@ export function AutomaticAirdropsModal(
       return;
     }
 
-    selectedFile.text().then((csvContent) => {
-      props.onUpload(contract, displayTokenId, csvContent);
-      handleClose();
-    });
+    const csvContent = parsedRows
+      .map((row) => `${row.address},${row.count}`)
+      .join("\n");
+    props.onUpload(contract, displayTokenId, csvContent);
+    handleClose();
   };
 
   const handleClose = () => {
@@ -212,7 +232,7 @@ export function AutomaticAirdropsModal(
                     style={{
                       fontSize: "12px",
                     }}>
-                    address,count
+                    address,value
                   </code>
                 </div>
                 <div className="mb-2">
diff --git a/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscriptionFooterUploadPhotos.tsx b/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscriptionFooterUploadPhotos.tsx
index f1e11914ec..90c07c1dbe 100644
--- a/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscriptionFooterUploadPhotos.tsx
+++ b/components/distribution-plan-tool/review-distribution-plan/table/ReviewDistributionPlanTableSubscriptionFooterUploadPhotos.tsx
@@ -35,7 +35,7 @@ export function UploadDistributionPhotosModal(
 
   const contract = MEMES_CONTRACT;
 
-  const MAX_FILE_SIZE = 10 * 1024 * 1024;
+  const MAX_FILE_SIZE = 500 * 1024 * 1024;
   const ACCEPTED_TYPES = new Set([
     "image/jpeg",
     "image/jpg",
@@ -59,7 +59,7 @@ export function UploadDistributionPhotosModal(
         );
       }
       if (file.size > MAX_FILE_SIZE) {
-        errors.push(`${file.name}: File size exceeds 10MB limit.`);
+        errors.push(`${file.name}: File size exceeds 500MB limit.`);
       }
     });
 
diff --git a/components/distribution/Distribution.tsx b/components/distribution/Distribution.tsx
index c4fe2fc71b..94f15e840f 100644
--- a/components/distribution/Distribution.tsx
+++ b/components/distribution/Distribution.tsx
@@ -23,6 +23,7 @@ import {
 } from "@/helpers/Helpers";
 import { fetchAllPages, fetchUrl } from "@/services/6529api";
 import Image from "next/image";
+import { useTitle } from "@/contexts/TitleContext";
 import { useParams } from "next/navigation";
 import { useEffect, useState } from "react";
 import { Carousel, Col, Container, Row, Table } from "react-bootstrap";
@@ -36,6 +37,7 @@ interface Props {
 
 export default function DistributionPage(props: Readonly<Props>) {
   const params = useParams();
+  const { setTitle } = useTitle();
   const [pageProps, setPageProps] = useState<{
     page: number;
     pageSize: number;
@@ -100,6 +102,12 @@ export default function DistributionPage(props: Readonly<Props>) {
     setNftId(id);
   }, [params]);
 
+  useEffect(() => {
+    if (isValidNftId && nftId) {
+      setTitle(`${props.header} #${nftId} | DISTRIBUTION`);
+    }
+  }, [isValidNftId, nftId, props.header, setTitle]);
+
   useEffect(() => {
     if (nftId) {
       const distributionPhotosUrl = `${publicEnv.API_ENDPOINT}/api/distribution_photos/${props.contract}/${nftId}`;
diff --git a/components/waves/create-wave/services/multiPartUpload.ts b/components/waves/create-wave/services/multiPartUpload.ts
index a3833d3464..6ee105be16 100644
--- a/components/waves/create-wave/services/multiPartUpload.ts
+++ b/components/waves/create-wave/services/multiPartUpload.ts
@@ -1,50 +1,17 @@
-import axios from "axios";
-import pLimit from "p-limit";
-import pRetry from "p-retry";
-import { commonApiPost } from "@/services/api/common-api";
 import { ApiDropMedia } from "@/generated/models/ApiDropMedia";
+import {
+  multipartUploadCore,
+  getContentType,
+} from "@/services/uploads/multipartUploadCore";
 
-const MAX_FILE_SIZE = 500 * 1024 * 1024; // 500 MB
-const PART_SIZE = 5 * 1024 * 1024; // 5 MB per chunk
-const CONCURRENCY = 5; // how many parts to upload in parallel
-const RETRIES = 3; // retry each chunk up to 3 times
-const MIN_TIMEOUT = 1000; // 1 second minimum retry delay (p-retry)
-
-interface StartMultipartResponse {
-  upload_id: string;
-  key: string;
-}
-
-interface PartSignedUrlResponse {
-  upload_url: string;
-  part_no: number;
-}
-
-interface CompleteMultipartResponse {
-  media_url: string;
-}
+const MAX_FILE_SIZE = 500 * 1024 * 1024;
 
 interface MultiPartUploadParams {
-  /**
-   * The file to upload
-   */
   file: File;
-
-  /**
-   * "drop" or "wave"; used to build endpoints
-   */
   path: "drop" | "wave";
-
-  /**
-   * Optional callback that receives an integer (0..100) representing % of file uploaded.
-   */
   onProgress?: ((progressPercent: number) => void) | undefined;
 }
 
-/**
- * Multi-part upload for either "drop" or "wave" endpoints.
- * Uses concurrency, retries, and onUploadProgress for an overall progress callback.
- */
 export async function multiPartUpload({
   file,
   path,
@@ -54,191 +21,30 @@ export async function multiPartUpload({
     throw new Error("File size exceeds maximum allowed size of 500 MB");
   }
 
-  // -----------------------------------------------------
-  // 1) Start the multi-part upload on your backend
-  //    e.g. POST /api/<path>-media/multipart-upload
-  // -----------------------------------------------------
-  // Determine content type, with fallback for GLB files
-  const getContentType = (file: File): string => {
-    if (file.type) {
-      return file.type;
-    }
-
-    // Fallback MIME type detection for files without type
-    const fileName = file.name.toLowerCase();
-    if (fileName.endsWith(".glb")) {
-      return "model/gltf-binary";
-    }
-    if (fileName.endsWith(".gltf")) {
-      return "model/gltf+json";
-    }
-    if (fileName.endsWith(".mp4")) {
-      return "video/mp4";
-    }
-    if (fileName.endsWith(".mov")) {
-      return "video/quicktime";
-    }
-    if (fileName.endsWith(".png")) {
-      return "image/png";
-    }
-    if (fileName.endsWith(".jpg") || fileName.endsWith(".jpeg")) {
-      return "image/jpeg";
-    }
-    if (fileName.endsWith(".gif")) {
-      return "image/gif";
-    }
-
-    // Default fallback
-    return "application/octet-stream";
-  };
-
   const contentType = getContentType(file);
-  console.log(
-    "File upload - detected content type:",
-    contentType,
-    "for file:",
-    file.name
-  );
-
-  const startData = await commonApiPost<
-    { file_name: string; content_type: string },
-    StartMultipartResponse
-  >({
-    endpoint: `${path}-media/multipart-upload`,
-    body: {
-      file_name: file.name,
-      content_type: contentType,
-    },
-  });
-
-  const { upload_id, key } = startData;
-  if (!upload_id || !key) {
-    throw new Error("Server did not return required upload_id or key");
-  }
-
-  // -----------------------------------------------------
-  // 2) Break the file into chunks, set up concurrency
-  // -----------------------------------------------------
-  const totalParts = Math.ceil(file.size / PART_SIZE);
-  const limit = pLimit(CONCURRENCY);
 
-  // We'll accumulate the total # of bytes uploaded across all chunks
   let overallUploaded = 0;
 
-  // We'll store promises for each chunk
-  const partPromises: Array<Promise<{ eTag: string; partNumber: number }>> = [];
-
-  for (let partNumber = 1; partNumber <= totalParts; partNumber++) {
-    const startByte = (partNumber - 1) * PART_SIZE;
-    const endByte = Math.min(startByte + PART_SIZE, file.size);
-    const blobPart = file.slice(startByte, endByte);
-
-    // This variable tracks how many bytes we've uploaded so far *for this chunk*
-    // so we can calculate deltas in onUploadProgress.
-    let lastChunkLoaded = 0;
-
-    // The logic to upload one chunk
-    const uploadChunk = async () => {
-      // 2.1) Request a presigned URL for *this* part
-      const partResp = await commonApiPost<
-        { upload_id: string; key: string; part_no: number },
-        PartSignedUrlResponse
-      >({
-        endpoint: `${path}-media/multipart-upload/part`,
-        body: {
-          upload_id,
-          key,
-          part_no: partNumber,
-        },
-      });
-
-      const { upload_url } = partResp;
-      if (!upload_url) {
-        throw new Error("No upload_url returned for part " + partNumber);
-      }
-
-      // 2.2) PUT the chunk to S3 (with axios + onUploadProgress)
-      const s3Resp = await axios.put(upload_url, blobPart, {
-        headers: {
-          "Content-Type": file.type,
-        },
-        onUploadProgress: (event) => {
-          // This can fire multiple times as the chunk uploads
-          // event.loaded = bytes sent so far
-          // event.total = total chunk bytes
-          if (event.loaded) {
-            const chunkDelta = event.loaded - lastChunkLoaded; // how many new bytes since last time
-            lastChunkLoaded = event.loaded;
-            // Add to overall
-            overallUploaded += chunkDelta;
-
-            // Calculate percentage (0..100)
-            if (onProgress) {
-              const percent = Math.floor((overallUploaded / file.size) * 100);
-              onProgress(percent);
-            }
-          }
-        },
-      });
-
-      // 2.3) Extract ETag
-      const eTagHeader = s3Resp.headers["etag"];
-      const eTag = eTagHeader ? eTagHeader.replaceAll('"', "") : "";
-      if (!eTag) {
-        throw new Error(`No ETag returned for part ${partNumber}`);
-      }
-
-      return { eTag, partNumber };
-    };
-
-    // Wrap chunk upload in concurrency-limit + retry
-    const chunkPromise = limit(() =>
-      pRetry(uploadChunk, {
-        retries: RETRIES,
-        factor: 2, // exponential backoff
-        minTimeout: MIN_TIMEOUT,
-      })
-    );
-    partPromises.push(chunkPromise);
-  }
-
-  // -----------------------------------------------------
-  // 3) Wait for all parts to finish
-  // -----------------------------------------------------
-  const uploadedParts = await Promise.all(partPromises);
+  const handleProgress = (bytesUploaded: number) => {
+    overallUploaded += bytesUploaded;
+    if (onProgress) {
+      const percent = Math.floor((overallUploaded / file.size) * 100);
+      onProgress(percent);
+    }
+  };
 
-  // -----------------------------------------------------
-  // 4) Complete the multi-part upload
-  // -----------------------------------------------------
-  const completionData = await commonApiPost<
-    {
-      upload_id: string;
-      key: string;
-      parts: Array<{ etag: string; part_no: number }>;
-    },
-    CompleteMultipartResponse
-  >({
-    endpoint: `${path}-media/multipart-upload/completion`,
-    body: {
-      upload_id,
-      key,
-      parts: uploadedParts.map((p) => ({
-        part_no: p.partNumber,
-        etag: p.eTag,
-      })),
+  const mediaUrl = await multipartUploadCore({
+    file,
+    endpoints: {
+      start: `${path}-media/multipart-upload`,
+      part: `${path}-media/multipart-upload/part`,
+      complete: `${path}-media/multipart-upload/completion`,
     },
+    onProgress: handleProgress,
   });
 
-  const { media_url } = completionData;
-  if (!media_url) {
-    throw new Error("No final media_url returned from completion endpoint");
-  }
-
-  // -----------------------------------------------------
-  // 5) Return the final object
-  // -----------------------------------------------------
   return {
-    url: media_url,
+    url: mediaUrl,
     mime_type: contentType,
   };
 }
diff --git a/generated/models/DistributionOverview.ts b/generated/models/DistributionOverview.ts
new file mode 100644
index 0000000000..22b1b5c412
--- /dev/null
+++ b/generated/models/DistributionOverview.ts
@@ -0,0 +1,70 @@
+// @ts-nocheck
+/**
+ * 6529.io API
+ * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+export class DistributionOverview {
+    /**
+    * Number of photos for this distribution
+    */
+    'photos_count': number;
+    /**
+    * Whether the distribution has been normalized
+    */
+    'is_normalized': boolean;
+    /**
+    * Count of unique addresses with automatic airdrops
+    */
+    'automatic_airdrops_addresses': number;
+    /**
+    * Total count of automatic airdrops
+    */
+    'automatic_airdrops_count': number;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly mapping: {[index: string]: string} | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "photos_count",
+            "baseName": "photos_count",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "is_normalized",
+            "baseName": "is_normalized",
+            "type": "boolean",
+            "format": ""
+        },
+        {
+            "name": "automatic_airdrops_addresses",
+            "baseName": "automatic_airdrops_addresses",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "automatic_airdrops_count",
+            "baseName": "automatic_airdrops_count",
+            "type": "number",
+            "format": "int64"
+        }    ];
+
+    static getAttributeTypeMap() {
+        return DistributionOverview.attributeTypeMap;
+    }
+
+    public constructor() {
+    }
+}
diff --git a/generated/models/DistributionPhotoCompleteRequest.ts b/generated/models/DistributionPhotoCompleteRequest.ts
new file mode 100644
index 0000000000..a9d8562c02
--- /dev/null
+++ b/generated/models/DistributionPhotoCompleteRequest.ts
@@ -0,0 +1,38 @@
+// @ts-nocheck
+/**
+ * 6529.io API
+ * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { DistributionPhotoCompleteRequestPhoto } from '../models/DistributionPhotoCompleteRequestPhoto';
+import { HttpFile } from '../http/http';
+
+export class DistributionPhotoCompleteRequest {
+    'photos': Array<DistributionPhotoCompleteRequestPhoto>;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly mapping: {[index: string]: string} | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "photos",
+            "baseName": "photos",
+            "type": "Array<DistributionPhotoCompleteRequestPhoto>",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return DistributionPhotoCompleteRequest.attributeTypeMap;
+    }
+
+    public constructor() {
+    }
+}
diff --git a/generated/models/DistributionPhotoCompleteRequestPhoto.ts b/generated/models/DistributionPhotoCompleteRequestPhoto.ts
new file mode 100644
index 0000000000..c367b2593a
--- /dev/null
+++ b/generated/models/DistributionPhotoCompleteRequestPhoto.ts
@@ -0,0 +1,40 @@
+// @ts-nocheck
+/**
+ * 6529.io API
+ * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+export class DistributionPhotoCompleteRequestPhoto {
+    /**
+    * The CloudFront URL of the uploaded photo
+    */
+    'media_url': string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly mapping: {[index: string]: string} | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "media_url",
+            "baseName": "media_url",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return DistributionPhotoCompleteRequestPhoto.attributeTypeMap;
+    }
+
+    public constructor() {
+    }
+}
diff --git a/generated/models/DistributionPhotoCompleteResponse.ts b/generated/models/DistributionPhotoCompleteResponse.ts
new file mode 100644
index 0000000000..26e37bf97c
--- /dev/null
+++ b/generated/models/DistributionPhotoCompleteResponse.ts
@@ -0,0 +1,44 @@
+// @ts-nocheck
+/**
+ * 6529.io API
+ * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+export class DistributionPhotoCompleteResponse {
+    'success': boolean;
+    'photos': Array<string>;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly mapping: {[index: string]: string} | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "success",
+            "baseName": "success",
+            "type": "boolean",
+            "format": ""
+        },
+        {
+            "name": "photos",
+            "baseName": "photos",
+            "type": "Array<string>",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return DistributionPhotoCompleteResponse.attributeTypeMap;
+    }
+
+    public constructor() {
+    }
+}
diff --git a/generated/models/ObjectSerializer.ts b/generated/models/ObjectSerializer.ts
index c5cc05e992..82477e07e1 100644
--- a/generated/models/ObjectSerializer.ts
+++ b/generated/models/ObjectSerializer.ts
@@ -205,8 +205,12 @@ export * from '../models/ApiXTdhTokensPage';
 export * from '../models/CreateDirectMessageWaveRequest';
 export * from '../models/DistributionNormalized';
 export * from '../models/DistributionNormalizedPage';
+export * from '../models/DistributionOverview';
 export * from '../models/DistributionPhasesPage';
 export * from '../models/DistributionPhoto';
+export * from '../models/DistributionPhotoCompleteRequest';
+export * from '../models/DistributionPhotoCompleteRequestPhoto';
+export * from '../models/DistributionPhotoCompleteResponse';
 export * from '../models/DistributionPhotosPage';
 export * from '../models/GetWaveSubscription200Response';
 export * from '../models/NFTFinalSubscription';
@@ -438,8 +442,12 @@ import { ApiXTdhTokensPage } from '../models/ApiXTdhTokensPage';
 import { CreateDirectMessageWaveRequest } from '../models/CreateDirectMessageWaveRequest';
 import { DistributionNormalized } from '../models/DistributionNormalized';
 import { DistributionNormalizedPage } from '../models/DistributionNormalizedPage';
+import { DistributionOverview } from '../models/DistributionOverview';
 import { DistributionPhasesPage } from '../models/DistributionPhasesPage';
 import { DistributionPhoto } from '../models/DistributionPhoto';
+import { DistributionPhotoCompleteRequest } from '../models/DistributionPhotoCompleteRequest';
+import { DistributionPhotoCompleteRequestPhoto } from '../models/DistributionPhotoCompleteRequestPhoto';
+import { DistributionPhotoCompleteResponse } from '../models/DistributionPhotoCompleteResponse';
 import { DistributionPhotosPage } from '../models/DistributionPhotosPage';
 import { GetWaveSubscription200Response } from '../models/GetWaveSubscription200Response';
 import { NFTFinalSubscription } from '../models/NFTFinalSubscription';
@@ -690,8 +698,12 @@ let typeMap: {[index: string]: any} = {
     "CreateDirectMessageWaveRequest": CreateDirectMessageWaveRequest,
     "DistributionNormalized": DistributionNormalized,
     "DistributionNormalizedPage": DistributionNormalizedPage,
+    "DistributionOverview": DistributionOverview,
     "DistributionPhasesPage": DistributionPhasesPage,
     "DistributionPhoto": DistributionPhoto,
+    "DistributionPhotoCompleteRequest": DistributionPhotoCompleteRequest,
+    "DistributionPhotoCompleteRequestPhoto": DistributionPhotoCompleteRequestPhoto,
+    "DistributionPhotoCompleteResponse": DistributionPhotoCompleteResponse,
     "DistributionPhotosPage": DistributionPhotosPage,
     "GetWaveSubscription200Response": GetWaveSubscription200Response,
     "NFTFinalSubscription": NFTFinalSubscription,
diff --git a/openapi.yaml b/openapi.yaml
index 8613b34599..182b4a4d8c 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -326,6 +326,196 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/DistributionPhotosPage"
+  /distribution_photos/{contract}/{nft_id}/prep:
+    post:
+      tags:
+        - Distributions
+      summary: Get presigned S3 URL for distribution photo upload
+      description: Requires the user to be authenticated as a Subscription Admin
+      operationId: createDistributionPhotoUploadUrl
+      parameters:
+        - name: contract
+          in: path
+          description: Contract address
+          required: true
+          schema:
+            type: string
+        - name: nft_id
+          in: path
+          description: NFT ID
+          required: true
+          schema:
+            type: integer
+            format: int64
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/ApiCreateMediaUploadUrlRequest"
+      responses:
+        "201":
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiCreateMediaUrlResponse"
+        "400":
+          description: Invalid request
+        "401":
+          description: Unauthorized
+  /distribution_photos/{contract}/{nft_id}/multipart-upload:
+    post:
+      tags:
+        - Distributions
+      summary: Start multipart upload for distribution photo
+      description: Requires the user to be authenticated as a Subscription Admin
+      operationId: createDistributionPhotoMultipartUpload
+      parameters:
+        - name: contract
+          in: path
+          description: Contract address
+          required: true
+          schema:
+            type: string
+        - name: nft_id
+          in: path
+          description: NFT ID
+          required: true
+          schema:
+            type: integer
+            format: int64
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/ApiCreateMediaUploadUrlRequest"
+      responses:
+        "201":
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiStartMultipartMediaUploadResponse"
+        "400":
+          description: Invalid request
+        "401":
+          description: Unauthorized
+  /distribution_photos/{contract}/{nft_id}/multipart-upload/part:
+    post:
+      tags:
+        - Distributions
+      summary: Get presigned URL for multipart upload part
+      description: Requires the user to be authenticated as a Subscription Admin
+      operationId: uploadPartOfDistributionPhotoMultipartUpload
+      parameters:
+        - name: contract
+          in: path
+          description: Contract address
+          required: true
+          schema:
+            type: string
+        - name: nft_id
+          in: path
+          description: NFT ID
+          required: true
+          schema:
+            type: integer
+            format: int64
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/ApiUploadPartOfMultipartUploadRequest"
+      responses:
+        "201":
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiUploadPartOfMultipartUploadResponse"
+        "400":
+          description: Invalid request
+        "401":
+          description: Unauthorized
+  /distribution_photos/{contract}/{nft_id}/multipart-upload/completion:
+    post:
+      tags:
+        - Distributions
+      summary: Complete multipart upload for distribution photo
+      description: Requires the user to be authenticated as a Subscription Admin
+      operationId: completeDistributionPhotoMultipartUpload
+      parameters:
+        - name: contract
+          in: path
+          description: Contract address
+          required: true
+          schema:
+            type: string
+        - name: nft_id
+          in: path
+          description: NFT ID
+          required: true
+          schema:
+            type: integer
+            format: int64
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/ApiCompleteMultipartUploadRequest"
+      responses:
+        "201":
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiCompleteMultipartUploadResponse"
+        "400":
+          description: Invalid request
+        "401":
+          description: Unauthorized
+  /distribution_photos/{contract}/{nft_id}/complete:
+    post:
+      tags:
+        - Distributions
+      summary: Save uploaded distribution photos to database
+      description: Requires the user to be authenticated as a Subscription Admin. Replaces all existing photos for the card.
+      operationId: completeDistributionPhotosUpload
+      parameters:
+        - name: contract
+          in: path
+          description: Contract address
+          required: true
+          schema:
+            type: string
+        - name: nft_id
+          in: path
+          description: NFT ID
+          required: true
+          schema:
+            type: integer
+            format: int64
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/DistributionPhotoCompleteRequest"
+      responses:
+        "201":
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/DistributionPhotoCompleteResponse"
+        "400":
+          description: Invalid request
+        "401":
+          description: Unauthorized
   /distributions:
     get:
       tags:
@@ -384,6 +574,38 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/DistributionNormalizedPage"
+  /distributions/{contract}/{id}/overview:
+    get:
+      tags:
+        - Distributions
+      summary: Get distribution overview for a specific contract and card
+      description: Requires the user to be authenticated as a Subscription Admin
+      operationId: getDistributionOverview
+      parameters:
+        - name: contract
+          in: path
+          description: Contract address
+          required: true
+          schema:
+            type: string
+        - name: id
+          in: path
+          description: Card ID
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        "200":
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/DistributionOverview"
+        "400":
+          description: Invalid request
+        "403":
+          description: Forbidden - not a Subscription Admin
   /light-drops:
     get:
       tags:
@@ -5813,7 +6035,7 @@ components:
           maxLength: 500
         data_value:
           type: string
-          maxLength: 500
+          maxLength: 5000
     ApiDropPart:
       type: object
       required:
@@ -8892,6 +9114,29 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/DistributionNormalized"
+    DistributionOverview:
+      type: object
+      required:
+        - photos_count
+        - is_normalized
+        - automatic_airdrops_addresses
+        - automatic_airdrops_count
+      properties:
+        photos_count:
+          type: integer
+          format: int64
+          description: Number of photos for this distribution
+        is_normalized:
+          type: boolean
+          description: Whether the distribution has been normalized
+        automatic_airdrops_addresses:
+          type: integer
+          format: int64
+          description: Count of unique addresses with automatic airdrops
+        automatic_airdrops_count:
+          type: integer
+          format: int64
+          description: Total count of automatic airdrops
     DistributionPhasesPage:
       type: object
       required:
@@ -8938,6 +9183,37 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/DistributionPhoto"
+    DistributionPhotoCompleteRequestPhoto:
+      type: object
+      required:
+        - media_url
+      properties:
+        media_url:
+          type: string
+          description: The CloudFront URL of the uploaded photo
+    DistributionPhotoCompleteRequest:
+      type: object
+      required:
+        - photos
+      properties:
+        photos:
+          type: array
+          minItems: 1
+          items:
+            $ref: "#/components/schemas/DistributionPhotoCompleteRequestPhoto"
+    DistributionPhotoCompleteResponse:
+      type: object
+      required:
+        - success
+        - photos
+      properties:
+        success:
+          type: boolean
+        photos:
+          type: array
+          items:
+            type: string
+            description: CloudFront URLs of the saved photos
     NFTFinalSubscription:
       type: object
       required:
diff --git a/services/distribution/distributionPhotoUpload.ts b/services/distribution/distributionPhotoUpload.ts
new file mode 100644
index 0000000000..fba8ae5001
--- /dev/null
+++ b/services/distribution/distributionPhotoUpload.ts
@@ -0,0 +1,133 @@
+import { ApiCreateMediaUploadUrlRequest } from "@/generated/models/ApiCreateMediaUploadUrlRequest";
+import { ApiCreateMediaUrlResponse } from "@/generated/models/ApiCreateMediaUrlResponse";
+import { DistributionPhotoCompleteRequest } from "@/generated/models/DistributionPhotoCompleteRequest";
+import { DistributionPhotoCompleteResponse } from "@/generated/models/DistributionPhotoCompleteResponse";
+import { commonApiPost } from "@/services/api/common-api";
+import { multipartUploadCore } from "@/services/uploads/multipartUploadCore";
+import axios from "axios";
+
+const SIMPLE_UPLOAD_THRESHOLD = 5 * 1024 * 1024;
+
+interface DistributionPhotoUploadParams {
+  contract: string;
+  tokenId: string;
+  files: File[];
+  onProgress?: (progressPercent: number) => void;
+}
+
+interface SingleFileUploadParams {
+  contract: string;
+  tokenId: string;
+  file: File;
+  onProgress?: (bytesUploaded: number) => void;
+}
+
+async function uploadSingleFile({
+  contract,
+  tokenId,
+  file,
+  onProgress,
+}: SingleFileUploadParams): Promise<string> {
+  const endpoint = `distribution_photos/${contract}/${tokenId}/prep`;
+
+  const prepData = await commonApiPost<
+    ApiCreateMediaUploadUrlRequest,
+    ApiCreateMediaUrlResponse
+  >({
+    endpoint,
+    body: {
+      content_type: file.type,
+      file_name: file.name,
+    },
+  });
+
+  const { upload_url, media_url } = prepData;
+  if (!upload_url || !media_url) {
+    throw new Error("Server did not return required upload_url or media_url");
+  }
+
+  let lastLoaded = 0;
+  await axios.put(upload_url, file, {
+    headers: {
+      "Content-Type": file.type,
+    },
+    onUploadProgress: (event) => {
+      if (event.loaded && onProgress) {
+        const delta = event.loaded - lastLoaded;
+        lastLoaded = event.loaded;
+        onProgress(delta);
+      }
+    },
+  });
+
+  return media_url;
+}
+
+async function uploadLargeFile({
+  contract,
+  tokenId,
+  file,
+  onProgress,
+}: SingleFileUploadParams): Promise<string> {
+  const baseEndpoint = `distribution_photos/${contract}/${tokenId}`;
+
+  return multipartUploadCore({
+    file,
+    endpoints: {
+      start: `${baseEndpoint}/multipart-upload`,
+      part: `${baseEndpoint}/multipart-upload/part`,
+      complete: `${baseEndpoint}/multipart-upload/completion`,
+    },
+    ...(onProgress && { onProgress }),
+  });
+}
+
+export async function uploadDistributionPhotos({
+  contract,
+  tokenId,
+  files,
+  onProgress,
+}: DistributionPhotoUploadParams): Promise<string[]> {
+  const totalSize = files.reduce((sum, file) => sum + file.size, 0);
+  let overallUploaded = 0;
+
+  const handleProgress = (bytesUploaded: number) => {
+    overallUploaded += bytesUploaded;
+    if (onProgress) {
+      if (totalSize === 0) {
+        onProgress(100);
+        return;
+      }
+      const percent = Math.floor((overallUploaded / totalSize) * 100);
+      onProgress(Math.min(percent, 100));
+    }
+  };
+
+  const mediaUrls: string[] = [];
+
+  for (const file of files) {
+    const uploadFn =
+      file.size >= SIMPLE_UPLOAD_THRESHOLD ? uploadLargeFile : uploadSingleFile;
+
+    const mediaUrl = await uploadFn({
+      contract,
+      tokenId,
+      file,
+      onProgress: handleProgress,
+    });
+
+    mediaUrls.push(mediaUrl);
+  }
+
+  await commonApiPost<
+    DistributionPhotoCompleteRequest,
+    DistributionPhotoCompleteResponse
+  >({
+    endpoint: `distribution_photos/${contract}/${tokenId}/complete`,
+    body: {
+      photos: mediaUrls.map((url) => ({ media_url: url })),
+    },
+  });
+
+  return mediaUrls;
+}
diff --git a/services/uploads/multipartUploadCore.ts b/services/uploads/multipartUploadCore.ts
new file mode 100644
index 0000000000..62ee483ec0
--- /dev/null
+++ b/services/uploads/multipartUploadCore.ts
@@ -0,0 +1,172 @@
+import axios from "axios";
+import pLimit from "p-limit";
+import pRetry from "p-retry";
+import { commonApiPost } from "@/services/api/common-api";
+import { ApiCreateMediaUploadUrlRequest } from "@/generated/models/ApiCreateMediaUploadUrlRequest";
+import { ApiStartMultipartMediaUploadResponse } from "@/generated/models/ApiStartMultipartMediaUploadResponse";
+import { ApiUploadPartOfMultipartUploadRequest } from "@/generated/models/ApiUploadPartOfMultipartUploadRequest";
+import { ApiUploadPartOfMultipartUploadResponse } from "@/generated/models/ApiUploadPartOfMultipartUploadResponse";
+import { ApiCompleteMultipartUploadRequest } from "@/generated/models/ApiCompleteMultipartUploadRequest";
+import { ApiCompleteMultipartUploadResponse } from "@/generated/models/ApiCompleteMultipartUploadResponse";
+
+const PART_SIZE = 5 * 1024 * 1024;
+const CONCURRENCY = 5;
+const RETRIES = 3;
+const MIN_TIMEOUT = 1000;
+
+interface MultipartUploadEndpoints {
+  start: string;
+  part: string;
+  complete: string;
+}
+
+interface MultipartUploadCoreParams {
+  file: File;
+  endpoints: MultipartUploadEndpoints;
+  onProgress?: ((bytesUploaded: number) => void) | undefined;
+}
+
+export function getContentType(file: File): string {
+  if (file.type) {
+    return file.type;
+  }
+
+  const fileName = file.name.toLowerCase();
+  if (fileName.endsWith(".glb")) {
+    return "model/gltf-binary";
+  }
+  if (fileName.endsWith(".gltf")) {
+    return "model/gltf+json";
+  }
+  if (fileName.endsWith(".mp4")) {
+    return "video/mp4";
+  }
+  if (fileName.endsWith(".mov")) {
+    return "video/quicktime";
+  }
+  if (fileName.endsWith(".png")) {
+    return "image/png";
+  }
+  if (fileName.endsWith(".jpg") || fileName.endsWith(".jpeg")) {
+    return "image/jpeg";
+  }
+  if (fileName.endsWith(".gif")) {
+    return "image/gif";
+  }
+  if (fileName.endsWith(".webp")) {
+    return "image/webp";
+  }
+
+  return "application/octet-stream";
+}
+
+export async function multipartUploadCore({
+  file,
+  endpoints,
+  onProgress,
+}: MultipartUploadCoreParams): Promise<string> {
+  const contentType = getContentType(file);
+
+  const startData = await commonApiPost<
+    ApiCreateMediaUploadUrlRequest,
+    ApiStartMultipartMediaUploadResponse
+  >({
+    endpoint: endpoints.start,
+    body: {
+      file_name: file.name,
+      content_type: contentType,
+    },
+  });
+
+  const { upload_id, key } = startData;
+  if (!upload_id || !key) {
+    throw new Error("Server did not return required upload_id or key");
+  }
+
+  const totalParts = Math.ceil(file.size / PART_SIZE);
+  const limit = pLimit(CONCURRENCY);
+
+  const partPromises: Array<Promise<{ eTag: string; partNumber: number }>> = [];
+
+  for (let partNumber = 1; partNumber <= totalParts; partNumber++) {
+    const startByte = (partNumber - 1) * PART_SIZE;
+    const endByte = Math.min(startByte + PART_SIZE, file.size);
+    const blobPart = file.slice(startByte, endByte);
+
+    const uploadChunk = async () => {
+      let lastChunkLoaded = 0;
+
+      const partResp = await commonApiPost<
+        ApiUploadPartOfMultipartUploadRequest,
+        ApiUploadPartOfMultipartUploadResponse
+      >({
+        endpoint: endpoints.part,
+        body: {
+          upload_id,
+          key,
+          part_no: partNumber,
+        },
+      });
+
+      const { upload_url } = partResp;
+      if (!upload_url) {
+        throw new Error("No upload_url returned for part " + partNumber);
+      }
+
+      const s3Resp = await axios.put(upload_url, blobPart, {
+        headers: {
+          "Content-Type": contentType,
+        },
+        onUploadProgress: (event) => {
+          if (event.loaded && onProgress) {
+            const chunkDelta = event.loaded - lastChunkLoaded;
+            lastChunkLoaded = event.loaded;
+            onProgress(chunkDelta);
+          }
+        },
+      });
+
+      const eTagHeader = s3Resp.headers["etag"];
+      const eTag = eTagHeader ? eTagHeader.replaceAll('"', "") : "";
+      if (!eTag) {
+        throw new Error(`No ETag returned for part ${partNumber}`);
+      }
+
+      return { eTag, partNumber };
+    };
+
+    const chunkPromise = limit(() =>
+      pRetry(uploadChunk, {
+        retries: RETRIES,
+        factor: 2,
+        minTimeout: MIN_TIMEOUT,
+      })
+    );
+    partPromises.push(chunkPromise);
+  }
+
+  const uploadedParts = await Promise.all(partPromises);
+
+  const completionData = await commonApiPost<
+    ApiCompleteMultipartUploadRequest,
+    ApiCompleteMultipartUploadResponse
+  >({
+    endpoint: endpoints.complete,
+    body: {
+      upload_id,
+      key,
+      parts: uploadedParts.map((p) => ({
+        part_no: p.partNumber,
+        etag: p.eTag,
+      })),
+    },
+  });
+
+  const { media_url } = completionData;
+  if (!media_url) {
+    throw new Error("No final media_url returned from completion endpoint");
+  }
+
+  return media_url;
+}
+