diff --git a/apps/web/app/(app)/[emailAccountId]/assistant/AssistantTabs.tsx b/apps/web/app/(app)/[emailAccountId]/assistant/AssistantTabs.tsx
index 8538ba3500..2f563792b6 100644
--- a/apps/web/app/(app)/[emailAccountId]/assistant/AssistantTabs.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/assistant/AssistantTabs.tsx
@@ -37,31 +37,6 @@ export function AssistantTabs() {
               )}
             </TabsList>
           </div>
-
-          {/* <div className="flex items-center gap-2">
-                <Button asChild variant="outline">
-                  <Link
-                    href={prefixPath(
-                      emailAccountId,
-                      "/assistant/onboarding",
-                    )}
-                  >
-                    Set Up
-                  </Link>
-                </Button>
-
-                <OnboardingModal
-                  title="Getting started with AI Personal Assistant"
-                  description={
-                    <>
-                      Learn how to use the AI Personal Assistant to
-                      automatically label, archive, and more.
-                    </>
-                  }
-                  videoId="SoeNDVr7ve4"
-                />
-              </div> */}
-
           <CloseArtifactButton />
         </TabsToolbar>
 
diff --git a/apps/web/app/(app)/[emailAccountId]/automation/page.tsx b/apps/web/app/(app)/[emailAccountId]/automation/page.tsx
index cf774837f9..7a2e31187f 100644
--- a/apps/web/app/(app)/[emailAccountId]/automation/page.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/automation/page.tsx
@@ -97,7 +97,7 @@ export default async function AutomationPage({
                   title: "Getting started with AI Personal Assistant",
                   description:
                     "Learn how to use the AI Personal Assistant to automatically label, archive, and more.",
-                  videoId: "SoeNDVr7ve4",
+                  muxPlaybackId: "VwIP7UAw4MXDjkvmLjJzGsY00ee9jxIZVI952DoBBfp8",
                 }}
               />
             </div>
@@ -131,8 +131,7 @@ export default async function AutomationPage({
             description={
               "Learn how to use the AI Assistant to automatically label, archive, and more."
             }
-            videoSrc="https://www.youtube.com/embed/SoeNDVr7ve4"
-            thumbnailSrc="https://img.youtube.com/vi/SoeNDVr7ve4/0.jpg"
+            muxPlaybackId="VwIP7UAw4MXDjkvmLjJzGsY00ee9jxIZVI952DoBBfp8"
             storageKey="ai-assistant-onboarding-video"
           />
 
diff --git a/apps/web/app/(app)/[emailAccountId]/bulk-unsubscribe/BulkUnsubscribeSection.tsx b/apps/web/app/(app)/[emailAccountId]/bulk-unsubscribe/BulkUnsubscribeSection.tsx
index 775b7ab1d6..5ba5650c12 100644
--- a/apps/web/app/(app)/[emailAccountId]/bulk-unsubscribe/BulkUnsubscribeSection.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/bulk-unsubscribe/BulkUnsubscribeSection.tsx
@@ -230,7 +230,7 @@ export function BulkUnsubscribe() {
               .
             </>
           ),
-          videoId: "T1rnooV4OYc",
+          youtubeVideoId: "T1rnooV4OYc",
         }}
       />
 
diff --git a/apps/web/components/OnboardingModal.tsx b/apps/web/components/OnboardingModal.tsx
index 3b88d1f051..3169f399d5 100644
--- a/apps/web/components/OnboardingModal.tsx
+++ b/apps/web/components/OnboardingModal.tsx
@@ -5,6 +5,7 @@ import { useLocalStorage, useWindowSize } from "usehooks-ts";
 import { PlayIcon } from "lucide-react";
 import { useModal } from "@/hooks/useModal";
 import { YouTubeVideo } from "@/components/YouTubeVideo";
