diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 0000000000..3c4bc670f8
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,298 @@
+# MIT Learn - Agent Instructions
+
+This is a Django/Next.js application for browsing and searching MIT learning resources aggregated from multiple platforms (OCW, MITx, xPRO, etc.).
+
+## Architecture Overview
+
+MIT Learn is a **hybrid Django + Next.js monorepo** with these major components:
+
+### Backend (Django + Celery)
+
+- **Django REST API** using DRF + drf-spectacular for OpenAPI generation
+- **ETL Pipelines** in `learning_resources/etl/` extract, transform, and load data from external sources (OCW, edX, xPRO, MITx Online, Canvas, YouTube, podcasts, etc.)
+- **OpenSearch** for full-text search with embeddings and hybrid search support
+- **Celery** for async task processing (ETL, indexing, notifications)
+- **Vector Search** using Qdrant for AI-powered recommendations and semantic search
+- **Keycloak + APISIX** for authentication (see README-keycloak.md)
+
+Key Django apps:
+
+- `learning_resources` - Core models (LearningResource, Course, Program, ContentFile, etc.) and ETL pipelines
+- `learning_resources_search` - OpenSearch indexing and search API
+- `channels` - Community channels/groups
+- `articles` - User-created articles with CKEditor
+- `authentication` - Auth middleware and user management
+- `vector_search` - Qdrant integration for embeddings
+- `webhooks` - External webhook handlers (OCW, YouTube, etc.)
+
+### Frontend (Next.js App Router)
+
+Located in `frontends/` as a **Yarn workspaces monorepo**:
+
+- `main/` - Next.js 14+ app using App Router (NOT pages router)
+- `api/` - Generated TypeScript API client from OpenAPI spec
+- `ol-components/` - Shared React components
+- `ol-search-ui/`, `ol-forms/`, `ol-utilities/` - Reusable packages
+- Uses `@mitodl/smoot-design` for design system components
+- Root-relative imports via `@/` in the `main` workspace
+
+## Build, Test, and Lint Commands
+
+### Backend (Python)
+
+Run inside Docker containers with `docker compose`:
+
+```bash
+# Run all tests (parallel)
+docker compose run --rm web poetry run pytest -n logical
+
+# Run specific test file
+docker compose run --rm web poetry run pytest learning_resources/models_test.py
+
+# Run specific test
+docker compose run --rm web poetry run pytest learning_resources/models_test.py::test_name -v
+
+# Lint and format with ruff
+docker compose run --rm web poetry run ruff format .
+docker compose run --rm web poetry run ruff check . --fix
+
+# Run Django management commands
+docker compose run --rm web python manage.py <command>
+
+# Create migrations
+docker compose run --rm web python manage.py makemigrations
+
+# Run migrations
+docker compose run --rm web python manage.py migrate
+
+# Create superuser
+docker compose run --rm web python manage.py createsuperuser
+```
+
+### Frontend (TypeScript/React)
+
+From project root (not `frontends/` directory):
+
+```bash
+# Run all tests
+yarn test
+
+# Run tests for specific file
+yarn test path/to/file.test.tsx
+
+# Watch mode
+yarn test-watch
+
+# Lint
+yarn workspace frontends run lint-check
+yarn workspace frontends run lint-fix
+
+# Type checking
+yarn workspace frontends run typecheck
+
+# Style linting (CSS/SCSS)
+yarn workspace frontends run style-lint
+
+# Format with Prettier
+yarn workspace frontends run fmt-check
+yarn workspace frontends run fmt-fix
+
+# Build frontend
+yarn build
+
+# Run dev server (inside Docker)
+docker compose up
+
+# Run dev server (on host)
+yarn watch
+```
+
+### E2E Tests (Playwright)
+
+```bash
+# Run Playwright tests
+yarn playwright
+
+# UI mode
+yarn playwright:ui
+
+# View report
+yarn playwright:report
+```
+
+### Pre-commit Hooks
+
+```bash
+# Install pre-commit
+pip install pre-commit
+pre-commit install
+
+# Run all checks
+pre-commit run --all-files
+```
+
+## Code Generation
+
+### OpenAPI Client Generation
+
+The TypeScript API client in `frontends/api/src/generated/` is auto-generated from the Django API using drf-spectacular:
+
+```bash
+# Regenerate OpenAPI spec and TypeScript client
+./scripts/generate_openapi.sh
+```
+
+**CI will fail if generated code is out of sync** - always regenerate after changing Django views/serializers.
+
+## Key Conventions
+
+### Python/Django
+
+- Use **Ruff** for linting and formatting (configured in `pyproject.toml`)
+- **Factory Boy** for test data - all factories in `<app>/factories.py`
+- **Named Enums** - use `named_enum.ExtendedEnum` for constants (see `learning_resources/constants.py`)
+- **Serializers** - use DRF serializers with `COMMON_IGNORED_FIELDS` exclusion pattern
+- **Permissions** - use Django Guardian for object-level permissions
+- **Views** - use DRF ViewSets with drf-spectacular decorators (`@extend_schema`)
+- **Tests** - pytest-django with `conftest.py`, fixture-based setup, auto-mock external requests
+- **Migrations** - all migrations must be non-auto and tested (see `scripts/test/no_auto_migrations.sh`)
+- Never import `django.contrib.auth.models.User` directly - use `get_user_model()` or `settings.AUTH_USER_MODEL`
+
+### TypeScript/React/Next.js
+
+- **Next.js App Router** (NOT pages router) - routes in `frontends/main/src/app/`
+- **React Query** - API calls via generated hooks from `api/` package
+- **Test factories** - mock API responses with `setMockResponse` from `api/test-utils`
+- **Styling** - CSS Modules or components from `@mitodl/smoot-design` and `ol-components`
+- **Root imports** - use `@/` prefix in `main` workspace (e.g., `@/components`, `@/test-utils`)
+- **Yarn workspaces** - run commands with `yarn workspace <name> run <script>` or use `global:*` scripts
+- Frontend tests covered in `.github/instructions/frontend-tests.instructions.md`
+
+### ETL Pipelines
+
+ETL pipelines in `learning_resources/etl/` follow a common pattern:
+
+- Each source has its own module (e.g., `ocw.py`, `mit_edx.py`, `xpro.py`)
+- Management commands in `learning_resources/management/commands/` trigger pipelines
+- Pipelines are scheduled via Celery Beat (configured in `main/settings_celery.py`)
+- After loading data, run `python manage.py recreate_index --all` to index in OpenSearch
+- Environment variables in `main/settings_course_etl.py` configure API endpoints
+
+Example ETL commands:
+
+```bash
+docker compose run --rm web python manage.py backpopulate_ocw_data
+docker compose run --rm web python manage.py backpopulate_xpro_data
+docker compose run --rm web python manage.py backpopulate_mit_edx_data
+```
+
+### Search Architecture
+
+MIT Learn uses **OpenSearch** with:
+
+- **Hybrid search** - combines keyword and vector similarity
+- **Embeddings** - stored in Qdrant, queried via `vector_search/` app
+- **Indexing** - via `learning_resources_search/indexing_api.py`
+- **Percolator queries** - for saved search notifications
+
+Key management commands:
+
+```bash
+# Recreate search indices
+docker compose run --rm web python manage.py recreate_index --all
+
+# Index specific resources
+docker compose run --rm web python manage.py index_learning_resources
+```
+
+## Docker Compose Profiles
+
+Control which containers run via `COMPOSE_PROFILES` in `.env`:
+
+- `backend` - Django API, Celery, PostgreSQL, Redis
+- `frontend` - Next.js watch server
+- `keycloak` - Keycloak auth server
+- `apisix` - API gateway
+
+Example: `COMPOSE_PROFILES=backend,frontend,keycloak,apisix`
+
+## Environment Configuration
+
+Environment variables in `env/` directory:
+
+- `env/shared.local.env` - Both frontend and backend
+- `env/backend.local.env` - Backend only
+- `env/frontend.local.env` - Frontend only
+
+Required variables:
+
+- `COMPOSE_PROFILES` - Which containers to run
+- `MAILGUN_KEY`, `MAILGUN_SENDER_DOMAIN` - Email (can be dummy values for local dev)
+- API URLs for ETL sources (see `main/settings_course_etl.py`)
+
+## Local Development Tips
+
+### Running Backend Only
+
+Set `COMPOSE_PROFILES=backend` and run frontend on host with `yarn watch` for better performance.
+
+### Loading Test Data
+
+```bash
+# Load fixture data (platforms, departments, etc.)
+docker compose run --rm web python manage.py loaddata platforms departments offered_by
+
+# Run specific ETL pipeline
+docker compose run --rm web python manage.py backpopulate_ocw_data
+
+# Create search indices
+docker compose run --rm web python manage.py recreate_index --all
+```
+
+### Disabling Scheduled Tasks
+
+Add `CELERY_BEAT_DISABLED=True` to `backend.local.env` to disable scheduled Celery tasks.
+
+### OpenSearch Cluster vs Single Node
+
+By default, OpenSearch runs in single-node mode. For multi-node cluster:
+
+```bash
+export OPENSEARCH_CLUSTER_TYPE=cluster
+```
+
+### Debugging
+
+- Backend: Use `ipdb` or `pdb` - breakpoints work in `docker compose up` logs
+- Frontend: Use browser DevTools - source maps enabled in dev mode
+- Celery: Check `celery` container logs with `docker compose logs -f celery`
+
+## Authentication Architecture
+
+MIT Learn uses **Keycloak** for authentication with **APISIX** as an API gateway. The flow:
+
+1. User authenticates via Keycloak (OAuth2/OIDC)
+2. APISIX validates tokens and adds user info headers
+3. Django middleware (`main.middleware.apisix_user`) creates/updates Django user from headers
+
+See `README-keycloak.md` for full setup.
+
+## CI/CD
+
+GitHub Actions workflows in `.github/workflows/`:
+
+- Runs pytest with coverage
+- Checks migrations are non-auto
+- Validates OpenAPI spec is up-to-date
+- Runs frontend tests and linting
+- Builds Docker images
+
+## Storybook
+
+Component documentation published at https://mitodl.github.io/mit-learn/
+
+Run locally:
+
+```bash
+yarn storybook
+```
diff --git a/RELEASE.rst b/RELEASE.rst
index 9e953e2ac7..ada4e4b648 100644
--- a/RELEASE.rst
+++ b/RELEASE.rst
@@ -1,6 +1,19 @@
 Release Notes
 =============
 
+Version 0.53.9
+--------------
+
+- add route for editing article drafts (#2948)
+- fix: change byline author name behaviour  (#2936)
+- If a run for a contentfile webhook doesn't exist, run relevant ETL pipeline to create it (#2938)
+- chore: Created an AGENTS.md file to help give context to agentic tools (#2944)
+- adjust dashboard card links (#2935)
+- Allow iframes in ContractPage welcome message (and elsewhere) (#2943)
+- fix: Replace destructuring for build time substitution (#2945)
+- Switch to v3 for program enrollments (#2931)
+- update smoot-design for new alerts (#2933)
+
 Version 0.53.7 (Released February 11, 2026)
 --------------
 
diff --git a/articles/migrations/0011_article_author_name.py b/articles/migrations/0011_article_author_name.py
new file mode 100644
index 0000000000..f005cde6f6
--- /dev/null
+++ b/articles/migrations/0011_article_author_name.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.25 on 2026-02-09 08:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("articles", "0010_fix_article_default"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="article",
+            name="author_name",
+            field=models.TextField(blank=True, default=""),
+        ),
+    ]
diff --git a/articles/models.py b/articles/models.py
index 6355bd716c..401faccb6e 100644
--- a/articles/models.py
+++ b/articles/models.py
@@ -22,6 +22,7 @@ class Article(TimestampedModel):
     )
     content = models.JSONField(default=dict)
     title = models.CharField(max_length=255)
+    author_name = models.TextField(blank=True, default="")
     slug = models.SlugField(max_length=255, unique=True, blank=True, null=True)
     is_published = models.BooleanField(default=False)
     publish_date = models.DateTimeField(null=True, blank=True)
diff --git a/articles/serializers.py b/articles/serializers.py
index a30d726692..959fa8d1c1 100644
--- a/articles/serializers.py
+++ b/articles/serializers.py
@@ -35,6 +35,7 @@ class RichTextArticleSerializer(serializers.ModelSerializer):
     content = serializers.JSONField(default={})
     slug = serializers.SlugField(max_length=60, required=False, allow_blank=True)
     title = serializers.CharField(max_length=255)
+    author_name = serializers.CharField(required=False, allow_blank=True, default="")
     user = UserSerializer(read_only=True)
 
     class Meta:
@@ -42,6 +43,7 @@ class Meta:
         fields = [
             "id",
             "title",
+            "author_name",
             "content",
             "user",
             "created_on",
diff --git a/articles/tasks_test.py b/articles/tasks_test.py
index 99c4385494..89e3b7cb0a 100644
--- a/articles/tasks_test.py
+++ b/articles/tasks_test.py
@@ -54,7 +54,6 @@ def test_call_fastly_purge_api_success(self, mock_request, mock_fastly_response)
         # Verify headers were set correctly
         call_kwargs = mock_request.call_args.kwargs
         assert call_kwargs["headers"]["fastly-key"] == "test-token"
-        assert call_kwargs["headers"]["fastly-soft-purge"] == "1"
         assert call_kwargs["timeout"] == 30
 
     @patch("main.utils.requests.request")
diff --git a/env/backend.env b/env/backend.env
index 193f4ca2cf..9e83ce1115 100644
--- a/env/backend.env
+++ b/env/backend.env
@@ -69,3 +69,5 @@ USERINFO_URL=http://kc.ol.local:8066/realms/ol-local/protocol/openid-connect/use
 # Disable all celery tasks by default in local dev
 CELERY_BEAT_DISABLED=True
 SESSION_COOKIE_DOMAIN="odl.local"
+# Disable course archive processing in local dev by default
+COURSE_ARCHIVE_BUCKET_NAME=
diff --git a/env/backend.local.example.env b/env/backend.local.example.env
index 63f5517dd8..1537135c3c 100644
--- a/env/backend.local.example.env
+++ b/env/backend.local.example.env
@@ -52,3 +52,6 @@ JAVA_OPTIONS=
 
 # Set this to False to enable all scheduled celery tasks (default is True in backend.env)
 CELERY_BEAT_DISABLED=False
+
+# Assign the bucket here if you want to enable edx contentfile ingestion locally
+COURSE_ARCHIVE_BUCKET_NAME=
diff --git a/frontends/api/package.json b/frontends/api/package.json
index 08f90d5272..c0d5ef226b 100644
--- a/frontends/api/package.json
+++ b/frontends/api/package.json
@@ -29,7 +29,7 @@
     "ol-test-utilities": "0.0.0"
   },
   "dependencies": {
-    "@mitodl/mitxonline-api-axios": "^2026.1.14",
+    "@mitodl/mitxonline-api-axios": "^2026.2.5",
     "@tanstack/react-query": "^5.66.0",
     "axios": "^1.12.2",
     "tiny-invariant": "^1.3.3"
diff --git a/frontends/api/src/generated/v1/api.ts b/frontends/api/src/generated/v1/api.ts
index 083299ddd4..5eef61bf77 100644
--- a/frontends/api/src/generated/v1/api.ts
+++ b/frontends/api/src/generated/v1/api.ts
@@ -5573,6 +5573,12 @@ export interface PatchedRichTextArticleRequest {
    * @memberof PatchedRichTextArticleRequest
    */
   title?: string
+  /**
+   *
+   * @type {string}
+   * @memberof PatchedRichTextArticleRequest
+   */
+  author_name?: string
   /**
    *
    * @type {any}
@@ -8009,6 +8015,12 @@ export interface RichTextArticle {
    * @memberof RichTextArticle
    */
   title: string
+  /**
+   *
+   * @type {string}
+   * @memberof RichTextArticle
+   */
+  author_name?: string
   /**
    *
    * @type {any}
@@ -8064,6 +8076,12 @@ export interface RichTextArticleRequest {
    * @memberof RichTextArticleRequest
    */
   title: string
+  /**
+   *
+   * @type {string}
+   * @memberof RichTextArticleRequest
+   */
+  author_name?: string
   /**
    *
    * @type {any}
diff --git a/frontends/api/src/mitxonline/hooks/enrollment/queries.ts b/frontends/api/src/mitxonline/hooks/enrollment/queries.ts
index 2110e1206e..c7c8881773 100644
--- a/frontends/api/src/mitxonline/hooks/enrollment/queries.ts
+++ b/frontends/api/src/mitxonline/hooks/enrollment/queries.ts
@@ -1,7 +1,7 @@
 import { queryOptions } from "@tanstack/react-query"
 import type {
   CourseRunEnrollmentRequestV2,
-  V2UserProgramEnrollmentDetail,
+  V3UserProgramEnrollment,
 } from "@mitodl/mitxonline-api-axios/v2"
 
 import { courseRunEnrollmentsApi, programEnrollmentsApi } from "../../clients"
@@ -35,9 +35,9 @@ const enrollmentQueries = {
   programEnrollmentsList: (opts?: RawAxiosRequestConfig) =>
     queryOptions({
       queryKey: enrollmentKeys.programEnrollmentsList(opts),
-      queryFn: async (): Promise<V2UserProgramEnrollmentDetail[]> => {
+      queryFn: async (): Promise<V3UserProgramEnrollment[]> => {
         return programEnrollmentsApi
-          .v2ProgramEnrollmentsList(opts)
+          .v3ProgramEnrollmentsList(opts)
           .then((res) => res.data)
       },
     }),
diff --git a/frontends/api/src/mitxonline/test-utils/factories/enrollment.ts b/frontends/api/src/mitxonline/test-utils/factories/enrollment.ts
index aac16f82f6..f19d91bbf7 100644
--- a/frontends/api/src/mitxonline/test-utils/factories/enrollment.ts
+++ b/frontends/api/src/mitxonline/test-utils/factories/enrollment.ts
@@ -6,7 +6,7 @@ import type {
   CourseRunEnrollmentRequestV2,
   CourseRunGrade,
   UserProgramEnrollmentDetail,
-  V2UserProgramEnrollmentDetail,
+  V3UserProgramEnrollment,
 } from "@mitodl/mitxonline-api-axios/v2"
 import { UniqueEnforcer } from "enforce-unique"
 import { factories } from ".."
@@ -194,12 +194,12 @@ const programEnrollment: PartialFactory<UserProgramEnrollmentDetail> = (
   return mergeOverrides<UserProgramEnrollmentDetail>(defaults, overrides)
 }
 
-const programEnrollmentV2: PartialFactory<V2UserProgramEnrollmentDetail> = (
+const programEnrollmentV3: PartialFactory<V3UserProgramEnrollment> = (
   overrides = {},
-): V2UserProgramEnrollmentDetail => {
-  const program = factories.programs.program()
+): V3UserProgramEnrollment => {
+  const program = factories.programs.simpleProgram()
   const hasCertificate = faker.datatype.boolean()
-  const defaults: V2UserProgramEnrollmentDetail = {
+  const defaults: V3UserProgramEnrollment = {
     certificate: hasCertificate
       ? {
           uuid: faker.string.uuid(),
@@ -207,9 +207,8 @@ const programEnrollmentV2: PartialFactory<V2UserProgramEnrollmentDetail> = (
         }
       : null,
     program: program,
-    enrollments: [courseEnrollment()],
   }
-  return mergeOverrides<V2UserProgramEnrollmentDetail>(defaults, overrides)
+  return mergeOverrides<V3UserProgramEnrollment>(defaults, overrides)
 }
 
 // Not paginated
@@ -222,5 +221,5 @@ export {
   courseEnrollments,
   grade,
   programEnrollment,
-  programEnrollmentV2,
+  programEnrollmentV3,
 }
diff --git a/frontends/api/src/mitxonline/test-utils/factories/programs.ts b/frontends/api/src/mitxonline/test-utils/factories/programs.ts
index 6235598c37..19a4c91c3c 100644
--- a/frontends/api/src/mitxonline/test-utils/factories/programs.ts
+++ b/frontends/api/src/mitxonline/test-utils/factories/programs.ts
@@ -3,6 +3,7 @@ import type { PartialFactory } from "ol-test-utilities"
 import type {
   V2Program,
   V2ProgramCollection,
+  V3SimpleProgram,
 } from "@mitodl/mitxonline-api-axios/v2"
 import { faker } from "@faker-js/faker/locale/en"
 import { UniqueEnforcer } from "enforce-unique"
@@ -105,4 +106,20 @@ const programCollection: PartialFactory<V2ProgramCollection> = (
   return mergeOverrides<V2ProgramCollection>(defaults, overrides)
 }
 
-export { program, programs, programCollection }
+const simpleProgram: PartialFactory<V3SimpleProgram> = (overrides = {}) => {
+  const defaults: V3SimpleProgram = {
+    id: uniqueProgramId.enforce(() => faker.number.int()),
+    title: faker.lorem.words(3),
+    readable_id: faker.lorem.slug(),
+    program_type: faker.helpers.arrayElement([
+      "certificate",
+      "degree",
+      "diploma",
+    ]),
+    live: faker.datatype.boolean(),
+  }
+
+  return mergeOverrides<V3SimpleProgram>(defaults, overrides)
+}
+
+export { program, programs, programCollection, simpleProgram }
diff --git a/frontends/api/src/mitxonline/test-utils/urls.ts b/frontends/api/src/mitxonline/test-utils/urls.ts
index 5eaef27397..504b470727 100644
--- a/frontends/api/src/mitxonline/test-utils/urls.ts
+++ b/frontends/api/src/mitxonline/test-utils/urls.ts
@@ -25,8 +25,7 @@ const enrollment = {
 }
 
 const programEnrollments = {
-  enrollmentsList: () => `${API_BASE_URL}/api/v1/program_enrollments/`,
-  enrollmentsListV2: () => `${API_BASE_URL}/api/v2/program_enrollments/`,
+  enrollmentsListV3: () => `${API_BASE_URL}/api/v3/program_enrollments/`,
 }
 
 const b2b = {
diff --git a/frontends/main/package.json b/frontends/main/package.json
index 17df39126d..1bd6c11b59 100644
--- a/frontends/main/package.json
+++ b/frontends/main/package.json
@@ -14,8 +14,8 @@
     "@emotion/styled": "^11.11.0",
     "@floating-ui/react": "^0.27.16",
     "@mitodl/course-search-utils": "^3.5.0",
-    "@mitodl/mitxonline-api-axios": "^2026.1.14",
-    "@mitodl/smoot-design": "^6.23.0",
+    "@mitodl/mitxonline-api-axios": "^2026.2.5",
+    "@mitodl/smoot-design": "^6.24.0",
     "@mui/material": "^6.4.5",
     "@mui/material-nextjs": "^6.4.3",
     "@radix-ui/react-dropdown-menu": "^2.1.16",
diff --git a/frontends/main/src/app-pages/Articles/ArticleDraftPage.tsx b/frontends/main/src/app-pages/Articles/ArticleDraftListingPage.tsx
similarity index 96%
rename from frontends/main/src/app-pages/Articles/ArticleDraftPage.tsx
rename to frontends/main/src/app-pages/Articles/ArticleDraftListingPage.tsx
index 2d96858ebd..0f3fff4e1a 100644
--- a/frontends/main/src/app-pages/Articles/ArticleDraftPage.tsx
+++ b/frontends/main/src/app-pages/Articles/ArticleDraftListingPage.tsx
@@ -20,6 +20,7 @@ import { RiArrowLeftLine, RiArrowRightLine } from "@remixicon/react"
 import { ArticleBanner, DEFAULT_BACKGROUND_IMAGE_URL } from "./ArticleBanner"
 import { extractFirstImageFromArticle } from "@/common/articleUtils"
 import { notFound } from "next/navigation"
+import { articlesDraftView, articlesView } from "@/common/urls"
 
 const PAGE_SIZE = 20
 
@@ -68,7 +69,9 @@ const DraftBadge = styled.span`
 export const DraftArticle: React.FC<{ article: RichTextArticle }> = ({
   article,
 }) => {
-  const articleUrl = `/articles/${article.slug || article.id}`
+  const articleUrl = article.is_published
+    ? articlesView(article.slug || String(article.id))
+    : articlesDraftView(String(article.id))
 
   const imageUrl = extractFirstImageFromArticle(article.content)
 
diff --git a/frontends/main/src/app-pages/Articles/ArticleEditPage.tsx b/frontends/main/src/app-pages/Articles/ArticleEditPage.tsx
index e1efbfb455..aaab2df643 100644
--- a/frontends/main/src/app-pages/Articles/ArticleEditPage.tsx
+++ b/frontends/main/src/app-pages/Articles/ArticleEditPage.tsx
@@ -8,7 +8,8 @@ import { useArticleDetailRetrieve } from "api/hooks/articles"
 import RestrictedRoute from "@/components/RestrictedRoute/RestrictedRoute"
 import { styled, LoadingSpinner } from "ol-components"
 import { ArticleEditor } from "@/page-components/TiptapEditor/ArticleEditor"
-import { articlesView } from "@/common/urls"
+import { articlesView, articlesDraftView } from "@/common/urls"
+import invariant from "tiny-invariant"
 
 const PageContainer = styled.div(({ theme }) => ({
   color: theme.custom.colors.darkGray2,
@@ -45,9 +46,12 @@ const ArticleEditPage = ({ articleId }: { articleId: string }) => {
         <ArticleEditor
           article={article}
           onSave={(article) => {
-            if (article.is_published)
-              return router.push(articlesView(article.slug!))
-            router.push(articlesView(String(article.id)))
+            if (article.is_published) {
+              invariant(article.slug, "Published article must have a slug")
+              return router.push(articlesView(article.slug))
+            } else {
+              router.push(articlesDraftView(String(article.id)))
+            }
           }}
         />
       </PageContainer>
diff --git a/frontends/main/src/app-pages/Articles/ArticleNewPage.tsx b/frontends/main/src/app-pages/Articles/ArticleNewPage.tsx
index 3ea8ae62cb..8cbdd98489 100644
--- a/frontends/main/src/app-pages/Articles/ArticleNewPage.tsx
+++ b/frontends/main/src/app-pages/Articles/ArticleNewPage.tsx
@@ -6,7 +6,8 @@ import { Permission } from "api/hooks/user"
 import RestrictedRoute from "@/components/RestrictedRoute/RestrictedRoute"
 import { styled } from "ol-components"
 import { ArticleEditor } from "@/page-components/TiptapEditor/ArticleEditor"
-import { articlesView } from "@/common/urls"
+import { articlesDraftView, articlesView } from "@/common/urls"
+import invariant from "tiny-invariant"
 
 const PageContainer = styled.div(({ theme }) => ({
   color: theme.custom.colors.darkGray2,
@@ -22,9 +23,12 @@ const ArticleNewPage: React.FC = () => {
       <PageContainer>
         <ArticleEditor
           onSave={(article) => {
-            if (article.is_published)
-              return router.push(articlesView(article.slug!))
-            router.push(articlesView(String(article.id)))
+            if (article.is_published) {
+              invariant(article.slug, "Published article must have a slug")
+              return router.push(articlesView(article.slug))
+            } else {
+              router.push(articlesDraftView(String(article.id)))
+            }
           }}
         />
       </PageContainer>
diff --git a/frontends/main/src/app-pages/DashboardPage/ContractContent.test.tsx b/frontends/main/src/app-pages/DashboardPage/ContractContent.test.tsx
index 14bdd26574..a407ef87f7 100644
--- a/frontends/main/src/app-pages/DashboardPage/ContractContent.test.tsx
+++ b/frontends/main/src/app-pages/DashboardPage/ContractContent.test.tsx
@@ -25,8 +25,7 @@ const makeGrade = factories.enrollment.grade
 describe("ContractContent", () => {
   beforeEach(() => {
     setMockResponse.get(urls.enrollment.enrollmentsListV2(), [])
-    setMockResponse.get(urls.programEnrollments.enrollmentsList(), [])
-    setMockResponse.get(urls.programEnrollments.enrollmentsListV2(), [])
+    setMockResponse.get(urls.programEnrollments.enrollmentsListV3(), [])
     setMockResponse.get(urls.contracts.contractsList(), [])
   })
 
@@ -695,7 +694,7 @@ describe("ContractContent", () => {
         url: "/certificate/program/cert-123",
       },
     }
-    const programEnrollment = factories.enrollment.programEnrollmentV2({
+    const programEnrollment = factories.enrollment.programEnrollmentV3({
       program: programWithCertificate,
       certificate: {
         uuid: programWithCertificate.certificate.uuid,
@@ -726,10 +725,7 @@ describe("ContractContent", () => {
         results: coursesA,
       },
     )
-    setMockResponse.get(urls.programEnrollments.enrollmentsList(), [
-      programEnrollment,
-    ])
-    setMockResponse.get(urls.programEnrollments.enrollmentsListV2(), [
+    setMockResponse.get(urls.programEnrollments.enrollmentsListV3(), [
       programEnrollment,
     ])
 
diff --git a/frontends/main/src/app-pages/DashboardPage/ContractContent.tsx b/frontends/main/src/app-pages/DashboardPage/ContractContent.tsx
index 332e6a3596..3e8a473795 100644
--- a/frontends/main/src/app-pages/DashboardPage/ContractContent.tsx
+++ b/frontends/main/src/app-pages/DashboardPage/ContractContent.tsx
@@ -1,7 +1,6 @@
 "use client"
 
 import React, { useEffect } from "react"
-import DOMPurify from "isomorphic-dompurify"
 import Image from "next/image"
 import { useQuery } from "@tanstack/react-query"
 import {
@@ -22,11 +21,11 @@ import {
 import graduateLogo from "@/public/images/dashboard/graduate.png"
 import {
   CourseRunEnrollmentRequestV2,
-  V2UserProgramEnrollmentDetail,
   ContractPage,
   OrganizationPage,
   V2ProgramCollection,
   V2Program,
+  V3UserProgramEnrollment,
 } from "@mitodl/mitxonline-api-axios/v2"
 import { mitxUserQueries } from "api/mitxonline-hooks/user"
 import { ButtonLink } from "@mitodl/smoot-design"
@@ -38,6 +37,7 @@ import {
   getKey,
   selectBestEnrollment,
 } from "./CoursewareDisplay/helpers"
+import UnstyledRawHTML from "@/components/UnstyledRawHTML/UnstyledRawHTML"
 
 const HeaderRoot = styled.div({
   display: "flex",
@@ -89,12 +89,21 @@ const ContractHeader: React.FC<{
   )
 }
 
-const WelcomeMessageExtra = styled(Typography)({
+const WelcomeMessageExtra = styled(UnstyledRawHTML)(({ theme }) => ({
+  ...theme.typography.body1,
   margin: 0,
-  p: {
-    margin: 0,
+  "*:first-child": {
+    marginTop: 0,
   },
-})
+  "*:last-child": {
+    marginBottom: 0,
+  },
+  iframe: {
+    width: "100%",
+    aspectRatio: "16 / 9",
+    border: "none",
+  },
+}))
 
 const WelcomeMessage: React.FC<{ contract?: ContractPage }> = ({
   contract,
@@ -105,7 +114,7 @@ const WelcomeMessage: React.FC<{ contract?: ContractPage }> = ({
     return empty
   }
   const welcomeMessage = contract.welcome_message
-  const welcomeMessageExtra = DOMPurify.sanitize(contract.welcome_message_extra)
+  const welcomeMessageExtra = contract.welcome_message_extra
   if (!welcomeMessage || !welcomeMessageExtra) {
     return empty
   }
@@ -122,12 +131,7 @@ const WelcomeMessage: React.FC<{ contract?: ContractPage }> = ({
           {showingMore ? "Show less" : "Show more"}
         </Link>
       </Stack>
-      {showingMore && (
-        <WelcomeMessageExtra
-          variant="body1"
-          dangerouslySetInnerHTML={{ __html: welcomeMessageExtra }}
-        />
-      )}
+      {showingMore && <WelcomeMessageExtra html={welcomeMessageExtra} />}
     </Stack>
   )
 }
@@ -178,11 +182,12 @@ const ProgramCertificateButton = styled(ButtonLink)(({ theme }) => ({
   gap: "10px",
 }))
 
-const ProgramDescription = styled(Typography)({
+const ProgramDescription = styled(UnstyledRawHTML)(({ theme }) => ({
+  ...theme.typography.body2,
   p: {
     margin: 0,
   },
-})
+}))
 
 const ProgramCollectionsList = styled(PlainList)({
   display: "flex",
@@ -231,7 +236,6 @@ const OrgProgramCollectionDisplay: React.FC<{
   contract: ContractPage
   enrollments?: CourseRunEnrollmentRequestV2[]
 }> = ({ collection, contract, enrollments }) => {
-  const sanitizedDescription = DOMPurify.sanitize(collection.description ?? "")
   const { isLoading, programsWithCourses, hasAnyCourses } =
     useProgramCollectionCourses(collection, contract.id)
   const firstCourseIds = programsWithCourses
@@ -266,10 +270,7 @@ const OrgProgramCollectionDisplay: React.FC<{
         <Typography variant="h5" component="h2">
           {collection.title}
         </Typography>
-        <ProgramDescription
-          variant="body2"
-          dangerouslySetInnerHTML={{ __html: sanitizedDescription }}
-        />
+        <ProgramDescription html={collection.description ?? ""} />
       </ProgramHeaderText>
     </ProgramHeader>
   )
@@ -335,7 +336,6 @@ const OrgProgramCollectionDisplay: React.FC<{
               }
               noun="Module"
               offerUpgrade={false}
-              titleAction="courseware"
               buttonHref={bestEnrollment?.run.courseware_url}
               contractId={contract.id}
             />
@@ -350,7 +350,7 @@ const OrgProgramDisplay: React.FC<{
   program: V2Program
   contract?: ContractPage
   courseRunEnrollments?: CourseRunEnrollmentRequestV2[]
-  programEnrollments?: V2UserProgramEnrollmentDetail[]
+  programEnrollments?: V3UserProgramEnrollment[]
   programLoading: boolean
   orgId: number
 }> = ({
@@ -376,7 +376,6 @@ const OrgProgramDisplay: React.FC<{
     <Skeleton width="100%" height="65px" style={{ marginBottom: "16px" }} />
   )
 
-  const sanitizedHtml = DOMPurify.sanitize(program.page.description)
   const courses =
     coursesQuery.data?.results.sort((a, b) => {
       return program.courses.indexOf(a.id) - program.courses.indexOf(b.id)
@@ -389,10 +388,7 @@ const OrgProgramDisplay: React.FC<{
           <Typography variant="h5" component="h2">
             {program.title}
           </Typography>
-          <ProgramDescription
-            variant="body2"
-            dangerouslySetInnerHTML={{ __html: sanitizedHtml }}
-          />
+          <ProgramDescription html={program.page.description ?? ""} />
         </ProgramHeaderText>
         {hasValidCertificate && (
           <ProgramCertificateButton
@@ -437,7 +433,6 @@ const OrgProgramDisplay: React.FC<{
                   }
                   noun="Module"
                   offerUpgrade={false}
-                  titleAction="courseware"
                   buttonHref={bestEnrollment?.run.courseware_url}
                   contractId={contract?.id}
                 />
diff --git a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.test.tsx b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.test.tsx
index 0f28792bf5..21cf66b50f 100644
--- a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.test.tsx
+++ b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.test.tsx
@@ -13,12 +13,16 @@ import { mockAxiosInstance } from "api/test-utils"
 import {
   DashboardCard,
   DashboardType,
-  getDefaultContextMenuItems,
+  getContextMenuItems,
 } from "./DashboardCard"
 import { dashboardCourse } from "./test-utils"
 import { faker } from "@faker-js/faker/locale/en"
 import moment from "moment"
 import { cartesianProduct } from "ol-test-utilities"
+import { useFeatureFlagEnabled } from "posthog-js/react"
+
+jest.mock("posthog-js/react")
+const mockedUseFeatureFlagEnabled = jest.mocked(useFeatureFlagEnabled)
 
 const EnrollmentMode = {
   Audit: "audit",
@@ -81,68 +85,12 @@ describe.each([
 
   setupLocationMock()
 
-  test("It shows course title and links to marketingUrl if titleAction is marketing and enrolled", async () => {
-    setupUserApis()
-    const marketingUrl = "?some-marketing-url"
-    const course = dashboardCourse({
-      page: {
-        page_url: marketingUrl,
-      },
-    })
-    const enrollment = mitxonline.factories.enrollment.courseEnrollment({
-      grades: [], // No passing grade = enrolled but not completed
-      run: {
-        ...mitxonline.factories.enrollment.courseEnrollment().run,
-        course: course,
-      },
-    })
-    renderWithProviders(
-      <DashboardCard
-        titleAction="marketing"
-        resource={{ type: DashboardType.CourseRunEnrollment, data: enrollment }}
-      />,
-    )
-
-    const card = getCard()
-
-    const courseLink = within(card).getByRole("link", {
-      name: course.title,
-    })
-    expect(courseLink).toHaveAttribute("href", marketingUrl)
-  })
-
-  test("It shows course title as clickable text (not link) if titleAction is marketing and not enrolled (non-B2B)", async () => {
-    setupUserApis()
-    const course = dashboardCourse({
-      page: {
-        page_url: "?some-marketing-url",
-      },
-      courseruns: [
-        mitxonline.factories.courses.courseRun({
-          b2b_contract: null,
-        }),
-      ],
-    })
-    // No enrollment = not enrolled
-    renderWithProviders(
-      <DashboardCard
-        titleAction="marketing"
-        resource={{ type: DashboardType.Course, data: course }}
-      />,
-    )
-
-    const card = getCard()
-
-    // Should not be a link
-    expect(
-      within(card).queryByRole("link", { name: course.title }),
-    ).not.toBeInTheDocument()
-    // Should be clickable text
-    const titleText = within(card).getByText(course.title)
-    expect(titleText).toBeInTheDocument()
+  beforeEach(() => {
+    // Default to feature flag disabled unless explicitly set in a test
+    mockedUseFeatureFlagEnabled.mockReturnValue(false)
   })
 
-  test("It shows course title and links to courseware if titleAction is courseware and enrolled", async () => {
+  test("It shows course title and links to courseware when enrolled", async () => {
     setupUserApis()
     const coursewareUrl = faker.internet.url()
     const courseRun = mitxonline.factories.courses.courseRun({
@@ -161,7 +109,6 @@ describe.each([
     })
     renderWithProviders(
       <DashboardCard
-        titleAction="courseware"
         resource={{ type: DashboardType.CourseRunEnrollment, data: enrollment }}
       />,
     )
@@ -174,7 +121,7 @@ describe.each([
     expect(courseLink).toHaveAttribute("href", coursewareUrl)
   })
 
-  test("It shows course title as clickable text (not link) if titleAction is courseware and not enrolled (non-B2B)", async () => {
+  test("It shows course title as clickable text (not link) when not enrolled (non-B2B)", async () => {
     setupUserApis()
     const course = dashboardCourse({
       courseruns: [
@@ -185,10 +132,7 @@ describe.each([
     })
     // No enrollment = not enrolled
     renderWithProviders(
-      <DashboardCard
-        titleAction="courseware"
-        resource={{ type: DashboardType.Course, data: course }}
-      />,
+      <DashboardCard resource={{ type: DashboardType.Course, data: course }} />,
     )
 
     const card = getCard()
@@ -202,7 +146,7 @@ describe.each([
     expect(titleText).toBeInTheDocument()
   })
 
-  test("It shows course title as link if not enrolled but has B2B contract", async () => {
+  test("It shows course title as clickable text if not enrolled but has B2B contract", async () => {
     setupUserApis()
     const b2bContractId = faker.number.int()
     const coursewareUrl = faker.internet.url()
@@ -216,21 +160,19 @@ describe.each([
       ],
       next_run_id: null, // Ensure getBestRun uses the single run
     })
-    // No enrollment passed, but B2B contract in run allows access
+    // No enrollment passed, B2B contract requires enrollment first
     renderWithProviders(
-      <DashboardCard
-        titleAction="courseware"
-        resource={{ type: DashboardType.Course, data: course }}
-      />,
+      <DashboardCard resource={{ type: DashboardType.Course, data: course }} />,
     )
 
     const card = getCard()
 
-    // Should be a link for B2B courses
-    const courseLink = within(card).getByRole("link", {
-      name: course.title,
-    })
-    expect(courseLink).toHaveAttribute("href", coursewareUrl)
+    // Should be clickable text, not a link (enrollment happens on click)
+    expect(
+      within(card).queryByRole("link", { name: course.title }),
+    ).not.toBeInTheDocument()
+    const titleText = within(card).getByText(course.title)
+    expect(titleText).toBeInTheDocument()
   })
 
   test("Accepts a classname", () => {
@@ -244,7 +186,6 @@ describe.each([
     ])
     renderWithProviders(
       <DashboardCard
-        titleAction="marketing"
         Component={TheComponent}
         resource={{ type: DashboardType.Course, data: course }}
         className="some-custom classes"
@@ -286,7 +227,6 @@ describe.each([
       })
       renderWithProviders(
         <DashboardCard
-          titleAction="marketing"
           resource={{
             type: DashboardType.CourseRunEnrollment,
             data: enrollment,
@@ -315,10 +255,7 @@ describe.each([
     })
 
     renderWithProviders(
-      <DashboardCard
-        titleAction="marketing"
-        resource={{ type: DashboardType.Course, data: course }}
-      />,
+      <DashboardCard resource={{ type: DashboardType.Course, data: course }} />,
     )
 
     const card = getCard()
@@ -359,7 +296,6 @@ describe.each([
       })
       const { view } = renderWithProviders(
         <DashboardCard
-          titleAction="marketing"
           resource={{
             type: DashboardType.CourseRunEnrollment,
             data: enrollment,
@@ -378,7 +314,6 @@ describe.each([
       const courseNoun = faker.word.noun()
       view.rerender(
         <DashboardCard
-          titleAction="marketing"
           noun={courseNoun}
           resource={{
             type: DashboardType.CourseRunEnrollment,
@@ -474,7 +409,6 @@ describe.each([
       }
       renderWithProviders(
         <DashboardCard
-          titleAction="marketing"
           resource={{
             type: DashboardType.CourseRunEnrollment,
             data: enrollmentWithCourse,
@@ -519,7 +453,6 @@ describe.each([
 
       renderWithProviders(
         <DashboardCard
-          titleAction="marketing"
           resource={{
             type: DashboardType.CourseRunEnrollment,
             data: enrollment,
@@ -567,7 +500,6 @@ describe.each([
 
     renderWithProviders(
       <DashboardCard
-        titleAction="marketing"
         resource={{ type: DashboardType.CourseRunEnrollment, data: enrollment }}
       />,
     )
@@ -800,10 +732,7 @@ describe.each([
       next_run_id: run.id, // Ensure getBestRun uses this run
     })
     renderWithProviders(
-      <DashboardCard
-        titleAction="marketing"
-        resource={{ type: DashboardType.Course, data: course }}
-      />,
+      <DashboardCard resource={{ type: DashboardType.Course, data: course }} />,
     )
     const card = getCard()
 
@@ -830,7 +759,6 @@ describe.each([
       ])
       const { view } = renderWithProviders(
         <DashboardCard
-          titleAction="marketing"
           resource={
             enrollmentOrNull
               ? {
@@ -855,7 +783,6 @@ describe.each([
         })
       view.rerender(
         <DashboardCard
-          titleAction="marketing"
           resource={{
             type: DashboardType.CourseRunEnrollment,
             data: completedEnrollment,
@@ -904,7 +831,6 @@ describe.each([
         : null
       renderWithProviders(
         <DashboardCard
-          titleAction="marketing"
           resource={
             enrollment
               ? {
@@ -946,7 +872,7 @@ describe.each([
     "getDefaultContextMenuItems returns correct items",
     async ({ contextMenuItems }) => {
       setupUserApis()
-      const course = dashboardCourse()
+      const course = dashboardCourse({ include_in_learn_catalog: true })
       const run = course.courseruns[0]
       const enrollment = mitxonline.factories.enrollment.courseEnrollment({
         grades: [mitxonline.factories.enrollment.grade({ passed: true })],
@@ -955,7 +881,6 @@ describe.each([
       })
       renderWithProviders(
         <DashboardCard
-          titleAction="marketing"
           resource={{
             type: DashboardType.CourseRunEnrollment,
             data: enrollment,
@@ -968,9 +893,18 @@ describe.each([
         name: "More options",
       })
       await user.click(contextMenuButton)
+
       const expectedMenuItems = [
         ...contextMenuItems,
-        ...getDefaultContextMenuItems("Test Course", enrollment),
+        ...getContextMenuItems(
+          "Test Course",
+          {
+            type: DashboardType.CourseRunEnrollment,
+            data: enrollment,
+          },
+          false, // useProductPages
+          true, // includeInLearnCatalog
+        ),
       ]
       const menuItems = screen.getAllByRole("menuitem")
       for (let i = 0; i < expectedMenuItems.length; i++) {
@@ -1013,7 +947,6 @@ describe.each([
         : null
       renderWithProviders(
         <DashboardCard
-          titleAction="marketing"
           resource={
             enrollmentWithCourse
               ? {
@@ -1071,7 +1004,6 @@ describe.each([
         : null
       renderWithProviders(
         <DashboardCard
-          titleAction="marketing"
           resource={
             enrollment
               ? {
@@ -1106,7 +1038,6 @@ describe.each([
     })
     renderWithProviders(
       <DashboardCard
-        titleAction="marketing"
         resource={{ type: DashboardType.CourseRunEnrollment, data: enrollment }}
       />,
     )
@@ -1172,7 +1103,6 @@ describe.each([
       })
       renderWithProviders(
         <DashboardCard
-          titleAction="courseware"
           resource={{ type: DashboardType.Course, data: course }}
           contractId={b2bContractId}
         />,
@@ -1181,7 +1111,7 @@ describe.each([
       const triggerElement =
         trigger === "button"
           ? within(card).getByTestId("courseware-button")
-          : within(card).getByRole("link", { name: course.title })
+          : within(card).getByText(course.title)
 
       await user.click(triggerElement)
 
@@ -1212,7 +1142,6 @@ describe.each([
       setupEnrollmentApis({ user: userData, course, run })
       renderWithProviders(
         <DashboardCard
-          titleAction="courseware"
           resource={{ type: DashboardType.Course, data: course }}
           contractId={b2bContractId}
         />,
@@ -1221,7 +1150,7 @@ describe.each([
       const triggerElement =
         trigger === "button"
           ? within(card).getByTestId("courseware-button")
-          : within(card).getByRole("link", { name: course.title })
+          : within(card).getByText(course.title)
 
       await user.click(triggerElement)
 
@@ -1239,7 +1168,6 @@ describe.each([
       renderWithProviders(
         <DashboardCard
           variant="stacked"
-          titleAction="marketing"
           resource={{ type: DashboardType.Course, data: course }}
         />,
       )
@@ -1278,7 +1206,6 @@ describe.each([
             <DashboardCard
               key={`course-${idx}`}
               variant="stacked"
-              titleAction="marketing"
               resource={{ type: DashboardType.Course, data: course }}
             />
           ))}
@@ -1303,15 +1230,14 @@ describe.each([
     test("renders program card with title", () => {
       setupUserApis()
       const programEnrollment =
-        mitxonline.factories.enrollment.programEnrollmentV2({
-          program: mitxonline.factories.programs.program({
+        mitxonline.factories.enrollment.programEnrollmentV3({
+          program: mitxonline.factories.programs.simpleProgram({
             title: "Test Program Title",
           }),
         })
 
       renderWithProviders(
         <DashboardCard
-          titleAction="marketing"
           resource={{
             type: DashboardType.ProgramEnrollment,
             data: programEnrollment,
@@ -1323,18 +1249,43 @@ describe.each([
       expect(within(card).getByText("Test Program Title")).toBeInTheDocument()
     })
 
+    test("program card title links to program dashboard", () => {
+      setupUserApis()
+      const programEnrollment =
+        mitxonline.factories.enrollment.programEnrollmentV3({
+          program: mitxonline.factories.programs.simpleProgram({
+            title: "Test Program Title",
+            id: 123,
+          }),
+        })
+
+      renderWithProviders(
+        <DashboardCard
+          resource={{
+            type: DashboardType.ProgramEnrollment,
+            data: programEnrollment,
+          }}
+        />,
+      )
+
+      const card = getCard()
+      const titleLink = within(card).getByRole("link", {
+        name: "Test Program Title",
+      })
+      expect(titleLink).toHaveAttribute("href", "/dashboard/program/123")
+    })
+
     test("program card does not show course-specific elements", () => {
       setupUserApis()
       const programEnrollment =
-        mitxonline.factories.enrollment.programEnrollmentV2({
-          program: mitxonline.factories.programs.program({
+        mitxonline.factories.enrollment.programEnrollmentV3({
+          program: mitxonline.factories.programs.simpleProgram({
             title: "Test Program",
           }),
         })
 
       renderWithProviders(
         <DashboardCard
-          titleAction="marketing"
           resource={{
             type: DashboardType.ProgramEnrollment,
             data: programEnrollment,
@@ -1349,5 +1300,279 @@ describe.each([
       ).not.toBeInTheDocument()
       expect(within(card).queryByTestId("upgrade-root")).not.toBeInTheDocument()
     })
+
+    test.each([
+      {
+        useProductPages: false,
+        description: "uses marketing URLs when feature flag is disabled",
+      },
+      {
+        useProductPages: true,
+        description: "uses product page URLs when feature flag is enabled",
+      },
+    ])(
+      "Context menu for course enrollment $description",
+      async ({ useProductPages }) => {
+        mockedUseFeatureFlagEnabled.mockReturnValue(useProductPages)
+        setupUserApis()
+
+        const marketingUrl = faker.internet.url()
+        const course = dashboardCourse({
+          page: { page_url: marketingUrl },
+          include_in_learn_catalog: true,
+        })
+        const run = course.courseruns[0]
+        const enrollment = mitxonline.factories.enrollment.courseEnrollment({
+          grades: [mitxonline.factories.enrollment.grade({ passed: true })],
+          enrollment_mode: EnrollmentMode.Verified,
+          run: {
+            ...run,
+            course: { ...course, page: { page_url: marketingUrl } },
+          },
+        })
+
+        renderWithProviders(
+          <DashboardCard
+            resource={{
+              type: DashboardType.CourseRunEnrollment,
+              data: enrollment,
+            }}
+          />,
+        )
+
+        const card = getCard()
+        const contextMenuButton = within(card).getByRole("button", {
+          name: "More options",
+        })
+        await user.click(contextMenuButton)
+
+        const viewDetailsItem = screen.getByRole("menuitem", {
+          name: "View Course Details",
+        })
+
+        if (useProductPages) {
+          // Should have product page URL as href
+          expect(viewDetailsItem).toHaveAttribute(
+            "href",
+            `/courses/${course.readable_id}`,
+          )
+        } else {
+          // Should have marketing URL as href
+          expect(viewDetailsItem).toHaveAttribute("href", marketingUrl)
+        }
+      },
+    )
+
+    test("Context menu for program enrollment uses product page URLs when feature flag is enabled", async () => {
+      mockedUseFeatureFlagEnabled.mockReturnValue(true)
+      setupUserApis()
+
+      const program = mitxonline.factories.programs.simpleProgram()
+      const programEnrollment =
+        mitxonline.factories.enrollment.programEnrollmentV3({
+          program,
+        })
+
+      renderWithProviders(
+        <DashboardCard
+          resource={{
+            type: DashboardType.ProgramEnrollment,
+            data: programEnrollment,
+          }}
+        />,
+      )
+
+      const card = getCard()
+      const contextMenuButton = within(card).getByRole("button", {
+        name: "More options",
+      })
+      await user.click(contextMenuButton)
+
+      const viewDetailsItem = screen.getByRole("menuitem", {
+        name: "View Program Details",
+      })
+
+      // Should have product page URL as href
+      expect(viewDetailsItem).toHaveAttribute(
+        "href",
+        `/programs/${program.readable_id}`,
+      )
+    })
+
+    test("Context menu for program enrollment uses constructed marketing URL when feature flag is disabled", async () => {
+      mockedUseFeatureFlagEnabled.mockReturnValue(false)
+      setupUserApis()
+
+      const program = mitxonline.factories.programs.simpleProgram({
+        readable_id: "test-program-123",
+      })
+      const programEnrollment =
+        mitxonline.factories.enrollment.programEnrollmentV3({
+          program,
+        })
+
+      renderWithProviders(
+        <DashboardCard
+          resource={{
+            type: DashboardType.ProgramEnrollment,
+            data: programEnrollment,
+          }}
+        />,
+      )
+
+      const card = getCard()
+      const contextMenuButton = within(card).getByRole("button", {
+        name: "More options",
+      })
+      await user.click(contextMenuButton)
+
+      const viewDetailsItem = screen.getByRole("menuitem", {
+        name: "View Program Details",
+      })
+
+      // Should have constructed marketing URL
+      expect(viewDetailsItem).toHaveAttribute(
+        "href",
+        "http://mitxonline.odl.local:8065/programs/test-program-123",
+      )
+    })
+
+    test("Context menu for course enrollment without marketing URL shows View Details only when flag is enabled", async () => {
+      setupUserApis()
+
+      const enrollment = mitxonline.factories.enrollment.courseEnrollment({
+        grades: [mitxonline.factories.enrollment.grade({ passed: true })],
+        enrollment_mode: EnrollmentMode.Verified,
+        run: {
+          ...mitxonline.factories.courses.courseRun(),
+          course: {
+            ...mitxonline.factories.courses.course(),
+            include_in_learn_catalog: true,
+          },
+        },
+      })
+      // Remove the page property to simulate a course without a marketing URL
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      delete (enrollment.run.course as any).page
+
+      // Test with flag disabled (no marketing URL, no View Details menu item)
+      mockedUseFeatureFlagEnabled.mockReturnValue(false)
+      renderWithProviders(
+        <DashboardCard
+          resource={{
+            type: DashboardType.CourseRunEnrollment,
+            data: enrollment,
+          }}
+        />,
+      )
+
+      const card = getCard()
+      const contextMenuButton = within(card).getByRole("button", {
+        name: "More options",
+      })
+      await user.click(contextMenuButton)
+
+      // Should not have View Course Details when flag is off and no marketing URL
+      expect(
+        screen.queryByRole("menuitem", { name: "View Course Details" }),
+      ).not.toBeInTheDocument()
+
+      // Should still have Email Settings and Unenroll
+      expect(
+        screen.getByRole("menuitem", { name: "Email Settings" }),
+      ).toBeInTheDocument()
+      expect(
+        screen.getByRole("menuitem", { name: "Unenroll" }),
+      ).toBeInTheDocument()
+    })
+
+    // Separate test for the flag enabled case
+    test("Context menu for course enrollment without marketing URL shows View Details when flag is enabled", async () => {
+      setupUserApis()
+
+      const enrollment = mitxonline.factories.enrollment.courseEnrollment({
+        grades: [mitxonline.factories.enrollment.grade({ passed: true })],
+        enrollment_mode: EnrollmentMode.Verified,
+        run: {
+          ...mitxonline.factories.courses.courseRun(),
+          course: {
+            ...mitxonline.factories.courses.course(),
+            include_in_learn_catalog: true,
+          },
+        },
+      })
+      // Remove the page property to simulate a course without a marketing URL
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      delete (enrollment.run.course as any).page
+
+      // Test with flag enabled
+      mockedUseFeatureFlagEnabled.mockReturnValue(true)
+      renderWithProviders(
+        <DashboardCard
+          resource={{
+            type: DashboardType.CourseRunEnrollment,
+            data: enrollment,
+          }}
+        />,
+      )
+
+      const card = getCard()
+      const contextMenuButton = within(card).getByRole("button", {
+        name: "More options",
+      })
+      await user.click(contextMenuButton)
+
+      // Should have View Course Details when flag is on (product pages always exist)
+      expect(
+        screen.getByRole("menuitem", { name: "View Course Details" }),
+      ).toBeInTheDocument()
+    })
+
+    test("Context menu does not show View Details for courses not in learn catalog", async () => {
+      setupUserApis()
+      mockedUseFeatureFlagEnabled.mockReturnValue(true) // Even with flag enabled
+
+      const course = dashboardCourse({
+        include_in_learn_catalog: false, // Key: not in catalog
+        page: { page_url: faker.internet.url() },
+      })
+      const run = course.courseruns[0]
+      const enrollment = mitxonline.factories.enrollment.courseEnrollment({
+        grades: [mitxonline.factories.enrollment.grade({ passed: true })],
+        enrollment_mode: EnrollmentMode.Verified,
+        run: {
+          ...run,
+          course: course,
+        },
+      })
+
+      renderWithProviders(
+        <DashboardCard
+          resource={{
+            type: DashboardType.CourseRunEnrollment,
+            data: enrollment,
+          }}
+        />,
+      )
+
+      const card = getCard()
+      const contextMenuButton = within(card).getByRole("button", {
+        name: "More options",
+      })
+      await user.click(contextMenuButton)
+
+      // Should NOT have View Course Details when not in learn catalog
+      expect(
+        screen.queryByRole("menuitem", { name: "View Course Details" }),
+      ).not.toBeInTheDocument()
+
+      // Should still have Email Settings and Unenroll
+      expect(
+        screen.getByRole("menuitem", { name: "Email Settings" }),
+      ).toBeInTheDocument()
+      expect(
+        screen.getByRole("menuitem", { name: "Unenroll" }),
+      ).toBeInTheDocument()
+    })
   })
 })
diff --git a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.tsx b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.tsx
index 0d8428e3ec..961ac6a487 100644
--- a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.tsx
+++ b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.tsx
@@ -17,6 +17,8 @@ import {
   RiAwardLine,
 } from "@remixicon/react"
 import { calendarDaysUntil, isInPast, NoSSR } from "ol-utilities"
+import { useFeatureFlagEnabled } from "posthog-js/react"
+import { FeatureFlags } from "@/common/feature_flags"
 
 import { EnrollmentStatusIndicator } from "./EnrollmentStatusIndicator"
 import {
@@ -28,13 +30,14 @@ import NiceModal from "@ebay/nice-modal-react"
 import { useCreateB2bEnrollment } from "api/mitxonline-hooks/enrollment"
 import { mitxUserQueries } from "api/mitxonline-hooks/user"
 import { useQuery } from "@tanstack/react-query"
-import { programView } from "@/common/urls"
+import { coursePageView, programPageView, programView } from "@/common/urls"
+import { mitxonlineUrl } from "@/common/mitxonline"
 import { useAddToBasket, useClearBasket } from "api/mitxonline-hooks/baskets"
 import { EnrollmentStatus, getBestRun, getEnrollmentStatus } from "./helpers"
 import {
   CourseWithCourseRunsSerializerV2,
   CourseRunEnrollmentRequestV2,
-  V2UserProgramEnrollmentDetail,
+  V3UserProgramEnrollment,
 } from "@mitodl/mitxonline-api-axios/v2"
 
 const EnrollmentMode = {
@@ -53,7 +56,7 @@ export type DashboardType = (typeof DashboardType)[keyof typeof DashboardType]
 type DashboardResource =
   | { type: "course"; data: CourseWithCourseRunsSerializerV2 }
   | { type: "courserun-enrollment"; data: CourseRunEnrollmentRequestV2 }
-  | { type: "program-enrollment"; data: V2UserProgramEnrollmentDetail }
+  | { type: "program-enrollment"; data: V3UserProgramEnrollment }
 
 /**
  * Gets the certificate link for a dashboard resource based on its type.
@@ -164,28 +167,69 @@ const MenuButton = styled(ActionButton)<{
     },
 ])
 
-const getDefaultContextMenuItems = (
+const getContextMenuItems = (
   title: string,
-  enrollment: CourseRunEnrollmentRequestV2,
+  resource: DashboardResource,
+  useProductPages: boolean,
+  includeInLearnCatalog: boolean,
+  additionalItems: SimpleMenuItem[] = [],
 ) => {
-  return [
-    {
-      className: "dashboard-card-menu-item",
-      key: "email-settings",
-      label: "Email Settings",
-      onClick: () => {
-        NiceModal.show(EmailSettingsDialog, { title, enrollment })
+  const menuItems = []
+  if (resource.type === DashboardType.ProgramEnrollment) {
+    const detailsUrl = useProductPages
+      ? programPageView(resource.data.program.readable_id)
+      : mitxonlineUrl(`/programs/${resource.data.program.readable_id}`)
+
+    if (detailsUrl && includeInLearnCatalog) {
+      menuItems.push({
+        className: "dashboard-card-menu-item",
+        key: "view-program-details",
+        label: "View Program Details",
+        href: detailsUrl,
+      })
+    }
+  }
+  if (resource.type === DashboardType.CourseRunEnrollment) {
+    const detailsUrl = useProductPages
+      ? coursePageView(resource.data.run.course.readable_id)
+      : resource.data.run.course.page?.page_url
+
+    const courseMenuItems = []
+
+    if (detailsUrl && includeInLearnCatalog) {
+      courseMenuItems.push({
+        className: "dashboard-card-menu-item",
+        key: "view-course-details",
+        label: "View Course Details",
+        href: detailsUrl,
+      })
+    }
+
+    courseMenuItems.push(
+      {
+        className: "dashboard-card-menu-item",
+        key: "email-settings",
+        label: "Email Settings",
+        onClick: () => {
+          NiceModal.show(EmailSettingsDialog, {
+            title,
+            enrollment: resource.data,
+          })
+        },
       },
-    },
-    {
-      className: "dashboard-card-menu-item",
-      key: "unenroll",
-      label: "Unenroll",
-      onClick: () => {
-        NiceModal.show(UnenrollDialog, { title, enrollment })
+      {
+        className: "dashboard-card-menu-item",
+        key: "unenroll",
+        label: "Unenroll",
+        onClick: () => {
+          NiceModal.show(UnenrollDialog, { title, enrollment: resource.data })
+        },
       },
-    },
-  ]
+    )
+
+    menuItems.push(...courseMenuItems)
+  }
+  return [...menuItems, ...additionalItems]
 }
 
 const useOneClickEnroll = () => {
@@ -520,7 +564,6 @@ const CourseStartCountdown: React.FC<{
 
 type DashboardCardProps = {
   resource: DashboardResource
-  titleAction?: "marketing" | "courseware"
   showNotComplete?: boolean
   offerUpgrade?: boolean
   noun?: string
@@ -537,7 +580,6 @@ type DashboardCardProps = {
 
 const DashboardCard: React.FC<DashboardCardProps> = ({
   resource,
-  titleAction = "courseware",
   showNotComplete = true,
   offerUpgrade = true,
   noun,
@@ -553,6 +595,9 @@ const DashboardCard: React.FC<DashboardCardProps> = ({
 }) => {
   const oneClickEnroll = useOneClickEnroll()
   const { data: user } = useQuery(mitxUserQueries.me())
+  const useProductPages = useFeatureFlagEnabled(
+    FeatureFlags.MitxOnlineProductPages,
+  )
 
   // Determine resource type from discriminated union
   const resourceIsCourse = resource.type === DashboardType.Course
@@ -629,11 +674,6 @@ const DashboardCard: React.FC<DashboardCardProps> = ({
       : EnrollmentStatus.Enrolled
 
   // URLs
-  const marketingUrl = resourceIsCourse
-    ? resource.data.page?.page_url
-    : resourceIsCourseRunEnrollment
-      ? resource.data.run.course.page?.page_url
-      : undefined
   const coursewareUrl = run?.courseware_url
   const hasEnrolled =
     isAnyCourse && enrollmentStatus !== EnrollmentStatus.NotEnrolled
@@ -647,16 +687,13 @@ const DashboardCard: React.FC<DashboardCardProps> = ({
     : true
   const disableEnrollment = resourceIsCourse && !hasEnrollableRuns
 
-  // Title link logic
   const titleHref = isAnyCourse
     ? hasEnrolled
-      ? titleAction === "marketing"
-        ? marketingUrl
-        : (coursewareUrl ?? marketingUrl)
-      : b2bContractId
-        ? (coursewareUrl ?? marketingUrl)
-        : undefined
-    : undefined
+      ? (buttonHref ?? coursewareUrl)
+      : undefined
+    : resourceIsProgramEnrollment
+      ? programView(resource.data.program.id)
+      : undefined
 
   const titleClick: React.MouseEventHandler | undefined =
     isAnyCourse && !hasEnrolled
@@ -667,8 +704,9 @@ const DashboardCard: React.FC<DashboardCardProps> = ({
             : resourceIsCourseRunEnrollment
               ? resource.data.run.courseware_id
               : undefined
-          if (!readableId || !coursewareUrl) return
-          handleEnrollment(coursewareUrl, readableId, !!b2bContractId)
+          const targetUrl = buttonHref ?? coursewareUrl
+          if (!readableId || !targetUrl) return
+          handleEnrollment(targetUrl, readableId, !!b2bContractId)
         }
       : undefined
 
@@ -682,8 +720,9 @@ const DashboardCard: React.FC<DashboardCardProps> = ({
             : resourceIsCourseRunEnrollment
               ? resource.data.run.courseware_id
               : undefined
-          if (!readableId || !coursewareUrl) return
-          handleEnrollment(coursewareUrl, readableId, !!b2bContractId)
+          const targetUrl = buttonHref ?? coursewareUrl
+          if (!readableId || !targetUrl) return
+          handleEnrollment(targetUrl, readableId, !!b2bContractId)
         }
       : buttonClick
   // Build sections
@@ -787,10 +826,19 @@ const DashboardCard: React.FC<DashboardCardProps> = ({
     <CourseStartCountdown startDate={run.start_date} />
   ) : null
 
-  const menuItems = contextMenuItems.concat(
-    resource.type === DashboardType.CourseRunEnrollment
-      ? getDefaultContextMenuItems(title, resource.data)
-      : [],
+  const includeInLearnCatalog = resourceIsCourse
+    ? resource.data.include_in_learn_catalog
+    : resourceIsCourseRunEnrollment
+      ? resource.data.run.course.include_in_learn_catalog
+      : resourceIsProgramEnrollment
+        ? true
+        : false
+  const menuItems = getContextMenuItems(
+    title,
+    resource,
+    useProductPages ?? false,
+    includeInLearnCatalog ?? false,
+    contextMenuItems,
   )
 
   const contextMenu = isLoading ? (
@@ -869,8 +917,4 @@ const DashboardCard: React.FC<DashboardCardProps> = ({
   )
 }
 
-export {
-  DashboardCard,
-  CardRoot as DashboardCardRoot,
-  getDefaultContextMenuItems,
-}
+export { DashboardCard, CardRoot as DashboardCardRoot, getContextMenuItems }
diff --git a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardDialogs.test.tsx b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardDialogs.test.tsx
index 9119e310b8..394991e738 100644
--- a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardDialogs.test.tsx
+++ b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardDialogs.test.tsx
@@ -41,7 +41,7 @@ describe("DashboardDialogs", () => {
       enrollments,
     )
     setMockResponse.get(
-      mitxonline.urls.programEnrollments.enrollmentsListV2(),
+      mitxonline.urls.programEnrollments.enrollmentsListV3(),
       [],
     )
     setMockResponse.get(mitxonline.urls.contracts.contractsList(), [])
@@ -213,10 +213,7 @@ describe("JustInTimeDialog", () => {
     const { course } = setupJustInTimeTest()
 
     renderWithProviders(
-      <DashboardCard
-        titleAction="marketing"
-        resource={{ type: DashboardType.Course, data: course }}
-      />,
+      <DashboardCard resource={{ type: DashboardType.Course, data: course }} />,
     )
 
     const enrollButtons = await screen.findAllByTestId("courseware-button")
@@ -254,7 +251,6 @@ describe("JustInTimeDialog", () => {
       const { course } = setupJustInTimeTest({ userOverrides })
       renderWithProviders(
         <DashboardCard
-          titleAction="marketing"
           resource={{ type: DashboardType.Course, data: course }}
         />,
       )
@@ -273,10 +269,7 @@ describe("JustInTimeDialog", () => {
     const { course } = setupJustInTimeTest()
 
     renderWithProviders(
-      <DashboardCard
-        titleAction="marketing"
-        resource={{ type: DashboardType.Course, data: course }}
-      />,
+      <DashboardCard resource={{ type: DashboardType.Course, data: course }} />,
     )
 
     const enrollButtons = await screen.findAllByTestId("courseware-button")
@@ -309,10 +302,7 @@ describe("JustInTimeDialog", () => {
     const { course } = setupJustInTimeTest()
 
     renderWithProviders(
-      <DashboardCard
-        titleAction="marketing"
-        resource={{ type: DashboardType.Course, data: course }}
-      />,
+      <DashboardCard resource={{ type: DashboardType.Course, data: course }} />,
     )
 
     const enrollButtons = await screen.findAllByTestId("courseware-button")
@@ -339,10 +329,7 @@ describe("JustInTimeDialog", () => {
     const { course, countries } = setupJustInTimeTest()
 
     renderWithProviders(
-      <DashboardCard
-        titleAction="marketing"
-        resource={{ type: DashboardType.Course, data: course }}
-      />,
+      <DashboardCard resource={{ type: DashboardType.Course, data: course }} />,
     )
 
     const enrollButtons = await screen.findAllByTestId("courseware-button")
@@ -367,10 +354,7 @@ describe("JustInTimeDialog", () => {
     const { course } = setupJustInTimeTest()
 
     renderWithProviders(
-      <DashboardCard
-        titleAction="marketing"
-        resource={{ type: DashboardType.Course, data: course }}
-      />,
+      <DashboardCard resource={{ type: DashboardType.Course, data: course }} />,
     )
 
     const enrollButtons = await screen.findAllByTestId("courseware-button")
@@ -400,10 +384,7 @@ describe("JustInTimeDialog", () => {
     })
 
     renderWithProviders(
-      <DashboardCard
-        titleAction="marketing"
-        resource={{ type: DashboardType.Course, data: course }}
-      />,
+      <DashboardCard resource={{ type: DashboardType.Course, data: course }} />,
     )
     const enrollButtons = await screen.findAllByTestId("courseware-button")
     await user.click(enrollButtons[0]) // Use the first (desktop) button
diff --git a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardDialogs.tsx b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardDialogs.tsx
index a95bf2ffbd..9dd86ba994 100644
--- a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardDialogs.tsx
+++ b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardDialogs.tsx
@@ -100,10 +100,8 @@ const EmailSettingsDialogInner: React.FC<DashboardDialogProps> = ({
           Update your email preferences for <BoldText>{title}.</BoldText>
         </Typography>
         <Alert severity="warning">
-          <Typography variant="body2" color="textPrimary">
-            Unchecking the box will prevent you from receiving important course
-            updates and emails.
-          </Typography>
+          Unchecking the box will prevent you from receiving important course
+          updates and emails.
         </Alert>
         <Checkbox
           name="receive_emails"
diff --git a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.test.tsx b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.test.tsx
index 3a27dd4731..054862eca3 100644
--- a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.test.tsx
+++ b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.test.tsx
@@ -30,7 +30,7 @@ describe("EnrollmentDisplay", () => {
       enrollments,
     )
     setMockResponse.get(
-      mitxonline.urls.programEnrollments.enrollmentsListV2(),
+      mitxonline.urls.programEnrollments.enrollmentsListV3(),
       [],
     )
     setMockResponse.get(mitxonline.urls.contracts.contractsList(), [])
@@ -112,18 +112,11 @@ describe("EnrollmentDisplay", () => {
     setMockResponse.get(mitxonline.urls.userMe.get(), mitxOnlineUser)
 
     const programEnrollment =
-      mitxonline.factories.enrollment.programEnrollmentV2({
+      mitxonline.factories.enrollment.programEnrollmentV3({
         program: {
-          ...mitxonline.factories.programs.program(),
+          ...mitxonline.factories.programs.simpleProgram(),
           title: "My Test Program",
         },
-        enrollments: [
-          {
-            ...mitxonline.factories.enrollment.courseEnrollment(),
-            b2b_contract_id: null,
-            b2b_organization_id: null,
-          },
-        ],
       })
 
     mockedUseFeatureFlagEnabled.mockReturnValue(true)
@@ -138,7 +131,7 @@ describe("EnrollmentDisplay", () => {
       }),
     ])
     setMockResponse.get(
-      mitxonline.urls.programEnrollments.enrollmentsListV2(),
+      mitxonline.urls.programEnrollments.enrollmentsListV3(),
       [programEnrollment],
     )
     setMockResponse.get(mitxonline.urls.contracts.contractsList(), [])
@@ -167,18 +160,11 @@ describe("EnrollmentDisplay", () => {
       },
     })
     const programEnrollment =
-      mitxonline.factories.enrollment.programEnrollmentV2({
+      mitxonline.factories.enrollment.programEnrollmentV3({
         program: {
-          ...mitxonline.factories.programs.program(),
+          ...mitxonline.factories.programs.simpleProgram(),
           title: "My Test Program",
         },
-        enrollments: [
-          {
-            ...mitxonline.factories.enrollment.courseEnrollment(),
-            b2b_contract_id: null,
-            b2b_organization_id: null,
-          },
-        ],
       })
 
     mockedUseFeatureFlagEnabled.mockReturnValue(true)
@@ -186,7 +172,7 @@ describe("EnrollmentDisplay", () => {
       courseEnrollment,
     ])
     setMockResponse.get(
-      mitxonline.urls.programEnrollments.enrollmentsListV2(),
+      mitxonline.urls.programEnrollments.enrollmentsListV3(),
       [programEnrollment],
     )
     setMockResponse.get(mitxonline.urls.contracts.contractsList(), [])
@@ -212,7 +198,7 @@ describe("EnrollmentDisplay", () => {
     mockedUseFeatureFlagEnabled.mockReturnValue(true)
     setMockResponse.get(mitxonline.urls.enrollment.enrollmentsListV2(), [])
     setMockResponse.get(
-      mitxonline.urls.programEnrollments.enrollmentsListV2(),
+      mitxonline.urls.programEnrollments.enrollmentsListV3(),
       [],
     )
     setMockResponse.get(mitxonline.urls.contracts.contractsList(), [])
@@ -237,33 +223,19 @@ describe("EnrollmentDisplay", () => {
     setMockResponse.get(mitxonline.urls.userMe.get(), mitxOnlineUser)
 
     const b2bProgramEnrollment =
-      mitxonline.factories.enrollment.programEnrollmentV2({
+      mitxonline.factories.enrollment.programEnrollmentV3({
         program: {
-          ...mitxonline.factories.programs.program(),
+          ...mitxonline.factories.programs.simpleProgram(),
           title: "B2B Program",
         },
-        enrollments: [
-          {
-            ...mitxonline.factories.enrollment.courseEnrollment(),
-            b2b_contract_id: 123,
-            b2b_organization_id: 456,
-          },
-        ],
       })
 
     const nonB2BProgramEnrollment =
-      mitxonline.factories.enrollment.programEnrollmentV2({
+      mitxonline.factories.enrollment.programEnrollmentV3({
         program: {
-          ...mitxonline.factories.programs.program(),
+          ...mitxonline.factories.programs.simpleProgram(),
           title: "Personal Program",
         },
-        enrollments: [
-          {
-            ...mitxonline.factories.enrollment.courseEnrollment(),
-            b2b_contract_id: null,
-            b2b_organization_id: null,
-          },
-        ],
       })
 
     mockedUseFeatureFlagEnabled.mockReturnValue(true)
@@ -278,7 +250,7 @@ describe("EnrollmentDisplay", () => {
       }),
     ])
     setMockResponse.get(
-      mitxonline.urls.programEnrollments.enrollmentsListV2(),
+      mitxonline.urls.programEnrollments.enrollmentsListV3(),
       [b2bProgramEnrollment, nonB2BProgramEnrollment],
     )
     // Mock contracts to filter out the B2B program
@@ -312,10 +284,16 @@ describe("EnrollmentDisplay", () => {
       mockedUseFeatureFlagEnabled.mockReturnValue(true)
       setMockResponse.get(mitxonline.urls.enrollment.enrollmentsListV2(), [])
       setMockResponse.get(
-        mitxonline.urls.programEnrollments.enrollmentsListV2(),
+        mitxonline.urls.programEnrollments.enrollmentsListV3(),
         [
-          mitxonline.factories.enrollment.programEnrollmentV2({
-            program: program,
+          mitxonline.factories.enrollment.programEnrollmentV3({
+            program: {
+              id: program.id,
+              title: program.title,
+              live: program.live,
+              program_type: program.program_type,
+              readable_id: program.readable_id,
+            },
           }),
         ],
       )
@@ -368,10 +346,16 @@ describe("EnrollmentDisplay", () => {
       mockedUseFeatureFlagEnabled.mockReturnValue(true)
       setMockResponse.get(mitxonline.urls.enrollment.enrollmentsListV2(), [])
       setMockResponse.get(
-        mitxonline.urls.programEnrollments.enrollmentsListV2(),
+        mitxonline.urls.programEnrollments.enrollmentsListV3(),
         [
-          mitxonline.factories.enrollment.programEnrollmentV2({
-            program: program,
+          mitxonline.factories.enrollment.programEnrollmentV3({
+            program: {
+              id: program.id,
+              title: program.title,
+              live: program.live,
+              program_type: program.program_type,
+              readable_id: program.readable_id,
+            },
           }),
         ],
       )
@@ -437,10 +421,16 @@ describe("EnrollmentDisplay", () => {
       mockedUseFeatureFlagEnabled.mockReturnValue(true)
       setMockResponse.get(mitxonline.urls.enrollment.enrollmentsListV2(), [])
       setMockResponse.get(
-        mitxonline.urls.programEnrollments.enrollmentsListV2(),
+        mitxonline.urls.programEnrollments.enrollmentsListV3(),
         [
-          mitxonline.factories.enrollment.programEnrollmentV2({
-            program: program,
+          mitxonline.factories.enrollment.programEnrollmentV3({
+            program: {
+              id: program.id,
+              title: program.title,
+              live: program.live,
+              program_type: program.program_type,
+              readable_id: program.readable_id,
+            },
           }),
         ],
       )
@@ -523,10 +513,16 @@ describe("EnrollmentDisplay", () => {
       mockedUseFeatureFlagEnabled.mockReturnValue(true)
       setMockResponse.get(mitxonline.urls.enrollment.enrollmentsListV2(), [])
       setMockResponse.get(
-        mitxonline.urls.programEnrollments.enrollmentsListV2(),
+        mitxonline.urls.programEnrollments.enrollmentsListV3(),
         [
-          mitxonline.factories.enrollment.programEnrollmentV2({
-            program: program,
+          mitxonline.factories.enrollment.programEnrollmentV3({
+            program: {
+              id: program.id,
+              title: program.title,
+              live: program.live,
+              program_type: program.program_type,
+              readable_id: program.readable_id,
+            },
           }),
         ],
       )
@@ -567,7 +563,7 @@ describe("EnrollmentDisplay", () => {
       setMockResponse.get(mitxonline.urls.enrollment.enrollmentsListV2(), [])
       // User is not enrolled in any programs
       setMockResponse.get(
-        mitxonline.urls.programEnrollments.enrollmentsListV2(),
+        mitxonline.urls.programEnrollments.enrollmentsListV3(),
         [],
       )
       setMockResponse.get(mitxonline.urls.programs.programDetail(888), program)
diff --git a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.tsx b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.tsx
index 97b61e84ec..80615d6342 100644
--- a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.tsx
+++ b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.tsx
@@ -27,7 +27,7 @@ import { programsQueries } from "api/mitxonline-hooks/programs"
 import {
   CourseRunEnrollmentRequestV2,
   V2ProgramRequirement,
-  V2UserProgramEnrollmentDetail,
+  V3UserProgramEnrollment,
 } from "@mitodl/mitxonline-api-axios/v2"
 import { contractQueries } from "api/mitxonline-hooks/contracts"
 import NotFoundPage from "@/app-pages/ErrorPage/NotFoundPage"
@@ -160,7 +160,7 @@ const sortEnrollments = (enrollments: CourseRunEnrollmentRequestV2[]) => {
 interface EnrollmentExpandCollapseProps {
   shownCourseRunEnrollments: CourseRunEnrollmentRequestV2[]
   hiddenCourseRunEnrollments: CourseRunEnrollmentRequestV2[]
-  programEnrollments?: V2UserProgramEnrollmentDetail[]
+  programEnrollments?: V3UserProgramEnrollment[]
   isLoading?: boolean
   onUpgradeError?: (error: string) => void
 }
@@ -185,7 +185,6 @@ const EnrollmentExpandCollapse: React.FC<EnrollmentExpandCollapseProps> = ({
         {shownCourseRunEnrollments.map((enrollment) => {
           return (
             <DashboardCardStyled
-              titleAction="marketing"
               key={getKey({
                 resourceType: ResourceType.Course,
                 id: enrollment.run.course.id,
@@ -204,7 +203,6 @@ const EnrollmentExpandCollapse: React.FC<EnrollmentExpandCollapseProps> = ({
         })}
         {programEnrollments?.map((program) => (
           <DashboardCardStyled
-            titleAction="marketing"
             key={getKey({
               resourceType: ResourceType.Program,
               id: program.program.id,
@@ -226,7 +224,6 @@ const EnrollmentExpandCollapse: React.FC<EnrollmentExpandCollapseProps> = ({
             <HiddenEnrollmentsList itemSpacing={"16px"}>
               {hiddenCourseRunEnrollments.map((enrollment) => (
                 <DashboardCardStyled
-                  titleAction="marketing"
                   key={getKey({
                     resourceType: ResourceType.Course,
                     id: enrollment.run.course.id,
@@ -449,7 +446,6 @@ const ProgramEnrollmentDisplay: React.FC<ProgramEnrollmentDisplayProps> = ({
             <StackedCardContainer>
               {section.courses.map((course) => (
                 <DashboardCardStyled
-                  titleAction="marketing"
                   key={getKey({
                     resourceType: ResourceType.Course,
                     id: course.id,
@@ -504,13 +500,11 @@ const AllEnrollmentsDisplay: React.FC = () => {
           closable={true}
           onClose={() => setUpgradeError(null)}
         >
-          <span>
-            {upgradeError}{" "}
-            <Link color="red" href={`mailto:${supportEmail}`}>
-              Contact Support
-            </Link>{" "}
-            for assistance.
-          </span>
+          {upgradeError}{" "}
+          <Link color="red" href={`mailto:${supportEmail}`}>
+            Contact Support
+          </Link>{" "}
+          for assistance.
         </AlertBanner>
       )}
       <EnrollmentExpandCollapse
diff --git a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/test-utils.ts b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/test-utils.ts
index b96bb0725f..8ca6c0da68 100644
--- a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/test-utils.ts
+++ b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/test-utils.ts
@@ -292,9 +292,8 @@ function setupOrgDashboardMocks(
   )
 
   // Empty defaults
-  setMockResponse.get(mitxonline.urls.programEnrollments.enrollmentsList(), [])
   setMockResponse.get(
-    mitxonline.urls.programEnrollments.enrollmentsListV2(),
+    mitxonline.urls.programEnrollments.enrollmentsListV3(),
     [],
   )
   setMockResponse.get(mitxonline.urls.contracts.contractsList(), contracts)
diff --git a/frontends/main/src/app-pages/DashboardPage/HomeContent.test.tsx b/frontends/main/src/app-pages/DashboardPage/HomeContent.test.tsx
index c944407d05..a66506fb4f 100644
--- a/frontends/main/src/app-pages/DashboardPage/HomeContent.test.tsx
+++ b/frontends/main/src/app-pages/DashboardPage/HomeContent.test.tsx
@@ -127,7 +127,7 @@ describe("HomeContent", () => {
     setMockResponse.get(urls.userLists.membershipList(), [])
     setMockResponse.get(urls.learningPaths.membershipList(), [])
     setMockResponse.get(
-      mitxonline.urls.programEnrollments.enrollmentsListV2(),
+      mitxonline.urls.programEnrollments.enrollmentsListV3(),
       [],
     )
     return { resources }
@@ -254,7 +254,7 @@ describe("HomeContent", () => {
       name: "Your MIT Learning Journey",
     })
 
-    expect(screen.queryByText("Enrollment Error")).not.toBeInTheDocument()
+    expect(screen.queryByText(/Enrollment Error/)).not.toBeInTheDocument()
   })
 
   test("Displays enrollment error alert when query param is present and then clears it", async () => {
@@ -275,7 +275,7 @@ describe("HomeContent", () => {
     })
 
     // Verify the alert was shown
-    expect(screen.getByText("Enrollment Error")).toBeInTheDocument()
+    expect(screen.getByText(/Enrollment Error/)).toBeInTheDocument()
     expect(
       screen.getByText(
         /The Enrollment Code is incorrect or no longer available/,
diff --git a/frontends/main/src/app-pages/DashboardPage/HomeContent.tsx b/frontends/main/src/app-pages/DashboardPage/HomeContent.tsx
index 8b4e022d08..9b0858be87 100644
--- a/frontends/main/src/app-pages/DashboardPage/HomeContent.tsx
+++ b/frontends/main/src/app-pages/DashboardPage/HomeContent.tsx
@@ -114,18 +114,16 @@ const HomeContent: React.FC = () => {
         </HomeHeaderRight>
       </HomeHeader>
       {showEnrollmentError && (
-        <AlertBanner severity="error" closable={true}>
-          <Typography variant="subtitle2" component="span">
-            Enrollment Error
-          </Typography>
-          <Typography variant="body2" component="span">
-            {" - "}
-            The Enrollment Code is incorrect or no longer available.{" "}
-            <Link color="red" href={`mailto:${supportEmail}`}>
-              Contact Support
-            </Link>{" "}
-            for assistance.
-          </Typography>
+        <AlertBanner
+          severity="error"
+          closable={true}
+          label="Enrollment Error - "
+        >
+          The Enrollment Code is incorrect or no longer available.{" "}
+          <Link color="red" href={`mailto:${supportEmail}`}>
+            Contact Support
+          </Link>{" "}
+          for assistance.
         </AlertBanner>
       )}
       <OrganizationCards />
diff --git a/frontends/main/src/app-pages/DashboardPage/OrganizationRedirect.test.tsx b/frontends/main/src/app-pages/DashboardPage/OrganizationRedirect.test.tsx
index cbea1946c1..69bb144611 100644
--- a/frontends/main/src/app-pages/DashboardPage/OrganizationRedirect.test.tsx
+++ b/frontends/main/src/app-pages/DashboardPage/OrganizationRedirect.test.tsx
@@ -20,7 +20,7 @@ describe("OrganizationRedirect", () => {
   beforeEach(() => {
     mockReplace.mockClear()
     localStorage.clear()
-    setMockResponse.get(urls.programEnrollments.enrollmentsList(), [])
+    setMockResponse.get(urls.programEnrollments.enrollmentsListV3(), [])
     setMockResponse.get(urls.contracts.contractsList(), [])
   })
 
diff --git a/frontends/main/src/app-pages/ProductPages/ProductSummary.test.tsx b/frontends/main/src/app-pages/ProductPages/ProductSummary.test.tsx
index 2145b86a50..6bc5146a95 100644
--- a/frontends/main/src/app-pages/ProductPages/ProductSummary.test.tsx
+++ b/frontends/main/src/app-pages/ProductPages/ProductSummary.test.tsx
@@ -1083,6 +1083,7 @@ describe("Course In Programs Row", () => {
       id: 1,
       readable_id: "program-1",
       title: "Test Program 1",
+      type: "program",
     }
     const run = makeRun()
     const course = makeCourse({
@@ -1108,16 +1109,19 @@ describe("Course In Programs Row", () => {
         id: 1,
         readable_id: "program-1",
         title: "Test Program 1",
+        type: "program",
       },
       {
         id: 2,
         readable_id: "program-2",
         title: "Test Program 2",
+        type: "program",
       },
       {
         id: 3,
         readable_id: "program-3",
         title: "Test Program 3",
+        type: "program",
       },
     ]
     const run = makeRun()
@@ -1154,6 +1158,7 @@ describe("Course In Programs Row", () => {
       id: 1,
       readable_id: "program-1",
       title: "Test Program 1",
+      type: "program",
     }
     const course = makeCourse({
       next_run_id: null,
diff --git a/frontends/main/src/app-pages/ProductPages/ProgramEnrollmentButton.test.tsx b/frontends/main/src/app-pages/ProductPages/ProgramEnrollmentButton.test.tsx
index 0ecc653871..25ac0b06bc 100644
--- a/frontends/main/src/app-pages/ProductPages/ProgramEnrollmentButton.test.tsx
+++ b/frontends/main/src/app-pages/ProductPages/ProgramEnrollmentButton.test.tsx
@@ -20,7 +20,7 @@ const mockedUseFeatureFlagEnabled = jest
   .mockImplementation(() => false)
 
 const makeProgram = mitxFactories.programs.program
-const makeProgramEnrollment = mitxFactories.enrollment.programEnrollmentV2
+const makeProgramEnrollment = mitxFactories.enrollment.programEnrollmentV3
 const makeUser = factories.user.user
 
 describe("ProgramEnrollmentButton", () => {
@@ -37,7 +37,7 @@ describe("ProgramEnrollmentButton", () => {
     const userResponse = Promise.withResolvers()
 
     setMockResponse.get(
-      mitxUrls.programEnrollments.enrollmentsListV2(),
+      mitxUrls.programEnrollments.enrollmentsListV3(),
       enrollmentResponse.promise,
     )
     setMockResponse.get(urls.userMe.get(), userResponse.promise)
@@ -68,7 +68,7 @@ describe("ProgramEnrollmentButton", () => {
     const user = makeUser({ is_authenticated: true })
 
     setMockResponse.get(
-      mitxUrls.programEnrollments.enrollmentsListV2(),
+      mitxUrls.programEnrollments.enrollmentsListV3(),
       enrollments,
     )
     setMockResponse.get(urls.userMe.get(), user)
@@ -92,7 +92,7 @@ describe("ProgramEnrollmentButton", () => {
     const user = makeUser({ is_authenticated: true })
 
     setMockResponse.get(
-      mitxUrls.programEnrollments.enrollmentsListV2(),
+      mitxUrls.programEnrollments.enrollmentsListV3(),
       enrollments,
     )
     setMockResponse.get(urls.userMe.get(), user)
@@ -112,7 +112,7 @@ describe("ProgramEnrollmentButton", () => {
     ]
 
     setMockResponse.get(
-      mitxUrls.programEnrollments.enrollmentsListV2(),
+      mitxUrls.programEnrollments.enrollmentsListV3(),
       enrollments,
     )
     setMockResponse.get(urls.userMe.get(), makeUser({ is_authenticated: true }))
@@ -132,7 +132,7 @@ describe("ProgramEnrollmentButton", () => {
   test("Shows signup popover for anonymous users", async () => {
     const program = makeProgram()
 
-    setMockResponse.get(mitxUrls.programEnrollments.enrollmentsListV2(), [], {
+    setMockResponse.get(mitxUrls.programEnrollments.enrollmentsListV3(), [], {
       code: 403,
     })
     setMockResponse.get(
diff --git a/frontends/main/src/app-pages/ProductPages/ProgramPage.test.tsx b/frontends/main/src/app-pages/ProductPages/ProgramPage.test.tsx
index 78735a86a2..feb902d161 100644
--- a/frontends/main/src/app-pages/ProductPages/ProgramPage.test.tsx
+++ b/frontends/main/src/app-pages/ProductPages/ProgramPage.test.tsx
@@ -126,7 +126,7 @@ const setupApis = ({
     learnFactories.user.user({ is_authenticated: false }),
   )
 
-  setMockResponse.get(urls.programEnrollments.enrollmentsListV2(), [])
+  setMockResponse.get(urls.programEnrollments.enrollmentsListV3(), [])
 
   return { courses }
 }
diff --git a/frontends/main/src/app-pages/ProductPages/ProgramPage.tsx b/frontends/main/src/app-pages/ProductPages/ProgramPage.tsx
index faad5eb3e3..c658dc2e31 100644
--- a/frontends/main/src/app-pages/ProductPages/ProgramPage.tsx
+++ b/frontends/main/src/app-pages/ProductPages/ProgramPage.tsx
@@ -12,7 +12,8 @@ import { FeatureFlags } from "@/common/feature_flags"
 import { notFound } from "next/navigation"
 import { HeadingIds, parseReqTree } from "./util"
 import InstructorsSection from "./InstructorsSection"
-import RawHTML, { UnstyledRawHTML } from "./RawHTML"
+import RawHTML from "./RawHTML"
+import UnstyledRawHTML from "@/components/UnstyledRawHTML/UnstyledRawHTML"
 import AboutSection from "./AboutSection"
 import ProductPageTemplate, {
   HeadingData,
diff --git a/frontends/main/src/app-pages/ProductPages/RawHTML.tsx b/frontends/main/src/app-pages/ProductPages/RawHTML.tsx
index 21836ba7ac..57a8aeb6fb 100644
--- a/frontends/main/src/app-pages/ProductPages/RawHTML.tsx
+++ b/frontends/main/src/app-pages/ProductPages/RawHTML.tsx
@@ -1,21 +1,5 @@
-import DOMPurify from "isomorphic-dompurify"
 import { styled } from "@mitodl/smoot-design"
-import React, { memo } from "react"
-import classnames from "classnames"
-
-const UnstyledRawHTML: React.FC<{
-  html: string
-  className?: string
-  Component?: React.ElementType
-}> = memo(({ html, className, Component = "div" }) => {
-  return (
-    <Component
-      className={classnames("raw-html", className)}
-      data-testid="raw"
-      dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(html) }}
-    />
-  )
-})
+import UnstyledRawHTML from "@/components/UnstyledRawHTML/UnstyledRawHTML"
 
 const RawHTML = styled(UnstyledRawHTML)(({ theme }) => ({
   "*:first-child": {
@@ -54,4 +38,3 @@ const RawHTML = styled(UnstyledRawHTML)(({ theme }) => ({
 }))
 
 export default RawHTML
-export { UnstyledRawHTML }
diff --git a/frontends/main/src/app/articles/[slugOrId]/draft/page.tsx b/frontends/main/src/app/articles/[slugOrId]/draft/page.tsx
new file mode 100644
index 0000000000..9967751c83
--- /dev/null
+++ b/frontends/main/src/app/articles/[slugOrId]/draft/page.tsx
@@ -0,0 +1,27 @@
+import React from "react"
+import { ArticleDetailPage } from "@/app-pages/Articles/ArticleDetailPage"
+import { standardizeMetadata } from "@/common/metadata"
+import RestrictedRoute from "@/components/RestrictedRoute/RestrictedRoute"
+import { Permission } from "api/hooks/user"
+
+export const generateMetadata = async () => {
+  return standardizeMetadata({
+    title: "Draft Article",
+  })
+}
+
+const Page: React.FC<PageProps<"/articles/[slugOrId]/draft">> = async (
+  props,
+) => {
+  const { slugOrId } = await props.params
+
+  // No prefetching for draft articles - the client-side component
+  // will fetch with user authentication
+
+  return (
+    <RestrictedRoute requires={Permission.ArticleEditor}>
+      <ArticleDetailPage articleId={slugOrId} learningResourceIds={[]} />
+    </RestrictedRoute>
+  )
+}
+export default Page
diff --git a/frontends/main/src/app/articles/draft/page.tsx b/frontends/main/src/app/articles/draft/page.tsx
index 1726ea95f8..a0cd289b6e 100644
--- a/frontends/main/src/app/articles/draft/page.tsx
+++ b/frontends/main/src/app/articles/draft/page.tsx
@@ -1,7 +1,7 @@
 import React from "react"
 import { Metadata } from "next"
 import { standardizeMetadata } from "@/common/metadata"
-import { ArticleDraftPage } from "@/app-pages/Articles/ArticleDraftPage"
+import { ArticleDraftPage } from "@/app-pages/Articles/ArticleDraftListingPage"
 
 export const metadata: Metadata = standardizeMetadata({
   title: "Articles Draft",
diff --git a/frontends/main/src/app/certificate/[certificateType]/[uuid]/page.tsx b/frontends/main/src/app/certificate/[certificateType]/[uuid]/page.tsx
index b547edc61b..21e4f7c9ad 100644
--- a/frontends/main/src/app/certificate/[certificateType]/[uuid]/page.tsx
+++ b/frontends/main/src/app/certificate/[certificateType]/[uuid]/page.tsx
@@ -8,7 +8,7 @@ import { notFound } from "next/navigation"
 import { safeGenerateMetadata, standardizeMetadata } from "@/common/metadata"
 import { getQueryClient } from "@/app/getQueryClient"
 
-const { NEXT_PUBLIC_ORIGIN } = process.env
+const NEXT_PUBLIC_ORIGIN = process.env.NEXT_PUBLIC_ORIGIN
 
 enum CertificateType {
   Course = "course",
diff --git a/frontends/main/src/app/dashboard/organization/[orgSlug]/page.test.tsx b/frontends/main/src/app/dashboard/organization/[orgSlug]/page.test.tsx
index ebb8428454..26c991d1ae 100644
--- a/frontends/main/src/app/dashboard/organization/[orgSlug]/page.test.tsx
+++ b/frontends/main/src/app/dashboard/organization/[orgSlug]/page.test.tsx
@@ -21,7 +21,6 @@ useRouter.mockReturnValue({
 describe("Organization Page", () => {
   beforeEach(() => {
     mockReplace.mockClear()
-    setMockResponse.get(urls.programEnrollments.enrollmentsList(), [])
     setMockResponse.get(urls.contracts.contractsList(), [])
   })
 
diff --git a/frontends/main/src/app/layout.tsx b/frontends/main/src/app/layout.tsx
index 9db5de12f1..276e786951 100644
--- a/frontends/main/src/app/layout.tsx
+++ b/frontends/main/src/app/layout.tsx
@@ -8,7 +8,7 @@ import Script from "next/script"
 
 import "./GlobalStyles"
 
-const { NEXT_PUBLIC_ORIGIN } = process.env
+const NEXT_PUBLIC_ORIGIN = process.env.NEXT_PUBLIC_ORIGIN
 
 /**
  * As part of the root layout, this metadata object is site-wide defaults
diff --git a/frontends/main/src/common/urls.ts b/frontends/main/src/common/urls.ts
index 4dabfcfc2b..1ba10fed2c 100644
--- a/frontends/main/src/common/urls.ts
+++ b/frontends/main/src/common/urls.ts
@@ -25,10 +25,13 @@ export const programLetterView = (id: string) =>
   generatePath(PROGRAMLETTER_VIEW, { id: String(id) })
 export const ARTICLES_LISTING = "/articles/"
 export const ARTICLES_VIEW = "/articles/[id]"
+export const ARTICLES_DRAFT_VIEW = "/articles/[id]/draft"
 export const ARTICLES_EDIT = "/articles/[id]/edit"
 export const ARTICLES_CREATE = "/articles/new"
 export const articlesView = (id: string) =>
   generatePath(ARTICLES_VIEW, { id: String(id) })
+export const articlesDraftView = (id: string) =>
+  generatePath(ARTICLES_DRAFT_VIEW, { id: String(id) })
 export const articlesEditView = (id: number) =>
   generatePath(ARTICLES_EDIT, { id: String(id) })
 
diff --git a/frontends/main/src/components/UnstyledRawHTML/UnstyledRawHTML.tsx b/frontends/main/src/components/UnstyledRawHTML/UnstyledRawHTML.tsx
new file mode 100644
index 0000000000..db33e6c13c
--- /dev/null
+++ b/frontends/main/src/components/UnstyledRawHTML/UnstyledRawHTML.tsx
@@ -0,0 +1,43 @@
+import DOMPurify from "isomorphic-dompurify"
+import type { Config } from "isomorphic-dompurify"
+import React, { memo } from "react"
+import classnames from "classnames"
+
+type UnstyledRawHTMLProps = {
+  html: string
+  className?: string
+  Component?: React.ElementType
+}
+
+const SANITIZE_CONFIG: Config = {
+  ADD_TAGS: ["iframe"],
+  ADD_ATTR: [
+    "allow",
+    "allowfullscreen",
+    "frameborder",
+    "scrolling",
+    "width",
+    "height",
+    "title",
+    "referrerpolicy",
+  ],
+  ADD_URI_SAFE_ATTR: ["src"],
+  ALLOWED_URI_REGEXP: /^(?:(?:https):)|^(?:data:image\/)/i,
+}
+
+const UnstyledRawHTML: React.FC<UnstyledRawHTMLProps> = memo(
+  ({ html, className, Component = "div" }) => {
+    return (
+      <Component
+        className={classnames("raw-html", className)}
+        data-testid="raw"
+        dangerouslySetInnerHTML={{
+          __html: DOMPurify.sanitize(html, SANITIZE_CONFIG),
+        }}
+      />
+    )
+  },
+)
+
+export default UnstyledRawHTML
+export type { UnstyledRawHTMLProps }
diff --git a/frontends/main/src/page-components/TiptapEditor/ArticleEditor.happydom.test.tsx b/frontends/main/src/page-components/TiptapEditor/ArticleEditor.happydom.test.tsx
index 0afed0db81..f958d7132d 100644
--- a/frontends/main/src/page-components/TiptapEditor/ArticleEditor.happydom.test.tsx
+++ b/frontends/main/src/page-components/TiptapEditor/ArticleEditor.happydom.test.tsx
@@ -108,6 +108,7 @@ describe("ArticleEditor - Content Editing and Saving", () => {
             },
             {
               type: "byline",
+              attrs: { authorName: null },
             },
             {
               type: "paragraph",
@@ -141,6 +142,7 @@ describe("ArticleEditor - Content Editing and Saving", () => {
           content: updatedArticle.content,
           is_published: true,
           title: updatedArticle.title,
+          author_name: "",
         }),
       )
 
@@ -218,6 +220,7 @@ describe("ArticleEditor - Content Editing and Saving", () => {
             },
             {
               type: "byline",
+              attrs: { authorName: null },
             },
             {
               type: "paragraph",
@@ -245,6 +248,7 @@ describe("ArticleEditor - Content Editing and Saving", () => {
           content: updatedArticle.content,
           is_published: true,
           title: updatedArticle.title,
+          author_name: "",
         }),
       )
     })
@@ -424,6 +428,7 @@ describe("ArticleEditor - Content Editing and Saving", () => {
         urls.articles.details(article.id),
         expect.objectContaining({
           is_published: false,
+          author_name: "",
         }),
       )
     })
@@ -541,6 +546,7 @@ describe("ArticleEditor - Content Editing and Saving", () => {
             urls.articles.list(),
             expect.objectContaining({
               title: "My Article",
+              author_name: "",
               content: {
                 type: "doc",
                 content: [
@@ -560,7 +566,7 @@ describe("ArticleEditor - Content Editing and Saving", () => {
                       },
                     ],
                   },
-                  { type: "byline" },
+                  { type: "byline", attrs: { authorName: null } },
                   {
                     type: "paragraph",
                     attrs: {
diff --git a/frontends/main/src/page-components/TiptapEditor/ArticleEditor.tsx b/frontends/main/src/page-components/TiptapEditor/ArticleEditor.tsx
index 02a103acdb..6791a998fa 100644
--- a/frontends/main/src/page-components/TiptapEditor/ArticleEditor.tsx
+++ b/frontends/main/src/page-components/TiptapEditor/ArticleEditor.tsx
@@ -109,8 +109,15 @@ const ArticleEditor = ({ onSave, readOnly, article }: ArticleEditorProps) => {
   )
   const [touched, setTouched] = useState(false)
 
+  // Extract author_name from the byline node
+  const extractAuthorName = (content: JSONContent): string | "" => {
+    const bylineNode = content.content?.find((node) => node.type === "byline")
+    return bylineNode?.attrs?.authorName || ""
+  }
+
   const handleSave = (publish: boolean) => {
     if (!title) return
+    const authorName = extractAuthorName(content)
     if (article) {
       updateArticle(
         {
@@ -118,6 +125,7 @@ const ArticleEditor = ({ onSave, readOnly, article }: ArticleEditorProps) => {
           title: title.trim(),
           content,
           is_published: publish,
+          author_name: authorName,
         },
         {
           onSuccess: onSave,
@@ -129,6 +137,7 @@ const ArticleEditor = ({ onSave, readOnly, article }: ArticleEditorProps) => {
           title: title.trim(),
           content,
           is_published: publish,
+          author_name: authorName,
         },
         {
           onSuccess: onSave,
diff --git a/frontends/main/src/page-components/TiptapEditor/ArticleViewer.test.tsx b/frontends/main/src/page-components/TiptapEditor/ArticleViewer.test.tsx
index 6040152056..8ee3150d3b 100644
--- a/frontends/main/src/page-components/TiptapEditor/ArticleViewer.test.tsx
+++ b/frontends/main/src/page-components/TiptapEditor/ArticleViewer.test.tsx
@@ -77,11 +77,15 @@ describe("ArticleViewer", () => {
       is_article_editor: true,
     })
     setMockResponse.get(urls.userMe.get(), user)
-    const article = factories.articles.article({ user })
+    const authorName = `${user.first_name} ${user.last_name}`
+    const article = factories.articles.article({
+      user,
+      author_name: authorName,
+    })
 
     renderWithProviders(<ArticleEditor article={article} readOnly />)
 
-    await screen.findByText(`By ${user.first_name} ${user.last_name}`)
+    await screen.findByText(`By ${authorName}`)
   })
 
   test("renders headings levels 1-6", async () => {
diff --git a/frontends/main/src/page-components/TiptapEditor/extensions/node/ArticleByLineInfoBar/ArticleByLineInfoBar.tsx b/frontends/main/src/page-components/TiptapEditor/extensions/node/ArticleByLineInfoBar/ArticleByLineInfoBar.tsx
index b1b84dcd9e..d7ef06f890 100644
--- a/frontends/main/src/page-components/TiptapEditor/extensions/node/ArticleByLineInfoBar/ArticleByLineInfoBar.tsx
+++ b/frontends/main/src/page-components/TiptapEditor/extensions/node/ArticleByLineInfoBar/ArticleByLineInfoBar.tsx
@@ -1,17 +1,16 @@
-import React, { useState, useRef } from "react"
+import React, { useState, useRef, useEffect } from "react"
 import { NodeViewWrapper } from "@tiptap/react"
 import type { ReactNodeViewProps } from "@tiptap/react"
 import styled from "@emotion/styled"
-import { Container, Avatar } from "ol-components"
+import { Container } from "ol-components"
 import { RiShareFill } from "@remixicon/react"
-import { ActionButton } from "@mitodl/smoot-design"
+import { ActionButton, TextField } from "@mitodl/smoot-design"
 import type { JSONContent } from "@tiptap/core"
-import { useUserMe } from "api/hooks/user"
 import { useArticle } from "../../../ArticleContext"
 import { calculateReadTime } from "../../utils"
 import SharePopover from "@/components/SharePopover/SharePopover"
 
-const { NEXT_PUBLIC_ORIGIN } = process.env
+const NEXT_PUBLIC_ORIGIN = process.env.NEXT_PUBLIC_ORIGIN
 
 const StyledWrapper = styled.div(({ theme }) => ({
   width: "100vw",
@@ -57,23 +56,49 @@ const InfoText = styled.span(({ theme }) => ({
   color: theme.custom.colors.silverGrayDark,
 }))
 
-interface Author {
-  first_name?: string | null
-  last_name?: string | null
-}
+const AuthorInput = styled(TextField)(({ theme }) => ({
+  "& .MuiInputBase-root": {
+    ...theme.typography.body2,
+    color: theme.custom.colors.black,
+    padding: "2px 8px",
+    width: "100%",
+    border: "none",
+    outline: "none",
+    alignItems: "start",
+
+    "&.Mui-focused": {
+      outline: "none",
+      "& .MuiOutlinedInput-notchedOutline": {
+        border: "none",
+      },
+    },
+  },
+  "& .MuiInputBase-input": {
+    padding: 0,
+  },
+  "& .MuiOutlinedInput-notchedOutline": {
+    border: "none",
+  },
+  "&:hover .MuiOutlinedInput-notchedOutline": {
+    border: "none",
+  },
+  width: "300px",
+}))
 
 interface ArticleByLineInfoBarContentProps {
-  author: Author | null
   publishedDate: string | null
   content: JSONContent | null | undefined
   isEditable?: boolean
+  authorName?: string | null
+  onAuthorNameChange?: (name: string) => void
 }
 
 export const ArticleByLineInfoBarContent = ({
-  author,
   publishedDate,
   content,
   isEditable = false,
+  authorName,
+  onAuthorNameChange,
 }: ArticleByLineInfoBarContentProps) => {
   const [shareOpen, setShareOpen] = useState(false)
   const shareButtonRef = useRef<HTMLDivElement>(null)
@@ -82,6 +107,9 @@ export const ArticleByLineInfoBarContent = ({
 
   const readTime = calculateReadTime(content)
 
+  // Determine display name: use authorName if provided, otherwise fall back to author's full name
+  const displayAuthorName = authorName || ""
+
   return (
     <StyledWrapper>
       <SharePopover
@@ -91,16 +119,21 @@ export const ArticleByLineInfoBarContent = ({
         onClose={() => setShareOpen(false)}
         pageUrl={`${NEXT_PUBLIC_ORIGIN}/articles/${article?.slug}`}
       />
-      <InnerContainer noAuthor={!author}>
-        {author && (
+      <InnerContainer noAuthor={!displayAuthorName && !isEditable}>
+        {(displayAuthorName || isEditable) && (
           <InfoContainer>
-            <Avatar>
-              {author.first_name?.charAt(0) || ""}
-              {author.last_name?.charAt(0) || ""}
-            </Avatar>
-            <NameText>
-              By {author.first_name} {author.last_name}
-            </NameText>
+            {isEditable ? (
+              <AuthorInput
+                name="authorName"
+                label=""
+                size="small"
+                placeholder="Add author name(s)"
+                value={authorName || ""}
+                onChange={(e) => onAuthorNameChange?.(e.target.value)}
+              />
+            ) : (
+              <NameText>By {displayAuthorName}</NameText>
+            )}
             {readTime ? <InfoText>{readTime} min read</InfoText> : null}
             {readTime && publishedDate ? <InfoText>-</InfoText> : null}
             <InfoText>
@@ -132,24 +165,47 @@ export const ArticleByLineInfoBarContent = ({
   )
 }
 
-const ArticleByLineInfoBar = ({ editor }: ReactNodeViewProps) => {
+const ArticleByLineInfoBar = ({
+  editor,
+  node,
+  updateAttributes,
+}: ReactNodeViewProps) => {
   const article = useArticle()
-  const { data: user } = useUserMe()
-
-  const author =
-    (editor?.isEditable && !article?.user ? user : article?.user) ?? null
 
   const publishedDate = article?.is_published ? article?.created_on : null
 
   const content = editor?.isEditable ? editor?.getJSON() : article?.content
 
+  // Initialize the node attribute with the article's author_name on mount
+  useEffect(() => {
+    if (
+      editor?.isEditable &&
+      article?.author_name &&
+      node.attrs.authorName === null
+    ) {
+      updateAttributes({ authorName: article.author_name })
+    }
+  }, [
+    article?.author_name,
+    editor?.isEditable,
+    node.attrs.authorName,
+    updateAttributes,
+  ])
+
+  const authorName = node.attrs.authorName ?? null
+
+  const handleAuthorNameChange = (name: string) => {
+    updateAttributes({ authorName: name })
+  }
+
   return (
     <NodeViewWrapper>
       <ArticleByLineInfoBarContent
-        author={author}
         publishedDate={publishedDate}
         content={content}
         isEditable={editor?.isEditable}
+        authorName={authorName}
+        onAuthorNameChange={handleAuthorNameChange}
       />
     </NodeViewWrapper>
   )
diff --git a/frontends/main/src/page-components/TiptapEditor/extensions/node/ArticleByLineInfoBar/ArticleByLineInfoBarNode.ts b/frontends/main/src/page-components/TiptapEditor/extensions/node/ArticleByLineInfoBar/ArticleByLineInfoBarNode.ts
index 746126091a..f18ea019b7 100644
--- a/frontends/main/src/page-components/TiptapEditor/extensions/node/ArticleByLineInfoBar/ArticleByLineInfoBarNode.ts
+++ b/frontends/main/src/page-components/TiptapEditor/extensions/node/ArticleByLineInfoBar/ArticleByLineInfoBarNode.ts
@@ -7,6 +7,23 @@ export const ArticleByLineInfoBarNode = Node.create({
   atom: true,
   selectable: false,
 
+  addAttributes() {
+    return {
+      authorName: {
+        default: null,
+        parseHTML: (element) => element.getAttribute("data-author-name"),
+        renderHTML: (attributes) => {
+          if (!attributes.authorName) {
+            return {}
+          }
+          return {
+            "data-author-name": attributes.authorName,
+          }
+        },
+      },
+    }
+  },
+
   parseHTML() {
     return [{ tag: "byline" }]
   },
diff --git a/frontends/main/src/page-components/TiptapEditor/extensions/node/ArticleByLineInfoBar/ArticleByLineInfoBarViewer.tsx b/frontends/main/src/page-components/TiptapEditor/extensions/node/ArticleByLineInfoBar/ArticleByLineInfoBarViewer.tsx
index 8c145d35ff..6643d4fd7d 100644
--- a/frontends/main/src/page-components/TiptapEditor/extensions/node/ArticleByLineInfoBar/ArticleByLineInfoBarViewer.tsx
+++ b/frontends/main/src/page-components/TiptapEditor/extensions/node/ArticleByLineInfoBar/ArticleByLineInfoBarViewer.tsx
@@ -5,16 +5,16 @@ import { ArticleByLineInfoBarContent } from "./ArticleByLineInfoBar"
 const ArticleByLineInfoBarViewer = () => {
   const article = useArticle()
 
-  const author = article?.user ?? null
   const publishedDate = article?.is_published ? article?.created_on : null
   const content = article?.content
+  const authorName = article?.author_name ?? null
 
   return (
     <ArticleByLineInfoBarContent
-      author={author}
       publishedDate={publishedDate}
       content={content}
       isEditable={false}
+      authorName={authorName}
     />
   )
 }
diff --git a/frontends/main/src/page-components/TiptapEditor/useArticleSchema.ts b/frontends/main/src/page-components/TiptapEditor/useArticleSchema.ts
index 7b67ef220f..460f702c70 100644
--- a/frontends/main/src/page-components/TiptapEditor/useArticleSchema.ts
+++ b/frontends/main/src/page-components/TiptapEditor/useArticleSchema.ts
@@ -65,6 +65,7 @@ export const newArticleDocument = {
     },
     {
       type: "byline",
+      attrs: { authorName: null },
     },
     { type: "paragraph", content: [] },
   ],
diff --git a/frontends/ol-components/package.json b/frontends/ol-components/package.json
index f8685406b3..5e2f625c93 100644
--- a/frontends/ol-components/package.json
+++ b/frontends/ol-components/package.json
@@ -67,7 +67,7 @@
     "typescript": "^5.5.4"
   },
   "peerDependencies": {
-    "@mitodl/smoot-design": "^6.23.0",
+    "@mitodl/smoot-design": "^6.24.0",
     "next": "^16.1.6"
   }
 }
diff --git a/learning_resources/conftest.py b/learning_resources/conftest.py
index 45f035a319..df08e2d8b3 100644
--- a/learning_resources/conftest.py
+++ b/learning_resources/conftest.py
@@ -25,6 +25,13 @@
 OCW_TEST_JSON_PATH = f"./test_json/{OCW_TEST_PREFIX[:-1]}"
 
 
+@pytest.fixture(autouse=True)
+def content_file_settings(settings):
+    """Set COURSE_ARCHIVE_BUCKET_NAME for tests"""
+    settings.COURSE_ARCHIVE_BUCKET_NAME = "testbucket2"
+    return settings
+
+
 @pytest.fixture
 def podcast_platform():
     """Return a  podcast platform"""
diff --git a/learning_resources/etl/edx_shared.py b/learning_resources/etl/edx_shared.py
index 0d1a0a674d..cb8ebb5370 100644
--- a/learning_resources/etl/edx_shared.py
+++ b/learning_resources/etl/edx_shared.py
@@ -6,7 +6,8 @@
 from tempfile import TemporaryDirectory
 
 from django.conf import settings
-from django.db.models import Q
+from django.core.cache import caches
+from django.db.models import Prefetch, Q
 
 from learning_resources.etl.constants import ETLSource
 from learning_resources.etl.loaders import load_content_files
@@ -20,6 +21,94 @@
 
 log = logging.getLogger(__name__)
 
+ETL_CACHE_TIMEOUT = 300
+ARCHIVE_KEYS_CACHE_TIMEOUT = 300
+
+
+def normalize_run_id(etl_source: str, run_id: str) -> str:
+    """
+    Normalize a run_id for in-memory matching.
+
+    Args:
+        etl_source(str): The ETL source, which determines the normalization rules
+        run_id(str): The run_id to normalize
+
+    Returns:
+        str: The normalized run_id
+    """
+    if etl_source == ETLSource.mit_edx.name:
+        normalized = run_id.replace("-", ".").replace("+", ".").lower()
+        return normalized.removeprefix("course.v1:")
+    elif etl_source == ETLSource.oll.name:
+        normalized = (
+            run_id.replace("-", ".").replace("_", ".").replace("+", ".").lower()
+        )
+        return normalized.removeprefix("course.v1:")
+    return run_id
+
+
+def extract_run_id_from_key(etl_source: str, key: str) -> str:
+    """
+    Extract and normalize a run_id from an S3 archive key path.
+
+    Args:
+        etl_source(str): The ETL source, which determines the extraction rules
+        key(str): The S3 key path of the course archive
+
+    Returns:
+        str: The extracted and normalized run_id
+    """
+    if etl_source == ETLSource.oll.name:
+        filename_only = key.split("/")[-1]
+        raw = filename_only.split(".tar.gz")[0]
+        raw = raw.replace("_OLL", "")
+    else:
+        raw = Path(key).parent.name.split("/")[-1]
+    return normalize_run_id(etl_source, raw)
+
+
+def build_run_lookup(
+    etl_source: str, ids: list[int]
+) -> dict[str, list[LearningResourceRun]]:
+    """
+    Batch-fetch all candidate LearningResourceRun objects and build a
+    normalized run_id lookup dictionary.
+
+    Args:
+        etl_source(str): The ETL source
+        ids(list of int): List of LearningResource IDs to filter by.
+            If empty/falsy, all published/test_mode runs for the source
+            are included.
+
+    Returns:
+        dict: Mapping of normalized run_id -> list of LearningResourceRun
+    """
+    runs = (
+        LearningResourceRun.objects.filter(
+            learning_resource__etl_source=etl_source,
+        )
+        .filter(Q(published=True) | Q(learning_resource__test_mode=True))
+        .filter(
+            Q(learning_resource__published=True) | Q(learning_resource__test_mode=True)
+        )
+        .select_related("learning_resource")
+        .prefetch_related(
+            Prefetch(
+                "learning_resource__runs",
+                queryset=LearningResourceRun.objects.filter(published=True),
+                to_attr="_published_runs",
+            )
+        )
+    )
+    if ids:
+        runs = runs.filter(learning_resource_id__in=ids)
+
+    lookup: dict[str, list[LearningResourceRun]] = {}
+    for run in runs:
+        normalized = normalize_run_id(etl_source, run.run_id)
+        lookup.setdefault(normalized, []).append(run)
+    return lookup
+
 
 def process_course_archive(
     bucket, key: str, run: LearningResourceRun, *, overwrite: bool = False
@@ -61,7 +150,11 @@ def process_course_archive(
 
 def get_most_recent_course_archives(etl_source: str) -> list[str]:
     """
-    Retrieve a list of S3 keys for the most recent edx course archives
+    Retrieve a list of S3 keys for the most recent edx course archives.
+
+    Results are cached for ARCHIVE_KEYS_CACHE_TIMEOUT seconds so that
+    multiple tasks for the same etl_source don't each perform a full
+    S3 bucket listing.
 
     Args:
         etl_source(str): The edx ETL source
@@ -69,6 +162,13 @@ def get_most_recent_course_archives(etl_source: str) -> list[str]:
     Returns:
         list of str: edx archive S3 keys
     """
+    redis_cache = caches["redis"]
+    cache_key = f"archive_keys_{etl_source}"
+    cached = redis_cache.get(cache_key)
+    if cached is not None:
+        log.info("Using cached archive keys for %s", etl_source)
+        return cached
+
     bucket = get_bucket_by_name(settings.COURSE_ARCHIVE_BUCKET_NAME)
     if not bucket:
         log.warning("No S3 bucket for platform %s", etl_source)
@@ -92,7 +192,9 @@ def get_most_recent_course_archives(etl_source: str) -> list[str]:
                     "key": archive.key,
                     "last_modified": archive.last_modified,
                 }
-        return [entry["key"] for entry in latest_archives.values()]
+        result = [entry["key"] for entry in latest_archives.values()]
+        redis_cache.set(cache_key, result, timeout=ARCHIVE_KEYS_CACHE_TIMEOUT)
+        return result  # noqa: TRY300
     except (StopIteration, IndexError):
         log.warning(
             "No %s exported courses found in S3 bucket %s", etl_source, bucket.name
@@ -100,6 +202,35 @@ def get_most_recent_course_archives(etl_source: str) -> list[str]:
         return []
 
 
+def trigger_resource_etl(etl_source):
+    """
+    Trigger an ETL process for all resources of a given source
+    """
+    from learning_resources import tasks
+
+    redis_cache = caches["redis"]
+    cache_key = f"etl_triggered_{etl_source}"
+    if not redis_cache.add(cache_key, True, timeout=ETL_CACHE_TIMEOUT):  # noqa: FBT003
+        log.info("ETL already triggered recently for %s, skipping", etl_source)
+        return
+    try:
+        if etl_source == ETLSource.mit_edx.name:
+            tasks.get_mit_edx_data.apply_async()
+        elif etl_source == ETLSource.mitxonline.name:
+            tasks.get_mitxonline_data.apply_async()
+        elif etl_source == ETLSource.xpro.name:
+            tasks.get_xpro_data.apply_async()
+        else:
+            log.warning(
+                "No ETL pipeline for %s, cannot sync archive",
+                etl_source,
+            )
+            redis_cache.delete(cache_key)
+    except Exception:
+        redis_cache.delete(cache_key)
+        log.exception("Failed to trigger ETL for %s", etl_source)
+
+
 def sync_edx_archive(
     etl_source, s3_key: str, *, course_id: str | None = None, overwrite: bool = False
 ):
@@ -111,25 +242,19 @@ def sync_edx_archive(
         s3_key(str): S3 path of the content archive
         overwrite(bool): Whether to overwrite existing content files
     """
+    run = run_for_edx_archive(etl_source, s3_key, course_id=course_id)
+    if not run:
+        trigger_resource_etl(etl_source)
+        return
+    course = run.learning_resource
+    if course.published and not course.test_mode and course.best_run != run:
+        # This is not the best run for the published course, so skip it
+        log.warning(
+            "%s not the best run for %s, skipping", run.run_id, course.readable_id
+        )
+        return
     bucket = get_bucket_by_name(settings.COURSE_ARCHIVE_BUCKET_NAME)
-    with TemporaryDirectory() as export_tempdir:
-        archive_filename = s3_key.split("/")[-1]
-        archive_path = Path(export_tempdir, archive_filename)
-        bucket.download_file(s3_key, archive_path)
-        run = run_for_edx_archive(etl_source, s3_key, course_id=course_id)
-        if not run:
-            log.warning(
-                "No published/test_mode %s run found for archive %s", etl_source, s3_key
-            )
-            return
-        course = run.learning_resource
-        if course.published and not course.test_mode and course.best_run != run:
-            # This is not the best run for the published course, so skip it
-            log.warning(
-                "%s not the best run for %s, skipping", run.run_id, course.readable_id
-            )
-            return
-        process_course_archive(bucket, s3_key, run, overwrite=overwrite)
+    process_course_archive(bucket, s3_key, run, overwrite=overwrite)
 
 
 def run_for_edx_archive(
@@ -146,7 +271,7 @@ def run_for_edx_archive(
     Returns:
         LearningResourceRun or None: The matching run, or None if not found
     """
-    potential_run_id = Path(archive_filename).parent.name.split("/")[-1]
+    normalized_run_id = extract_run_id_from_key(etl_source, archive_filename)
     runs = (
         LearningResourceRun.objects.filter(
             learning_resource__etl_source=etl_source,
@@ -158,27 +283,13 @@ def run_for_edx_archive(
     )
     if course_id:
         runs = runs.filter(learning_resource__readable_id=course_id)
-    if etl_source == ETLSource.mit_edx.name:
-        # Additional processing of run ids and tarfile names,
-        # because edx data is structured differently
-        potential_run_ids = rf"{potential_run_id.replace('-', '.').replace('+', '.')}"
-        runs = runs.filter(run_id__iregex=potential_run_ids)
-    elif etl_source == ETLSource.oll.name:
-        # Additional processing of run ids and tarfile names,
-        # because oll data is structured differently
-        filename_only = archive_filename.split("/")[-1]
-        potential_run_id = filename_only.split(".tar.gz")[0]
-        run_id = (
-            rf"{potential_run_id.replace('_OLL', '')}".replace("-", ".")
-            .replace("_", ".")
-            .replace("+", ".")
-        )
-        runs = runs.filter(run_id__iregex=run_id)
+    if etl_source in (ETLSource.mit_edx.name, ETLSource.oll.name):
+        runs = runs.filter(run_id__iregex=normalized_run_id)
     else:
-        runs = runs.filter(run_id=potential_run_id)
+        runs = runs.filter(run_id=normalized_run_id)
     # There should be only 1 matching run per course archive, warn if not
     if runs.count() > 1:
-        log.warning("There are %d runs for %s", runs.count(), potential_run_id)
+        log.warning("There are %d runs for %s", runs.count(), normalized_run_id)
     return runs.first()
 
 
@@ -198,19 +309,24 @@ def sync_edx_course_files(
         keys(list[str]): list of S3 archive keys to search through
     """
     bucket = get_bucket_by_name(settings.COURSE_ARCHIVE_BUCKET_NAME)
+    run_lookup = build_run_lookup(etl_source, ids)
+
     for key in keys:
-        run = run_for_edx_archive(etl_source, key)
+        normalized_key_id = extract_run_id_from_key(etl_source, key)
+        matching_runs = run_lookup.get(normalized_key_id)
 
-        if not run:
-            log.info("No runs found for %s, skipping", key)
+        if not matching_runs:
+            log.debug("No runs found for %s, skipping", key)
             continue
+
+        if len(matching_runs) > 1:
+            log.warning("There are %d runs for %s", len(matching_runs), key)
+
+        run = matching_runs[0]
         course = run.learning_resource
-        if ids and course.id not in ids:
-            log.info("Course id %d not in specified ids, skipping", course.id)
-            continue
+
         if course.published and not course.test_mode and course.best_run != run:
             # This is not the best run for the published course, so skip it
-            log.info("Not the best run for %s, skipping", run.run_id)
+            log.debug("Not the best run for %s, skipping", run.run_id)
             continue
-
         process_course_archive(bucket, key, run, overwrite=overwrite)
diff --git a/learning_resources/etl/edx_shared_test.py b/learning_resources/etl/edx_shared_test.py
index e808c37d26..c61e0d0265 100644
--- a/learning_resources/etl/edx_shared_test.py
+++ b/learning_resources/etl/edx_shared_test.py
@@ -9,7 +9,10 @@
 from learning_resources.constants import PlatformType
 from learning_resources.etl.constants import ETLSource
 from learning_resources.etl.edx_shared import (
+    build_run_lookup,
+    extract_run_id_from_key,
     get_most_recent_course_archives,
+    normalize_run_id,
     sync_edx_course_files,
 )
 from learning_resources.etl.utils import get_s3_prefix_for_source
@@ -268,12 +271,10 @@ def test_sync_edx_course_files_no_matching_run(
         autospec=True,
         return_value=[],
     )
-    mock_log = mocker.patch("learning_resources.etl.edx_shared.log.info")
 
     sync_edx_course_files(source, [run.learning_resource.id], [key])
 
     mock_load_content_files.assert_not_called()
-    mock_log.assert_any_call("No runs found for %s, skipping", key)
 
 
 @pytest.mark.parametrize("source", [ETLSource.mitxonline.value, ETLSource.xpro.value])
@@ -346,6 +347,11 @@ def test_get_most_recent_course_archives(mocker, mock_course_archive_bucket, sou
     from types import SimpleNamespace
     from unittest.mock import MagicMock
 
+    # Mock cache so stale cached data from other tests is not returned
+    mock_caches = mocker.patch("learning_resources.etl.edx_shared.caches")
+    mock_cache = mock_caches.__getitem__.return_value
+    mock_cache.get.return_value = None
+
     base_key = f"{get_s3_prefix_for_source(source)}/my-course/"
 
     # Create mock S3 objects with last_modified attributes
@@ -369,6 +375,61 @@ def test_get_most_recent_course_archives(mocker, mock_course_archive_bucket, sou
     mock_get_bucket.assert_called_once_with(mocker.ANY)
 
 
+@pytest.mark.parametrize("source", [ETLSource.mit_edx.value, ETLSource.xpro.value])
+def test_get_most_recent_course_archives_cache_hit(mocker, source):
+    """Cached results should be returned without querying S3"""
+    cached_keys = [f"some-prefix/{source}/cached-course/2023.tar.gz"]
+    mock_caches = mocker.patch("learning_resources.etl.edx_shared.caches")
+    mock_cache = mock_caches.__getitem__.return_value
+    mock_cache.get.return_value = cached_keys
+    mock_get_bucket = mocker.patch(
+        "learning_resources.etl.edx_shared.get_bucket_by_name",
+    )
+    mock_log = mocker.patch("learning_resources.etl.edx_shared.log.info")
+
+    result = get_most_recent_course_archives(source)
+
+    assert result == cached_keys
+    mock_cache.get.assert_called_once_with(f"archive_keys_{source}")
+    mock_get_bucket.assert_not_called()
+    mock_log.assert_called_once_with("Using cached archive keys for %s", source)
+
+
+@pytest.mark.parametrize("source", [ETLSource.mit_edx.value, ETLSource.xpro.value])
+def test_get_most_recent_course_archives_sets_cache(mocker, source):
+    """Results should be cached with the correct timeout after fetching from S3"""
+    from types import SimpleNamespace
+    from unittest.mock import MagicMock
+
+    from learning_resources.etl.edx_shared import ARCHIVE_KEYS_CACHE_TIMEOUT
+
+    mock_caches = mocker.patch("learning_resources.etl.edx_shared.caches")
+    mock_cache = mock_caches.__getitem__.return_value
+    mock_cache.get.return_value = None
+
+    base_key = f"{get_s3_prefix_for_source(source)}/my-course/"
+    mock_bucket = MagicMock()
+    mock_bucket.objects.filter.return_value = [
+        SimpleNamespace(
+            key=f"{base_key}2023.tar.gz",
+            last_modified=datetime(2023, 1, 1, tzinfo=ZoneInfo("UTC")),
+        )
+    ]
+    mocker.patch(
+        "learning_resources.etl.edx_shared.get_bucket_by_name",
+        return_value=mock_bucket,
+    )
+
+    result = get_most_recent_course_archives(source)
+
+    assert result == [f"{base_key}2023.tar.gz"]
+    mock_cache.set.assert_called_once_with(
+        f"archive_keys_{source}",
+        [f"{base_key}2023.tar.gz"],
+        timeout=ARCHIVE_KEYS_CACHE_TIMEOUT,
+    )
+
+
 @pytest.mark.parametrize("source", [ETLSource.mit_edx.value, ETLSource.xpro.value])
 def test_get_most_recent_course_archives_empty(
     settings, mocker, mock_course_archive_bucket, source
@@ -376,6 +437,11 @@ def test_get_most_recent_course_archives_empty(
     """Empty list should be returned if no recent tar archives are found"""
     from unittest.mock import MagicMock
 
+    # Mock cache so stale cached data from other tests is not returned
+    mock_caches = mocker.patch("learning_resources.etl.edx_shared.caches")
+    mock_cache = mock_caches.__getitem__.return_value
+    mock_cache.get.return_value = None
+
     # Create a mock bucket with no objects
     mock_bucket = MagicMock()
     mock_bucket.name = settings.COURSE_ARCHIVE_BUCKET_NAME
@@ -392,6 +458,11 @@ def test_get_most_recent_course_archives_empty(
 @pytest.mark.parametrize("source", [ETLSource.mit_edx.value, ETLSource.xpro.value])
 def test_get_most_recent_course_archives_no_bucket(settings, mocker, source):
     """Empty list should be returned and a warning logged if no bucket is found"""
+    # Mock cache so stale cached data from other tests is not returned
+    mock_caches = mocker.patch("learning_resources.etl.edx_shared.caches")
+    mock_cache = mock_caches.__getitem__.return_value
+    mock_cache.get.return_value = None
+
     mocker.patch(
         "learning_resources.etl.edx_shared.get_bucket_by_name",
         return_value=None,
@@ -643,31 +714,26 @@ def test_sync_edx_archive_success(
 
 @pytest.mark.parametrize("etl_source", [ETLSource.mitxonline.name, ETLSource.xpro.name])
 def test_sync_edx_archive_no_run_found(mocker, mock_course_archive_bucket, etl_source):
-    """Test sync_edx_archive logs warning and returns when no matching run is found"""
+    """Test sync_edx_archive triggers ETL when no matching run is found"""
     from learning_resources.etl.edx_shared import sync_edx_archive
 
     bucket = mock_course_archive_bucket.bucket
     s3_key = f"{etl_source}/courses/non-existent-course/abcdefghijklmnop.tar.gz"
 
-    with Path.open(
-        Path("test_json/course-v1:MITxT+8.01.3x+3T2022.tar.gz"), "rb"
-    ) as infile:
-        bucket.put_object(Key=s3_key, Body=infile.read(), ACL="public-read")
-
     mocker.patch(
         "learning_resources.etl.edx_shared.get_bucket_by_name",
         return_value=bucket,
     )
-    mock_log = mocker.patch("learning_resources.etl.edx_shared.log.warning")
     mock_process = mocker.patch(
         "learning_resources.etl.edx_shared.process_course_archive"
     )
+    mock_trigger = mocker.patch(
+        "learning_resources.etl.edx_shared.trigger_resource_etl"
+    )
 
     sync_edx_archive(etl_source, s3_key, overwrite=False)
 
-    mock_log.assert_called_once_with(
-        "No published/test_mode %s run found for archive %s", etl_source, s3_key
-    )
+    mock_trigger.assert_called_once_with(etl_source)
     mock_process.assert_not_called()
 
 
@@ -850,3 +916,374 @@ def test_sync_edx_archive_with_overwrite(
     mock_load.assert_called_once()
     run.refresh_from_db()
     assert run.checksum != "old_checksum"
+
+
+@pytest.mark.parametrize(
+    ("etl_source", "task_attr"),
+    [
+        (ETLSource.mit_edx.name, "get_mit_edx_data"),
+        (ETLSource.mitxonline.name, "get_mitxonline_data"),
+        (ETLSource.xpro.name, "get_xpro_data"),
+    ],
+)
+def test_trigger_resource_etl_dispatches_correct_task(mocker, etl_source, task_attr):
+    """Test trigger_resource_etl dispatches the correct Celery task per source"""
+    from learning_resources.etl.edx_shared import trigger_resource_etl
+
+    mock_caches = mocker.patch("learning_resources.etl.edx_shared.caches")
+    mock_cache = mock_caches.__getitem__.return_value
+    mock_cache.add.return_value = True  # Key was set (didn't exist before)
+    mock_task = mocker.patch(f"learning_resources.tasks.{task_attr}")
+
+    trigger_resource_etl(etl_source)
+
+    mock_task.apply_async.assert_called_once()
+
+
+def test_trigger_resource_etl_cache_dedup(mocker):
+    """Test trigger_resource_etl skips dispatch when cache indicates recent trigger"""
+    from learning_resources.etl.edx_shared import trigger_resource_etl
+
+    mock_caches = mocker.patch("learning_resources.etl.edx_shared.caches")
+    mock_cache = mock_caches.__getitem__.return_value
+    mock_cache.add.return_value = False  # Key already exists, add returns False
+    mock_task = mocker.patch("learning_resources.tasks.get_mit_edx_data")
+    mock_log = mocker.patch("learning_resources.etl.edx_shared.log.info")
+
+    trigger_resource_etl(ETLSource.mit_edx.name)
+
+    mock_task.apply_async.assert_not_called()
+    mock_log.assert_called_once_with(
+        "ETL already triggered recently for %s, skipping", ETLSource.mit_edx.name
+    )
+
+
+def test_trigger_resource_etl_sets_cache(mocker):
+    """Test trigger_resource_etl sets cache key with correct timeout after dispatching"""
+    from learning_resources.etl.edx_shared import (
+        ETL_CACHE_TIMEOUT,
+        trigger_resource_etl,
+    )
+
+    mock_caches = mocker.patch("learning_resources.etl.edx_shared.caches")
+    mock_cache = mock_caches.__getitem__.return_value
+    mock_cache.add.return_value = True  # Key was set (didn't exist before)
+    mocker.patch("learning_resources.tasks.get_mit_edx_data")
+
+    trigger_resource_etl(ETLSource.mit_edx.name)
+
+    mock_cache.add.assert_called_once_with(
+        f"etl_triggered_{ETLSource.mit_edx.name}",
+        True,  # noqa: FBT003
+        timeout=ETL_CACHE_TIMEOUT,
+    )
+
+
+def test_trigger_resource_etl_unsupported_source(mocker):
+    """Test trigger_resource_etl warns and deletes cache key for unsupported ETL sources"""
+    from learning_resources.etl.edx_shared import trigger_resource_etl
+
+    mock_caches = mocker.patch("learning_resources.etl.edx_shared.caches")
+    mock_cache = mock_caches.__getitem__.return_value
+    mock_cache.add.return_value = True  # Key was set (didn't exist before)
+    mock_log = mocker.patch("learning_resources.etl.edx_shared.log.warning")
+
+    trigger_resource_etl(ETLSource.ocw.name)
+
+    mock_log.assert_called_once_with(
+        "No ETL pipeline for %s, cannot sync archive",
+        ETLSource.ocw.name,
+    )
+    mock_cache.delete.assert_called_once_with(f"etl_triggered_{ETLSource.ocw.name}")
+
+
+def test_trigger_resource_etl_deletes_cache_on_exception(mocker):
+    """Test trigger_resource_etl deletes cache key and logs when task dispatch fails"""
+    from learning_resources.etl.edx_shared import trigger_resource_etl
+
+    mock_caches = mocker.patch("learning_resources.etl.edx_shared.caches")
+    mock_cache = mock_caches.__getitem__.return_value
+    mock_cache.add.return_value = True
+    mock_task = mocker.patch("learning_resources.tasks.get_mit_edx_data")
+    mock_task.apply_async.side_effect = Exception("connection error")
+    mock_log = mocker.patch("learning_resources.etl.edx_shared.log.exception")
+
+    trigger_resource_etl(ETLSource.mit_edx.name)
+
+    mock_cache.delete.assert_called_once_with(f"etl_triggered_{ETLSource.mit_edx.name}")
+    mock_log.assert_called_once_with(
+        "Failed to trigger ETL for %s", ETLSource.mit_edx.name
+    )
+
+
+@pytest.mark.parametrize(
+    ("etl_source", "run_id", "expected"),
+    [
+        (
+            ETLSource.mitxonline.name,
+            "course-v1:MITxT+8.01.3x+3T2022",
+            "course-v1:MITxT+8.01.3x+3T2022",
+        ),
+        (
+            ETLSource.xpro.name,
+            "course-v1:xPRO+SysEngxB1+R12",
+            "course-v1:xPRO+SysEngxB1+R12",
+        ),
+        (
+            ETLSource.mit_edx.name,
+            "MITx-12.345x-3T2022",
+            "mitx.12.345x.3t2022",
+        ),
+        (
+            ETLSource.mit_edx.name,
+            "course-v1:MITx+12.345x+3T2022",
+            "mitx.12.345x.3t2022",
+        ),
+        (
+            ETLSource.oll.name,
+            "course-v1:OLL+ABC123+R1",
+            "oll.abc123.r1",
+        ),
+    ],
+)
+def test_normalize_run_id(etl_source, run_id, expected):
+    """Test normalize_run_id returns expected normalized form per platform"""
+    assert normalize_run_id(etl_source, run_id) == expected
+
+
+@pytest.mark.parametrize(
+    ("etl_source", "key", "expected"),
+    [
+        (
+            ETLSource.mitxonline.name,
+            "/mitxonline/courses/course-v1:MITxT+8.01.3x+3T2022/abc.tar.gz",
+            "course-v1:MITxT+8.01.3x+3T2022",
+        ),
+        (
+            ETLSource.xpro.name,
+            "/xpro/courses/course-v1:xPRO+SysEngxB1+R12/abc.tar.gz",
+            "course-v1:xPRO+SysEngxB1+R12",
+        ),
+        (
+            ETLSource.mit_edx.name,
+            "/edx/courses/MITx-12.345x-3T2022/abc.tar.gz",
+            "mitx.12.345x.3t2022",
+        ),
+        (
+            ETLSource.oll.name,
+            "/oll/courses/course-v1:OLL+ABC123+R1_OLL.tar.gz",
+            "oll.abc123.r1",
+        ),
+    ],
+)
+def test_extract_run_id_from_key(etl_source, key, expected):
+    """Test extract_run_id_from_key extracts and normalizes correctly per platform"""
+    assert extract_run_id_from_key(etl_source, key) == expected
+
+
+@pytest.mark.parametrize(
+    ("source", "platform"),
+    [
+        (ETLSource.mitxonline.name, PlatformType.mitxonline.name),
+        (ETLSource.xpro.name, PlatformType.xpro.name),
+        (ETLSource.mit_edx.name, PlatformType.edx.name),
+        (ETLSource.oll.name, PlatformType.edx.name),
+    ],
+)
+def test_build_run_lookup(source, platform):
+    """build_run_lookup returns a dict mapping normalized run_id to runs"""
+    course = LearningResourceFactory.create(
+        platform=LearningResourcePlatformFactory.create(code=platform),
+        etl_source=source,
+        published=True,
+        create_runs=False,
+    )
+    run = LearningResourceRunFactory.create(
+        learning_resource=course,
+        published=True,
+    )
+    lookup = build_run_lookup(source, [course.id])
+    normalized = normalize_run_id(source, run.run_id)
+    assert normalized in lookup
+    assert lookup[normalized][0].id == run.id
+
+
+def test_build_run_lookup_filters_by_ids():
+    """build_run_lookup only includes runs for the specified course ids"""
+    source = ETLSource.mitxonline.name
+    course1 = LearningResourceFactory.create(
+        etl_source=source, published=True, create_runs=False
+    )
+    run1 = LearningResourceRunFactory.create(learning_resource=course1, published=True)
+    course2 = LearningResourceFactory.create(
+        etl_source=source, published=True, create_runs=False
+    )
+    run2 = LearningResourceRunFactory.create(learning_resource=course2, published=True)
+
+    lookup = build_run_lookup(source, [course1.id])
+    norm1 = normalize_run_id(source, run1.run_id)
+    norm2 = normalize_run_id(source, run2.run_id)
+    assert norm1 in lookup
+    assert norm2 not in lookup
+
+
+def test_build_run_lookup_empty_ids_returns_all():
+    """build_run_lookup with empty ids returns all published/test_mode runs"""
+    source = ETLSource.mitxonline.name
+    course1 = LearningResourceFactory.create(
+        etl_source=source, published=True, create_runs=False
+    )
+    run1 = LearningResourceRunFactory.create(learning_resource=course1, published=True)
+    course2 = LearningResourceFactory.create(
+        etl_source=source, published=True, create_runs=False
+    )
+    run2 = LearningResourceRunFactory.create(learning_resource=course2, published=True)
+
+    lookup = build_run_lookup(source, [])
+    norm1 = normalize_run_id(source, run1.run_id)
+    norm2 = normalize_run_id(source, run2.run_id)
+    assert norm1 in lookup
+    assert norm2 in lookup
+
+
+def test_build_run_lookup_excludes_unpublished():
+    """build_run_lookup excludes runs for unpublished, non-test-mode courses"""
+    source = ETLSource.mitxonline.name
+    course = LearningResourceFactory.create(
+        etl_source=source, published=False, test_mode=False, create_runs=False
+    )
+    LearningResourceRunFactory.create(learning_resource=course, published=True)
+    lookup = build_run_lookup(source, [course.id])
+    assert len(lookup) == 0
+
+
+def test_build_run_lookup_includes_test_mode():
+    """build_run_lookup includes runs for test_mode courses"""
+    source = ETLSource.mitxonline.name
+    course = LearningResourceFactory.create(
+        etl_source=source, published=False, test_mode=True, create_runs=False
+    )
+    run = LearningResourceRunFactory.create(learning_resource=course, published=False)
+    lookup = build_run_lookup(source, [course.id])
+    normalized = normalize_run_id(source, run.run_id)
+    assert normalized in lookup
+
+
+@pytest.mark.parametrize(
+    ("etl_source", "run_id_in_db", "run_id_in_key", "should_match"),
+    [
+        # mit_edx: same structure, different separators (- vs +) → match
+        (
+            ETLSource.mit_edx.name,
+            "MITx-12.345x-3T2022",
+            "MITx+12.345x+3T2022",
+            True,
+        ),
+        # mit_edx: same structure, different case → match
+        (
+            ETLSource.mit_edx.name,
+            "MITx-12.345x-3T2022",
+            "mitx-12.345x-3t2022",
+            True,
+        ),
+        # mit_edx: course-v1: prefix in DB but not in key → match (prefix stripped)
+        (
+            ETLSource.mit_edx.name,
+            "course-v1:MITx+12.345x+3T2022",
+            "MITx-12.345x-3T2022",
+            True,
+        ),
+        # oll: same structure, different separators (- vs +) → match
+        (
+            ETLSource.oll.name,
+            "course-v1:OLL+ABC123+R1",
+            "course-v1:OLL-ABC123-R1",
+            True,
+        ),
+        # oll: same structure, underscore vs dash → match
+        (
+            ETLSource.oll.name,
+            "course-v1:OLL_ABC123_R1",
+            "course-v1:OLL-ABC123-R1",
+            True,
+        ),
+    ],
+)
+def test_normalize_run_id_cross_format_parity(
+    etl_source, run_id_in_db, run_id_in_key, should_match
+):
+    """Verify that run_id variations normalize to the same value"""
+    norm_db = normalize_run_id(etl_source, run_id_in_db)
+    norm_key = normalize_run_id(etl_source, run_id_in_key)
+    if should_match:
+        assert norm_db == norm_key, (
+            f"Expected match: DB '{run_id_in_db}' → '{norm_db}', "
+            f"key '{run_id_in_key}' → '{norm_key}'"
+        )
+    else:
+        assert norm_db != norm_key, (
+            f"Expected no match but both normalized to '{norm_db}'"
+        )
+
+
+@pytest.mark.parametrize(
+    ("etl_source", "platform", "db_run_id", "key_run_id"),
+    [
+        # mit_edx: DB uses dashes, S3 key uses plusses → separators differ but match
+        (
+            ETLSource.mit_edx.name,
+            PlatformType.edx.name,
+            "MITx-12.345x-3T2022",
+            "MITx+12.345x+3T2022",
+        ),
+        # oll: DB uses plusses, S3 key uses dashes → separators differ but match
+        (
+            ETLSource.oll.name,
+            PlatformType.edx.name,
+            "course-v1:OLL+ABC123+R1",
+            "course-v1:OLL-ABC123-R1",
+        ),
+    ],
+)
+def test_build_run_lookup_cross_format_match(
+    etl_source, platform, db_run_id, key_run_id
+):
+    """build_run_lookup matches runs when DB and S3 key use different separators"""
+    course = LearningResourceFactory.create(
+        platform=LearningResourcePlatformFactory.create(code=platform),
+        etl_source=etl_source,
+        published=True,
+        create_runs=False,
+    )
+    run = LearningResourceRunFactory.create(
+        learning_resource=course,
+        published=True,
+        run_id=db_run_id,
+    )
+    lookup = build_run_lookup(etl_source, [course.id])
+    # Look up using the S3 key's run_id format (different separators)
+    normalized_key = normalize_run_id(etl_source, key_run_id)
+    assert normalized_key in lookup
+    assert lookup[normalized_key][0].id == run.id
+
+
+def test_build_run_lookup_cross_format_prefix_match():
+    """build_run_lookup matches when DB run_id has a course-v1: prefix
+    but the S3 key directory does not (or vice versa).
+    """
+    course = LearningResourceFactory.create(
+        platform=LearningResourcePlatformFactory.create(code=PlatformType.edx.name),
+        etl_source=ETLSource.mit_edx.name,
+        published=True,
+        create_runs=False,
+    )
+    run = LearningResourceRunFactory.create(
+        learning_resource=course,
+        published=True,
+        run_id="course-v1:MITx+12.345x+3T2022",
+    )
+    lookup = build_run_lookup(ETLSource.mit_edx.name, [course.id])
+    # S3 key dir uses short format without course-v1: prefix
+    normalized_key = normalize_run_id(ETLSource.mit_edx.name, "MITx-12.345x-3T2022")
+    assert normalized_key in lookup
+    assert lookup[normalized_key][0].id == run.id
diff --git a/learning_resources/etl/loaders.py b/learning_resources/etl/loaders.py
index e5e4b75b2b..27bd3d1343 100644
--- a/learning_resources/etl/loaders.py
+++ b/learning_resources/etl/loaders.py
@@ -3,6 +3,7 @@
 import logging
 
 from django.contrib.auth import get_user_model
+from django.core.cache import caches
 from django.db import transaction
 from django.db.models import Q
 
@@ -67,6 +68,8 @@
 
 User = get_user_model()
 
+CONTENT_TASKS_CACHE_TIMEOUT = 300
+
 
 def update_index(learning_resource, newly_created):
     """
@@ -325,7 +328,7 @@ def load_run(
     with transaction.atomic():
         (
             learning_resource_run,
-            created,
+            _,
         ) = LearningResourceRun.objects.select_for_update().update_or_create(
             learning_resource=learning_resource,
             run_id=run_id,
@@ -334,24 +337,47 @@ def load_run(
         load_instructors(learning_resource_run, instructors_data)
         load_prices(learning_resource_run, resource_prices)
         load_image(learning_resource_run, image_data)
+
+        # Remove cached best run if present
+        if hasattr(learning_resource, "best_run"):
+            del learning_resource.best_run
+
         if (
-            created
-            and learning_resource_run == learning_resource.best_run
+            (
+                learning_resource_run == learning_resource.best_run
+                or learning_resource.test_mode
+            )
             and learning_resource.etl_source
             in (
                 ETLSource.mit_edx.value,
                 ETLSource.mitxonline.value,
                 ETLSource.xpro.value,
             )
+            and learning_resource_run.content_files.count() == 0
         ):
-            # webhook may have been sent before run was created
-            # so trigger a contentfile ingestion for the course.
-            from learning_resources.tasks import get_content_tasks
-
-            get_content_tasks(
-                etl_source=learning_resource.etl_source,
-                learning_resource_ids=[learning_resource.id],
-            ).delay()
+            # webhook may have been sent before run was created or was best run,
+            # so trigger a contentfile ingestion for the course. If already
+            # ingested & checksums match, no new content files will be created
+            from learning_resources.tasks import import_content_files
+
+            etl_source = learning_resource.etl_source
+            resource_id = learning_resource.id
+            cache_key = f"content_tasks_triggered_{etl_source}_{resource_id}"
+
+            def enqueue_content_tasks():
+                redis_cache = caches["redis"]
+                if not redis_cache.add(
+                    cache_key,
+                    True,  # noqa: FBT003
+                    timeout=CONTENT_TASKS_CACHE_TIMEOUT,
+                ):
+                    return
+                import_content_files.delay(
+                    etl_source,
+                    learning_resource_ids=[resource_id],
+                )
+
+            transaction.on_commit(enqueue_content_tasks)
     return learning_resource_run
 
 
diff --git a/learning_resources/etl/loaders_test.py b/learning_resources/etl/loaders_test.py
index 2645bd9a1a..0d0121b10e 100644
--- a/learning_resources/etl/loaders_test.py
+++ b/learning_resources/etl/loaders_test.py
@@ -789,12 +789,12 @@ def test_load_course_fetch_only(mocker, course_exists):
 @pytest.mark.parametrize("run_exists", [True, False])
 @pytest.mark.parametrize("status", [RunStatus.archived.value, RunStatus.current.value])
 @pytest.mark.parametrize("certification", [True, False])
+@pytest.mark.django_db(transaction=True)
 def test_load_run(mocker, run_exists, status, certification):
     """Test that load_run loads the course run"""
     today = now_in_utc()
-    mock_content_task = mocker.patch(
-        "learning_resources.tasks.get_content_tasks",
-        return_value=mocker.Mock(delay=mocker.Mock()),
+    mock_import_task = mocker.patch(
+        "learning_resources.tasks.import_content_files",
     )
     course = LearningResourceFactory.create(
         is_course=True,
@@ -849,13 +849,256 @@ def test_load_run(mocker, run_exists, status, certification):
     for key, value in props.items():
         assert getattr(result, key) == value, f"Property {key} should equal {value}"
 
+    # import_content_files is called for best runs (regardless of whether they're new)
+    # when the course is from an edx source (xpro in this case)
+    course.refresh_from_db()
+    if result == course.best_run:
+        mock_import_task.delay.assert_called_once_with(
+            course.etl_source, learning_resource_ids=[course.id]
+        )
+    else:
+        mock_import_task.delay.assert_not_called()
+
+
+@pytest.mark.parametrize(
+    "etl_source",
+    [ETLSource.mit_edx.value, ETLSource.mitxonline.value, ETLSource.xpro.value],
+)
+@pytest.mark.django_db(transaction=True)
+def test_load_run_calls_import_content_files_for_best_run(mocker, etl_source):
+    """Test that load_run calls import_content_files for best runs even if not newly created"""
+    from datetime import UTC, datetime
+
+    mock_import_task = mocker.patch(
+        "learning_resources.tasks.import_content_files",
+    )
+
+    # Create course with an existing older run
+    course = LearningResourceFactory.create(
+        is_course=True,
+        create_runs=False,
+        etl_source=etl_source,
+        published=True,
+    )
+    LearningResourceRunFactory.create(
+        learning_resource=course,
+        start_date=datetime(2023, 1, 1, tzinfo=UTC),
+    )
+
+    # Load a newer run that will become the best run
+    newer_run_props = model_to_dict(
+        LearningResourceRunFactory.build(
+            start_date=datetime(2024, 1, 1, tzinfo=UTC),
+        )
+    )
+    newer_run_props["prices"] = []
+    del newer_run_props["id"]
+    del newer_run_props["learning_resource"]
+    del newer_run_props["resource_prices"]
+
+    result = load_run(course, newer_run_props)
+
+    course.refresh_from_db()
+    assert result == course.best_run
+
+    mock_import_task.delay.assert_called_once_with(
+        course.etl_source, learning_resource_ids=[course.id]
+    )
+
+
+@pytest.mark.parametrize(
+    "etl_source",
+    [ETLSource.mit_edx.value, ETLSource.mitxonline.value, ETLSource.xpro.value],
+)
+@pytest.mark.parametrize("run_exists", [True, False])
+@pytest.mark.django_db(transaction=True)
+def test_load_run_calls_import_content_files_for_test_mode(
+    mocker, etl_source, run_exists
+):
+    """Test that load_run calls import_content_files for test_mode courses regardless of best_run"""
+    from datetime import UTC, datetime
+
+    mock_import_task = mocker.patch(
+        "learning_resources.tasks.import_content_files",
+    )
+
+    # Create test_mode course
+    course = LearningResourceFactory.create(
+        is_course=True,
+        create_runs=False,
+        etl_source=etl_source,
+        published=False,
+        test_mode=True,
+    )
+
     if run_exists:
-        mock_content_task.assert_not_called()
+        # Create an existing run that's already the best run
+        existing_run = LearningResourceRunFactory.create(
+            learning_resource=course,
+            start_date=datetime(2024, 1, 1, tzinfo=UTC),
+        )
+        course.refresh_from_db()
+
+        # Update the existing run with new data
+        run_props = model_to_dict(existing_run)
+        run_props["title"] = "Updated Title"
+        run_props["prices"] = []
+        run_props["instructors"] = []
+        run_props["image"] = None
+        del run_props["id"]
+        del run_props["learning_resource"]
+        del run_props["resource_prices"]
     else:
-        mock_content_task.assert_called_once_with(
-            etl_source=course.etl_source, learning_resource_ids=[course.id]
+        # Create new run
+        run_props = model_to_dict(
+            LearningResourceRunFactory.build(
+                start_date=datetime(2024, 1, 1, tzinfo=UTC),
+            )
+        )
+        run_props["prices"] = []
+        run_props["image"] = None
+        del run_props["id"]
+        del run_props["learning_resource"]
+        del run_props["resource_prices"]
+
+    result = load_run(course, run_props)
+
+    # For test_mode courses, import_content_files should always be called
+    mock_import_task.delay.assert_called_once_with(
+        course.etl_source, learning_resource_ids=[course.id]
+    )
+    assert result.learning_resource.test_mode is True
+
+
+@pytest.mark.parametrize(
+    "etl_source",
+    [ETLSource.mit_edx.value, ETLSource.mitxonline.value, ETLSource.xpro.value],
+)
+def test_load_run_skips_import_content_files_for_non_best_run_published_course(
+    mocker, etl_source
+):
+    """Test that load_run doesn't call import_content_files for non-best runs of published courses"""
+    from datetime import UTC, datetime
+
+    mock_import_task = mocker.patch(
+        "learning_resources.tasks.import_content_files",
+    )
+
+    # Create published (non-test-mode) course with existing best run
+    course = LearningResourceFactory.create(
+        is_course=True,
+        create_runs=False,
+        etl_source=etl_source,
+        published=True,
+        test_mode=False,
+    )
+
+    # Create the best run (newer date)
+    best_run = LearningResourceRunFactory.create(
+        learning_resource=course,
+        start_date=datetime(2024, 6, 1, tzinfo=UTC),
+    )
+    course.refresh_from_db()
+    assert course.best_run == best_run
+
+    # Now add an older run that won't be the best run
+    older_run_props = model_to_dict(
+        LearningResourceRunFactory.build(
+            start_date=datetime(2023, 1, 1, tzinfo=UTC),
         )
-        mock_content_task.return_value.delay.assert_called_once()
+    )
+    older_run_props["prices"] = []
+    del older_run_props["id"]
+    del older_run_props["learning_resource"]
+    del older_run_props["resource_prices"]
+
+    result = load_run(course, older_run_props)
+
+    course.refresh_from_db()
+
+    # Verify the result is not the best run
+    assert result != course.best_run
+
+    # import_content_files should not be called for non-best runs
+    mock_import_task.delay.assert_not_called()
+
+
+@pytest.mark.parametrize(
+    "etl_source",
+    [ETLSource.ocw.value, ETLSource.oll.value, ETLSource.youtube.value],
+)
+def test_load_run_skips_import_content_files_for_unsupported_sources(
+    mocker, etl_source
+):
+    """Test that load_run doesn't call import_content_files for non-edx sources"""
+    mock_import_task = mocker.patch(
+        "learning_resources.tasks.import_content_files",
+    )
+
+    course = LearningResourceFactory.create(
+        is_course=True,
+        create_runs=False,
+        etl_source=etl_source,
+        published=True,
+    )
+
+    run_props = model_to_dict(LearningResourceRunFactory.build())
+    run_props["prices"] = []
+    del run_props["id"]
+    del run_props["learning_resource"]
+    del run_props["resource_prices"]
+
+    load_run(course, run_props)
+
+    # import_content_files should not be called for non-edx sources
+    mock_import_task.delay.assert_not_called()
+
+
+@pytest.mark.parametrize(
+    "etl_source",
+    [ETLSource.mit_edx.value, ETLSource.mitxonline.value, ETLSource.xpro.value],
+)
+@pytest.mark.django_db(transaction=True)
+def test_load_run_skips_import_content_files_when_content_files_exist(
+    mocker, etl_source
+):
+    """Test that load_run doesn't call import_content_files when content files already exist"""
+    mock_import_task = mocker.patch(
+        "learning_resources.tasks.import_content_files",
+    )
+
+    course = LearningResourceFactory.create(
+        is_course=True,
+        create_runs=False,
+        etl_source=etl_source,
+        published=True,
+    )
+    run = LearningResourceRunFactory.create(
+        learning_resource=course,
+    )
+    # Add existing content files to the run
+    ContentFileFactory.create_batch(3, run=run)
+    course.refresh_from_db()
+    assert course.best_run == run
+    assert run.content_files.count() == 3
+
+    # Update the existing run (not creating a new one)
+    run_props = model_to_dict(run)
+    run_props["title"] = "Updated Title"
+    run_props["prices"] = []
+    run_props["instructors"] = []
+    run_props["image"] = None
+    del run_props["id"]
+    del run_props["learning_resource"]
+    del run_props["resource_prices"]
+
+    result = load_run(course, run_props)
+
+    course.refresh_from_db()
+    assert result == course.best_run
+
+    # import_content_files should NOT be called because content files already exist
+    mock_import_task.delay.assert_not_called()
 
 
 @pytest.mark.parametrize("parent_factory", [CourseFactory, ProgramFactory])
diff --git a/learning_resources/tasks.py b/learning_resources/tasks.py
index 5bf0e642f8..975efa8a97 100644
--- a/learning_resources/tasks.py
+++ b/learning_resources/tasks.py
@@ -302,6 +302,26 @@ def import_all_xpro_files(
     )
 
 
+@app.task(bind=True)
+def import_content_files(
+    self, etl_source, *, chunk_size=None, overwrite=False, learning_resource_ids=None
+):
+    """Import content files for any edX-based ETL source.
+
+    This task wraps get_content_tasks so that the S3 archive listing and
+    task-group construction happen asynchronously in a Celery worker, rather
+    than blocking the calling task.
+    """
+    return self.replace(
+        get_content_tasks(
+            etl_source,
+            chunk_size=chunk_size,
+            overwrite=overwrite,
+            learning_resource_ids=learning_resource_ids,
+        )
+    )
+
+
 @app.task
 def get_podcast_data():
     """
diff --git a/learning_resources/tasks_test.py b/learning_resources/tasks_test.py
index 3cdc7a93ae..50b6486879 100644
--- a/learning_resources/tasks_test.py
+++ b/learning_resources/tasks_test.py
@@ -209,6 +209,28 @@ def test_import_all_oll_files(settings, mocker, mocked_celery, mock_blocklist):
     )
 
 
+@mock_aws
+def test_import_content_files(settings, mocker, mocked_celery, mock_blocklist):
+    """import_content_files should be replaced with get_content_tasks for any source"""
+    setup_s3(settings)
+    get_content_tasks_mock = mocker.patch(
+        "learning_resources.tasks.get_content_tasks", autospec=True
+    )
+    with pytest.raises(mocked_celery.replace_exception_class):
+        tasks.import_content_files.delay(
+            ETLSource.mitxonline.name,
+            chunk_size=5,
+            overwrite=True,
+            learning_resource_ids=[42],
+        )
+    get_content_tasks_mock.assert_called_once_with(
+        ETLSource.mitxonline.name,
+        chunk_size=5,
+        overwrite=True,
+        learning_resource_ids=[42],
+    )
+
+
 @mock_aws
 @pytest.mark.parametrize("with_learning_resource_ids", [True, False])
 def test_get_content_tasks(
diff --git a/main/settings.py b/main/settings.py
index 87cc66407c..db36172b89 100644
--- a/main/settings.py
+++ b/main/settings.py
@@ -34,7 +34,7 @@
 from main.settings_pluggy import *  # noqa: F403
 from openapi.settings_spectacular import open_spectacular_settings
 
-VERSION = "0.53.7"
+VERSION = "0.53.9"
 
 log = logging.getLogger()
 
diff --git a/main/settings_celery.py b/main/settings_celery.py
index 0c74125447..bea5dc3224 100644
--- a/main/settings_celery.py
+++ b/main/settings_celery.py
@@ -42,13 +42,11 @@
         },
         "update_edx-courses-every-1-days": {
             "task": "learning_resources.tasks.get_mit_edx_data",
-            "schedule": crontab(minute=0, hour=5),  # 1:00am EST
+            "schedule": crontab(minute=0, hour=5),
         },
-        "update-edx-files-every-1-weeks": {
+        "update-edx-files-every-1-day": {
             "task": "learning_resources.tasks.import_all_mit_edx_files",
-            "schedule": crontab(
-                minute=0, hour=5, day_of_week=1
-            ),  # 12:00 PM EST on Mondays
+            "schedule": crontab(minute=0, hour=6),
         },
         "update-micromasters-programs-every-1-days": {
             "task": "learning_resources.tasks.get_micromasters_data",
@@ -58,15 +56,13 @@
             "task": "learning_resources.tasks.get_mit_climate_data",
             "schedule": crontab(minute=30, hour=5),  # 1:30am EST
         },
-        "update-mitxonline-courses-every-1-days": {
+        "update-mitxonline-courses-every-6-hours": {
             "task": "learning_resources.tasks.get_mitxonline_data",
-            "schedule": crontab(minute=0, hour=5),  # 1:00am EST
+            "schedule": crontab(minute=0, hour="*/6"),
         },
-        "update-mitxonline-files-every-1-weeks": {
+        "update-mitxonline-files-every-1-day": {
             "task": "learning_resources.tasks.import_all_mitxonline_files",
-            "schedule": crontab(
-                minute=0, hour=5, day_of_week=3
-            ),  # 12:00 PM EST on Wednesdays
+            "schedule": crontab(minute=0, hour=7),
         },
         "update-podcasts": {
             "task": "learning_resources.tasks.get_podcast_data",
@@ -80,11 +76,9 @@
             "task": "learning_resources.tasks.get_xpro_data",
             "schedule": crontab(minute=0, hour=5),  # 1:00am EST
         },
-        "update-xpro-files-every-1-weeks": {
+        "update-xpro-files-every-1-day": {
             "task": "learning_resources.tasks.import_all_xpro_files",
-            "schedule": crontab(
-                minute=0, hour=5, day_of_week=2
-            ),  # 12:00 PM EST on Tuesdays
+            "schedule": crontab(minute=0, hour=8),
         },
         "update-youtube-videos": {
             "task": "learning_resources.tasks.get_youtube_data",
diff --git a/main/utils.py b/main/utils.py
index 8bfe2d9cdf..af74c62f10 100644
--- a/main/utils.py
+++ b/main/utils.py
@@ -118,9 +118,6 @@ def call_fastly_purge_api(relative_url):
 
     headers = {}
 
-    if relative_url != "*":
-        headers["fastly-soft-purge"] = "1"
-
     if settings.FASTLY_API_KEY:
         headers["fastly-key"] = settings.FASTLY_API_KEY
 
diff --git a/openapi/specs/v1.yaml b/openapi/specs/v1.yaml
index 0410bbd726..8a4bb21ef6 100644
--- a/openapi/specs/v1.yaml
+++ b/openapi/specs/v1.yaml
@@ -13821,6 +13821,9 @@ components:
           type: string
           minLength: 1
           maxLength: 255
+        author_name:
+          type: string
+          default: ''
         content:
           default: {}
         is_published:
@@ -15723,6 +15726,9 @@ components:
         title:
           type: string
           maxLength: 255
+        author_name:
+          type: string
+          default: ''
         content:
           default: {}
         user:
@@ -15762,6 +15768,9 @@ components:
           type: string
           minLength: 1
           maxLength: 255
+        author_name:
+          type: string
+          default: ''
         content:
           default: {}
         is_published:
diff --git a/webhooks/views.py b/webhooks/views.py
index d6c7169e46..1f0c048239 100644
--- a/webhooks/views.py
+++ b/webhooks/views.py
@@ -167,7 +167,8 @@ def process_create_content_file_request(data):
         ingest_canvas_course.apply_async([content_path, False])
     else:
         ingest_edx_course.apply_async(
-            [etl_source, content_path], readable_id=readable_id, overwrite=False
+            [etl_source, content_path],
+            kwargs={"course_id": readable_id, "overwrite": False},
         )
 
 
diff --git a/webhooks/views_test.py b/webhooks/views_test.py
index dd28add05e..46edd01ef0 100644
--- a/webhooks/views_test.py
+++ b/webhooks/views_test.py
@@ -222,7 +222,8 @@ def test_content_file_webhook_view_edx_success(  # noqa: PLR0913
     )
     assert response.status_code == 200
     mock_ingest.assert_called_once_with(
-        [etl_source, content_path], readable_id=readable_id, overwrite=False
+        [etl_source, content_path],
+        kwargs={"course_id": readable_id, "overwrite": False},
     )
 
 
diff --git a/yarn.lock b/yarn.lock
index b5dc65dcaf..c6ce6d1228 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3514,19 +3514,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mitodl/mitxonline-api-axios@npm:^2026.1.14":
-  version: 2026.1.21
-  resolution: "@mitodl/mitxonline-api-axios@npm:2026.1.21"
+"@mitodl/mitxonline-api-axios@npm:^2026.2.5":
+  version: 2026.2.5
+  resolution: "@mitodl/mitxonline-api-axios@npm:2026.2.5"
   dependencies:
     "@types/node": "npm:^20.11.19"
     axios: "npm:^1.6.5"
-  checksum: 10/68ebfaedcd59cf497adc3a765ef0268fb26d1c6454f6f159992a8f7311297148891989e5e891b3991136e9aaa3eac1f851a2079b0258e63f69e0fd8dce286c21
+  checksum: 10/a8e41106fba15723571a6e9f44fb1fd613be364f0dfb0bf05bc5fe006eb286380133a35bb6b3439ed1702024599351484b1a7bf0e71b6e6f3175e9dbbeb2cf20
   languageName: node
   linkType: hard
 
-"@mitodl/smoot-design@npm:^6.23.0":
-  version: 6.23.0
-  resolution: "@mitodl/smoot-design@npm:6.23.0"
+"@mitodl/smoot-design@npm:^6.24.0":
+  version: 6.24.0
+  resolution: "@mitodl/smoot-design@npm:6.24.0"
   dependencies:
     "@ai-sdk/react": "npm:1.2.12"
     "@emotion/cache": "npm:^11.14.0"
@@ -3551,7 +3551,7 @@ __metadata:
     "@remixicon/react": ^4.2.0
     react: ^18 || ^19
     react-dom: ^18 || ^19
-  checksum: 10/145082fa7afff17fd76610f4a1d217fe5f687aa8b7eea87ece225d36135ecbb5b40de5bbbc262a0d0042759cff4ca0c3d681ddacea40f86445f0e3e89840e8ea
+  checksum: 10/ca8c5a25939e80f70d65a2a44056a2a1ecd778f298ac0153fa8e2b1861950280e17f8c33d4acfdc28967e29481ac112eecf7a80389431a47faa0f52c54ae1c11
   languageName: node
   linkType: hard
 
@@ -8854,7 +8854,7 @@ __metadata:
   resolution: "api@workspace:frontends/api"
   dependencies:
     "@faker-js/faker": "npm:^10.0.0"
-    "@mitodl/mitxonline-api-axios": "npm:^2026.1.14"
+    "@mitodl/mitxonline-api-axios": "npm:^2026.2.5"
     "@tanstack/react-query": "npm:^5.66.0"
     "@testing-library/react": "npm:^16.3.0"
     axios: "npm:^1.12.2"
@@ -16014,8 +16014,8 @@ __metadata:
     "@floating-ui/react": "npm:^0.27.16"
     "@happy-dom/jest-environment": "npm:^20.1.0"
     "@mitodl/course-search-utils": "npm:^3.5.0"
-    "@mitodl/mitxonline-api-axios": "npm:^2026.1.14"
-    "@mitodl/smoot-design": "npm:^6.23.0"
+    "@mitodl/mitxonline-api-axios": "npm:^2026.2.5"
+    "@mitodl/smoot-design": "npm:^6.24.0"
     "@mui/material": "npm:^6.4.5"
     "@mui/material-nextjs": "npm:^6.4.3"
     "@radix-ui/react-dropdown-menu": "npm:^2.1.16"
@@ -17614,7 +17614,7 @@ __metadata:
     validator: "npm:^13.11.0"
     wheel-indicator: "npm:^1.3.0"
   peerDependencies:
-    "@mitodl/smoot-design": ^6.23.0
+    "@mitodl/smoot-design": ^6.24.0
     next: ^16.1.6
   languageName: unknown
   linkType: soft