+import { MuxVideo } from "@/components/MuxVideo";
 import { Button } from "@/components/ui/button";
 import {
   Dialog,
@@ -17,12 +18,14 @@ import {
 export function OnboardingModal({
   title,
   description,
-  videoId,
+  youtubeVideoId,
+  muxPlaybackId,
   buttonProps,
 }: {
   title: string;
   description: React.ReactNode;
-  videoId: string;
+  youtubeVideoId?: string;
+  muxPlaybackId?: string;
   buttonProps?: React.ComponentProps<typeof Button>;
 }) {
   const { isModalOpen, openModal, setIsModalOpen } = useModal();
@@ -39,7 +42,8 @@ export function OnboardingModal({
         setIsModalOpen={setIsModalOpen}
         title={title}
         description={description}
-        videoId={videoId}
+        youtubeVideoId={youtubeVideoId}
+        muxPlaybackId={muxPlaybackId}
       />
     </>
   );
@@ -50,20 +54,23 @@ export function OnboardingModalDialog({
   setIsModalOpen,
   title,
   description,
-  videoId,
+  youtubeVideoId,
+  muxPlaybackId,
 }: {
   isModalOpen: boolean;
   setIsModalOpen: (open: boolean) => void;
   title: string;
   description: React.ReactNode;
-  videoId: string;
+  youtubeVideoId?: string;
+  muxPlaybackId?: string;
 }) {
   return (
     <Dialog open={isModalOpen} onOpenChange={setIsModalOpen}>
       <OnboardingDialogContent
         title={title}
         description={description}
-        videoId={videoId}
+        youtubeVideoId={youtubeVideoId}
+        muxPlaybackId={muxPlaybackId}
       />
     </Dialog>
   );
@@ -72,11 +79,13 @@ export function OnboardingModalDialog({
 export function OnboardingDialogContent({
   title,
   description,
-  videoId,
+  youtubeVideoId,
+  muxPlaybackId,
 }: {
   title: string;
   description: React.ReactNode;
-  videoId: string;
+  youtubeVideoId?: string;
+  muxPlaybackId?: string;
 }) {
   const { width } = useWindowSize();
 
@@ -84,25 +93,41 @@ export function OnboardingDialogContent({
   const videoHeight = videoWidth * (675 / 1200);
 
   return (
-    <DialogContent className="min-w-[350px] sm:min-w-[600px] md:min-w-[750px] lg:min-w-[880px] xl:min-w-[1280px]">
-      <DialogHeader>
+    <DialogContent className="max-w-6xl border-0 bg-transparent p-0 overflow-hidden">
+      <DialogHeader className="sr-only">
         <DialogTitle>{title}</DialogTitle>
         <DialogDescription>{description}</DialogDescription>
       </DialogHeader>
 
-      <YouTubeVideo
-        videoId={videoId}
-        title={`Onboarding video - ${title}`}
-        iframeClassName="mx-auto"
-        opts={{
-          height: `${videoHeight}`,
-          width: `${videoWidth}`,
-          playerVars: {
-            // https://developers.google.com/youtube/player_parameters
-            autoplay: 1,
-          },
-        }}
-      />
+      {muxPlaybackId ? (
+        <div className="relative aspect-video w-full overflow-hidden rounded-lg">
+          <MuxVideo
+            playbackId={muxPlaybackId}
+            title={`Onboarding video - ${title}`}
+            className="size-full"
+          />
+        </div>
+      ) : youtubeVideoId ? (
+        <div className="bg-background rounded-lg p-6">
+          <div className="mb-4">
+            <h2 className="text-xl font-semibold">{title}</h2>
+            <p className="text-muted-foreground">{description}</p>
+          </div>
+          <YouTubeVideo
+            videoId={youtubeVideoId}
+            title={`Onboarding video - ${title}`}
+            iframeClassName="mx-auto"
+            opts={{
+              height: `${videoHeight}`,
+              width: `${videoWidth}`,
+              playerVars: {
+                // https://developers.google.com/youtube/player_parameters
+                autoplay: 1,
+              },
+            }}
+          />
+        </div>
+      ) : null}
     </DialogContent>
   );
 }
diff --git a/apps/web/components/PageHeader.tsx b/apps/web/components/PageHeader.tsx
index 93556972e9..967ad51b89 100644
--- a/apps/web/components/PageHeader.tsx
+++ b/apps/web/components/PageHeader.tsx
@@ -7,7 +7,8 @@ import { PlayIcon } from "lucide-react";
 type Video = {
   title: string;
   description: React.ReactNode;
-  videoId: string;
+  youtubeVideoId?: string;
+  muxPlaybackId?: string;
 };
 
 export function PageHeader({
@@ -24,7 +25,9 @@ export function PageHeader({
       <PageHeading>{title}</PageHeading>
       <div className="flex items-center mt-1">
         <PageSubHeading>{description}</PageSubHeading>
-        {video && <WatchVideo video={video} />}
+        {video && (video.youtubeVideoId || video.muxPlaybackId) && (
+          <WatchVideo video={video} />
+        )}
       </div>
     </div>
   );
@@ -42,7 +45,8 @@ function WatchVideo({ video }: { video: Video }) {
       <OnboardingDialogContent
         title={video.title}
         description={video.description}
-        videoId={video.videoId}
+        youtubeVideoId={video.youtubeVideoId}
+        muxPlaybackId={video.muxPlaybackId}
       />
     </Dialog>
   );
diff --git a/apps/web/components/VideoCard.tsx b/apps/web/components/VideoCard.tsx
index 2cc8417e90..90998beb06 100644
--- a/apps/web/components/VideoCard.tsx
+++ b/apps/web/components/VideoCard.tsx
@@ -3,6 +3,7 @@
 import React, { useState, useEffect } from "react";
 import type { ComponentProps } from "react";
 import Image from "next/image";
+import MuxPlayer from "@mux/mux-player-react";
 import { PlayIcon, X } from "lucide-react";
 import { CardGreen } from "@/components/ui/card";
 import {
@@ -12,6 +13,7 @@ import {
   DialogTitle,
 } from "@/components/ui/dialog";
 import { Button } from "@/components/ui/button";
+import { ClientOnly } from "@/components/ClientOnly";
 
 type VideoCardProps = ComponentProps<typeof VideoCard> & {
   storageKey: string;
@@ -45,8 +47,9 @@ const VideoCard = React.forwardRef<
     icon?: React.ReactNode;
     title: string;
     description: string;
-    videoSrc: string;
-    thumbnailSrc: string;
+    videoSrc?: string;
+    thumbnailSrc?: string;
+    muxPlaybackId?: string;
     onClose?: () => void;
   }
 >(
@@ -58,6 +61,7 @@ const VideoCard = React.forwardRef<
       description,
       videoSrc,
       thumbnailSrc,
+      muxPlaybackId,
       onClose,
       ...props
     },
@@ -112,7 +116,11 @@ const VideoCard = React.forwardRef<
                   >
                     <div className="relative w-32 h-20 rounded-lg overflow-hidden bg-gray-100 dark:bg-gray-800">
                       <Image
-                        src={thumbnailSrc}
+                        src={
+                          muxPlaybackId
+                            ? `https://image.mux.com/${muxPlaybackId}/thumbnail.jpg`
+                            : thumbnailSrc || "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR4nGNgYAAAAAMAAWgmWQ0AAAAASUVORK5CYII="
+                        }
                         alt={title}
                         fill
                         className="object-cover transition-all duration-200 group-hover:scale-105"
@@ -126,16 +134,29 @@ const VideoCard = React.forwardRef<
                     </div>
                   </button>
                 </DialogTrigger>
-                <DialogContent className="max-w-4xl border-0 bg-transparent p-0">
+                <DialogContent className="max-w-6xl border-0 bg-transparent p-0 overflow-hidden">
                   <DialogTitle className="sr-only">Video: {title}</DialogTitle>
-                  <div className="relative aspect-video w-full">
-                    <iframe
-                      src={`${videoSrc}${videoSrc.includes("?") ? "&" : "?"}autoplay=1&rel=0`}
-                      className="size-full rounded-lg"
-                      title={`Video: ${title}`}
-                      allowFullScreen
-                      allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-                    />
+                  <div className="relative aspect-video w-full overflow-hidden rounded-lg">
+                    {muxPlaybackId ? (
+                      <ClientOnly>
+                        <MuxPlayer
+                          playbackId={muxPlaybackId}
+                          metadata={{ video_title: title }}
+                          accentColor="#3b82f6"
+                          className="size-full rounded-lg"
+                          style={{ overflow: "hidden" }}
+                          autoPlay
+                        />
+                      </ClientOnly>
+                    ) : (
+                      <iframe
+                        src={`${videoSrc}${videoSrc?.includes("?") ? "&" : "?"}autoplay=1&rel=0`}
+                        className="size-full rounded-lg"
+                        title={`Video: ${title}`}
+                        allowFullScreen
+                        allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+                      />
+                    )}
                   </div>
                 </DialogContent>
               </Dialog>
diff --git a/apps/web/next.config.ts b/apps/web/next.config.ts
index 54b921cec8..d58dd1924b 100644
--- a/apps/web/next.config.ts
+++ b/apps/web/next.config.ts
@@ -29,6 +29,10 @@ const nextConfig: NextConfig = {
         protocol: "https",
         hostname: "img.youtube.com",
       },
+      {
+        protocol: "https",
+        hostname: "image.mux.com",
+      },
       {
         protocol: "https",
         hostname: "ph-avatars.imgix.net",