diff --git a/apps/design-system/content/docs/index.mdx b/apps/design-system/content/docs/index.mdx
index 2d9559606e4..c8ab85f5a28 100644
--- a/apps/design-system/content/docs/index.mdx
+++ b/apps/design-system/content/docs/index.mdx
@@ -39,10 +39,10 @@ One of the drawback of packaging the components in an npm package is that the st
 </AccordionItem>
 <AccordionItem value="faq-3">
 	<AccordionTrigger>
-		I was looking for Supabase UI Library
+		I was looking for Supabase Library
 	</AccordionTrigger>
 	<AccordionContent>
-		If you are looking for the Supabase UI, you can find it [here](https://supabase.com/ui).
+		You can find Supabase Library [here](https://supabase.com/library).
 	</AccordionContent>
 </AccordionItem>
 </Accordion>
diff --git a/apps/docs/app/page.tsx b/apps/docs/app/page.tsx
index f3b5ea7822a..2a66ed19c35 100644
--- a/apps/docs/app/page.tsx
+++ b/apps/docs/app/page.tsx
@@ -204,10 +204,10 @@ const additionalResources = [
     href: '/guides/integrations',
   },
   {
-    title: 'Supabase UI',
+    title: 'Supabase Library',
     description: 'A collection of pre-built Supabase components to speed up your project.',
     icon: 'ui',
-    href: 'https://supabase.com/ui',
+    href: 'https://supabase.com/library',
     external: true,
   },
   {
diff --git a/apps/docs/components/Navigation/Navigation.commands.tsx b/apps/docs/components/Navigation/Navigation.commands.tsx
index 0a00c936c99..9a9c6c92f18 100644
--- a/apps/docs/components/Navigation/Navigation.commands.tsx
+++ b/apps/docs/components/Navigation/Navigation.commands.tsx
@@ -153,8 +153,8 @@ const navCommands = [
   },
   {
     id: 'nav-ui',
-    name: 'Go to Supabase UI Library',
-    route: 'https://supabase.com/ui',
+    name: 'Go to Supabase Library',
+    route: 'https://supabase.com/library',
     icon: () => <ArrowRight />,
   },
 ] satisfies Array<ICommand & { enabled?: boolean }>
diff --git a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
index 77cbb1c8ef8..d04c48cb3b3 100644
--- a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
+++ b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
@@ -298,9 +298,9 @@ export const GLOBAL_MENU_ITEMS: GlobalMenuItems = [
             level: 'reference_javascript',
           },
           {
-            label: 'UI Library',
+            label: 'Library',
             icon: 'ui',
-            href: 'https://supabase.com/ui' as `/${string}`,
+            href: 'https://supabase.com/library' as `/${string}`,
             level: 'ui',
           },
         ],
diff --git a/apps/docs/content/_partials/uiLibCta.mdx b/apps/docs/content/_partials/uiLibCta.mdx
index 0457e8e4c0a..ba65465796b 100644
--- a/apps/docs/content/_partials/uiLibCta.mdx
+++ b/apps/docs/content/_partials/uiLibCta.mdx
@@ -3,7 +3,7 @@
 UI components built on shadcn/ui that connect to Supabase via a single command.
 
 <Button variant="primary" asChild>
-  <a href="https://supabase.com/ui">Explore Components</a>
+  <a href="https://supabase.com/library">Explore Components</a>
 </Button>
 
 </Admonition>
diff --git a/apps/docs/content/guides/getting-started/quickstarts/tanstack.mdx b/apps/docs/content/guides/getting-started/quickstarts/tanstack.mdx
index 53a7e5aaf2c..ff9a466be80 100644
--- a/apps/docs/content/guides/getting-started/quickstarts/tanstack.mdx
+++ b/apps/docs/content/guides/getting-started/quickstarts/tanstack.mdx
@@ -139,7 +139,7 @@ npm run dev
 ## Next steps
 
 - Learn how to [protect routes and check sessions](/docs/guides/auth/server-side/creating-a-client?queryGroups=framework&framework=tanstack) with the server client
-- Set up a complete [login and sign-up flow](/ui/docs/tanstack/password-based-auth) from the Supabase UI Library
+- Set up a complete [login and sign-up flow](/library/docs/tanstack/password-based-auth) from Supabase Library
 - Explore [drop-in UI components](/ui) for your Supabase app
 - [Insert more data](/docs/guides/database/import-data) into your database
 - Upload and serve static files using [Storage](/docs/guides/storage)
diff --git a/apps/docs/content/guides/getting-started/tutorials/with-nextjs.mdx b/apps/docs/content/guides/getting-started/tutorials/with-nextjs.mdx
index 762d159ea33..9fd1f84564e 100644
--- a/apps/docs/content/guides/getting-started/tutorials/with-nextjs.mdx
+++ b/apps/docs/content/guides/getting-started/tutorials/with-nextjs.mdx
@@ -276,6 +276,6 @@ At this stage you have a fully functional application!
 
 - See the complete [example on GitHub](https://github.com/supabase/supabase/tree/master/examples/user-management/nextjs-user-management) and deploy it to Vercel
 - [Build a Twitter Clone with the Next.js App Router and Supabase - free egghead course](https://egghead.io/courses/build-a-twitter-clone-with-the-next-js-app-router-and-supabase-19bebadb)
-- Explore the [pre-built Auth components](/ui/docs/nextjs/password-based-auth)
+- Explore the [pre-built Auth components](/library/docs/nextjs/password-based-auth)
 - Explore the [Supabase Cache Helpers](https://github.com/psteinroe/supabase-cache-helpers)
 - See the [Next.js Subscription Payments Starter](https://github.com/vercel/nextjs-subscription-payments) template on GitHub
diff --git a/apps/docs/content/guides/integrations/supabase-for-platforms.mdx b/apps/docs/content/guides/integrations/supabase-for-platforms.mdx
index f20fca78d71..d2927d00856 100644
--- a/apps/docs/content/guides/integrations/supabase-for-platforms.mdx
+++ b/apps/docs/content/guides/integrations/supabase-for-platforms.mdx
@@ -393,7 +393,7 @@ Before transferring the project to your user's org, make sure to remove any cust
 
 ## Platform kit
 
-Docs: https://supabase.com/ui/docs/platform/platform-kit
+Docs: https://supabase.com/library/docs/platform/platform-kit
 
 <div className="video-container mb-8">
   <iframe
diff --git a/apps/docs/data/content-listings/realtime.data.ts b/apps/docs/data/content-listings/realtime.data.ts
index 0e0e85b2270..0badd4e4d22 100644
--- a/apps/docs/data/content-listings/realtime.data.ts
+++ b/apps/docs/data/content-listings/realtime.data.ts
@@ -28,19 +28,21 @@ export const realtimeExamples: ContentListingGroup = {
     },
     {
       title: 'Chat',
-      href: 'https://supabase.com/ui/docs/nextjs/realtime-chat',
-      description: 'Supabase UI chat component using Broadcast to send message between users.',
+      href: 'https://supabase.com/library/docs/nextjs/realtime-chat',
+      description:
+        'Supabase Library chat component using Broadcast to send messages between users.',
     },
     {
       title: 'Avatar Stack',
-      href: 'https://supabase.com/ui/docs/nextjs/realtime-avatar-stack',
-      description: 'Supabase UI avatar stack component using Presence to track connected users.',
+      href: 'https://supabase.com/library/docs/nextjs/realtime-avatar-stack',
+      description:
+        'Supabase Library avatar stack component using Presence to track connected users.',
     },
     {
       title: 'Realtime Cursor',
-      href: 'https://supabase.com/ui/docs/nextjs/realtime-cursor',
+      href: 'https://supabase.com/library/docs/nextjs/realtime-cursor',
       description:
-        "Supabase UI realtime cursor component using Broadcast to share users' cursors to build collaborative applications.",
+        "Supabase Library realtime cursor component using Broadcast to share users' cursors to build collaborative applications.",
     },
   ],
 }
diff --git a/apps/learn/components/tanstack-beta.tsx b/apps/learn/components/tanstack-beta.tsx
index 84c68949adb..89da1a6e489 100644
--- a/apps/learn/components/tanstack-beta.tsx
+++ b/apps/learn/components/tanstack-beta.tsx
@@ -1,4 +1,5 @@
 import { TriangleAlert } from 'lucide-react'
+
 import { Callout } from './callout'
 
 export default function TanStackBeta() {
@@ -10,8 +11,8 @@ export default function TanStackBeta() {
             <TriangleAlert />
             Heads up: TanStack Start is in beta.
           </div>
-          We&apos;re excited to support TanStack Start in our UI library! But since it&apos;s still
-          in beta, things may change quickly — expect breaking changes and some rough edges.
+          We&apos;re excited to support TanStack Start in Supabase Library! But since it&apos;s
+          still in beta, things may change quickly — expect breaking changes and some rough edges.
           We&apos;ll do our best to keep up and make integration with Supabase as smooth as
           possible. If you run into issues, have a look at the TanStack docs.
           <a
diff --git a/apps/learn/content/foundations/quickstart.mdx b/apps/learn/content/foundations/quickstart.mdx
index e33c066d63f..bac5525880f 100644
--- a/apps/learn/content/foundations/quickstart.mdx
+++ b/apps/learn/content/foundations/quickstart.mdx
@@ -74,4 +74,4 @@ When you've finished setting up shadcn/ui, you can start exploring the component
 
 If you encounter issues, try deleting your existing `components.json` file and follow one of the guides to reset your setup.
 
-For issues and questions about specific frameworks, see the [FAQs](/ui/docs/getting-started/faq)
+For issues and questions about specific frameworks, see the [FAQs](/library/docs/getting-started/faq)
diff --git a/apps/learn/scripts/build-llms-txt.ts b/apps/learn/scripts/build-llms-txt.ts
index 19e4721f7b8..c8c56ad81dc 100644
--- a/apps/learn/scripts/build-llms-txt.ts
+++ b/apps/learn/scripts/build-llms-txt.ts
@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'path'
 
-const BASE_URL = 'https://supabase.com/ui/docs'
+const BASE_URL = 'https://supabase.com/library/docs'
 
 interface DocMeta {
   title: string
diff --git a/apps/studio/TANSTACK_MIGRATION.md b/apps/studio/TANSTACK_MIGRATION.md
index 410932b3e8c..3253c7a0a49 100644
--- a/apps/studio/TANSTACK_MIGRATION.md
+++ b/apps/studio/TANSTACK_MIGRATION.md
@@ -577,8 +577,8 @@ for the Vite pipeline:
 
 - `pnpm-workspace.yaml` catalog now includes `@tanstack/react-router`,
   `@tanstack/react-start`, `@tanstack/react-table` so studio and
-  ui-library stay aligned. `react-query` is **not** in the catalog yet
-  — three consumers (studio, docs, ui-library) sit on different 5.x
+  library stay aligned. `react-query` is **not** in the catalog yet
+  — three consumers (studio, docs, library) sit on different 5.x
   ranges and unifying them is a separate decision.
 - `NODE_OPTIONS=--max-old-space-size=8192` is set on the studio
   `dev` script — Vite's Rolldown-RC frontend hits the default 4 GB
diff --git a/apps/studio/components/interfaces/ConnectSheet/connect.schema.ts b/apps/studio/components/interfaces/ConnectSheet/connect.schema.ts
index dccc9ad38cb..e04b96085c7 100644
--- a/apps/studio/components/interfaces/ConnectSheet/connect.schema.ts
+++ b/apps/studio/components/interfaces/ConnectSheet/connect.schema.ts
@@ -95,8 +95,8 @@ const frameworkReactFilesStep: StepDefinition = {
 
 const frameworkShadcnStep: StepDefinition = {
   id: 'shadcn-add',
-  title: 'Add Supabase UI components',
-  description: 'Install Supabase UI components via the shadcn registry.',
+  title: 'Add Supabase Library blocks',
+  description: 'Install Supabase Library blocks via the shadcn registry.',
   content: 'steps/shadcn/command',
 }
 
@@ -322,7 +322,7 @@ export const connectSchema: ConnectSchema = {
       id: 'frameworkUi',
       type: 'switch',
       label: 'Shadcn',
-      description: 'Install Supabase UI components with shadcn.',
+      description: 'Install Supabase Library blocks with shadcn.',
       defaultValue: false,
       dependsOn: { framework: ['nextjs', 'react'] },
     },
diff --git a/apps/studio/components/interfaces/ConnectSheet/content/steps/shadcn/command/content.tsx b/apps/studio/components/interfaces/ConnectSheet/content/steps/shadcn/command/content.tsx
index 349cfa824da..f43e6a3a73b 100644
--- a/apps/studio/components/interfaces/ConnectSheet/content/steps/shadcn/command/content.tsx
+++ b/apps/studio/components/interfaces/ConnectSheet/content/steps/shadcn/command/content.tsx
@@ -34,7 +34,7 @@ function ShadcnCommandContent({ state }: StepContentProps) {
       </CodeBlock>
       <p className="text-sm text-foreground-lighter">
         Add UI components for auth, realtime, storage, and more at{' '}
-        <InlineLink href="https://supabase.com/ui">supabase.com/ui</InlineLink>.
+        <InlineLink href="https://supabase.com/library">supabase.com/library</InlineLink>.
       </p>
     </div>
   )
diff --git a/apps/ui-library/.env b/apps/ui-library/.env
index 649a669b5d6..d9a832ee37a 100644
--- a/apps/ui-library/.env
+++ b/apps/ui-library/.env
@@ -1,6 +1,6 @@
 # Default to local supabase for local development
 NEXT_PUBLIC_SUPABASE_URL=http://localhost:54321
 NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0
-NEXT_PUBLIC_BASE_PATH=/ui
+NEXT_PUBLIC_BASE_PATH=/library
 NEXT_PUBLIC_API_URL="http://localhost:8080/platform"
 NEXT_PUBLIC_GOTRUE_URL="http://localhost:8000/auth/v1"
\ No newline at end of file
diff --git a/apps/ui-library/app/(app)/page.tsx b/apps/ui-library/app/(app)/page.tsx
index 9dc1778a06e..3be4fc30c52 100644
--- a/apps/ui-library/app/(app)/page.tsx
+++ b/apps/ui-library/app/(app)/page.tsx
@@ -39,11 +39,11 @@ export default function Home() {
                 <div className="flex flex-col gap-8 justify-start pt-16 md:pt-32">
                   <div className="max-w-2xl">
                     <h1 className="text-4xl text-foreground mb-3 font-medium tracking-tight">
-                      UI Blocks for Supabase Projects
+                      Blocks for Supabase Projects
                     </h1>
                     <h2 className="text-lg text-foreground-light mb-4">
-                      A collection of React components and blocks built on the shadcn/ui library
-                      that connect your front-end to your Supabase back-end via a single command.
+                      A collection of components, blocks, and developer tools that connect your
+                      project to Supabase via a single command.
                     </h2>
                     <div className="flex gap-3 mt-4">
                       <Button_Shadcn_ variant="secondary" size="lg">
diff --git a/apps/ui-library/app/layout.tsx b/apps/ui-library/app/layout.tsx
index 3561e4d7dab..ca788a6c7ab 100644
--- a/apps/ui-library/app/layout.tsx
+++ b/apps/ui-library/app/layout.tsx
@@ -15,8 +15,8 @@ const inter = Inter({ subsets: ['latin'] })
 const BASE_PATH = process.env.NEXT_PUBLIC_BASE_PATH ?? ''
 
 export const metadata: Metadata = {
-  applicationName: 'Supabase UI Library',
-  title: 'Supabase UI Library',
+  applicationName: 'Supabase Library',
+  title: 'Supabase Library',
   description: 'Provides a library of components for your project',
   metadataBase: new URL('https://supabase.com'),
   icons: genFaviconData(BASE_PATH),
diff --git a/apps/ui-library/components/command-menu.tsx b/apps/ui-library/components/command-menu.tsx
index 64dc08d5d46..c93c59d0f84 100644
--- a/apps/ui-library/components/command-menu.tsx
+++ b/apps/ui-library/components/command-menu.tsx
@@ -62,7 +62,7 @@ export function CommandMenu({ ...props }: DialogProps) {
         onClick={() => setOpen(true)}
         {...props}
       >
-        <span className="hidden lg:inline-flex">Search UI Library...</span>
+        <span className="hidden lg:inline-flex">Search Library...</span>
         <span className="inline-flex lg:hidden">Search...</span>
         <kbd className="pointer-events-none absolute right-[0.3rem] top-[0.3rem] hidden h-5 select-none items-center gap-1 rounded-sm border bg-surface-200 px-1.5 font-mono text-[10px] font-medium opacity-100 sm:flex text-foreground-light">
           <span className="text-sm">⌘</span>K
diff --git a/apps/ui-library/components/side-navigation.tsx b/apps/ui-library/components/side-navigation.tsx
index 21d4a9da468..359467930c2 100644
--- a/apps/ui-library/components/side-navigation.tsx
+++ b/apps/ui-library/components/side-navigation.tsx
@@ -61,7 +61,7 @@ function SideNavigation() {
           <ThemeSwitcherDropdown />
         </div>
         <Link href="/" className="mb-4 block">
-          <h1>Supabase UI Library</h1>
+          <h1>Supabase Library</h1>
         </Link>
         {/* <TopNavigationSearch /> */}
         <CommandMenu />
@@ -76,7 +76,7 @@ function SideNavigation() {
       </div>
       <div className="pb-6">
         <div className="font-mono uppercase text-xs text-foreground-lighter/75 mb-2 px-6 tracking-widest">
-          Blocks
+          UI Blocks
         </div>
         <div className="space-y-0.5">
           {/* Render items based on component definitions */}
diff --git a/apps/ui-library/components/site-footer.tsx b/apps/ui-library/components/site-footer.tsx
index 739de9f1abc..26331bf56a8 100644
--- a/apps/ui-library/components/site-footer.tsx
+++ b/apps/ui-library/components/site-footer.tsx
@@ -14,7 +14,7 @@ export function SiteFooter() {
           </a>
           . The source code is available on{' '}
           <a
-            href="https://github.com/supabase/supabase/tree/master/apps/ui-library"
+            href="https://github.com/supabase/supabase/tree/master/apps/library"
             target="_blank"
             rel="noreferrer"
             className="font-medium underline underline-offset-4 hover:text-foreground-lighter"
diff --git a/apps/ui-library/components/tanstack-beta.tsx b/apps/ui-library/components/tanstack-beta.tsx
index 70cc58f951d..89da1a6e489 100644
--- a/apps/ui-library/components/tanstack-beta.tsx
+++ b/apps/ui-library/components/tanstack-beta.tsx
@@ -11,8 +11,8 @@ export default function TanStackBeta() {
             <TriangleAlert />
             Heads up: TanStack Start is in beta.
           </div>
-          We&apos;re excited to support TanStack Start in our UI library! But since it&apos;s still
-          in beta, things may change quickly — expect breaking changes and some rough edges.
+          We&apos;re excited to support TanStack Start in Supabase Library! But since it&apos;s
+          still in beta, things may change quickly — expect breaking changes and some rough edges.
           We&apos;ll do our best to keep up and make integration with Supabase as smooth as
           possible. If you run into issues, have a look at the TanStack docs.
           <a
diff --git a/apps/ui-library/components/tanstack-db-generator/index.tsx b/apps/ui-library/components/tanstack-db-generator/index.tsx
index 3c72fefe83c..9add99458f8 100644
--- a/apps/ui-library/components/tanstack-db-generator/index.tsx
+++ b/apps/ui-library/components/tanstack-db-generator/index.tsx
@@ -14,11 +14,11 @@ const LOCAL_STORAGE_KEY = 'package-manager-tanstack-db'
 
 const getBaseUrl = () => {
   if (process.env.NEXT_PUBLIC_VERCEL_TARGET_ENV === 'production') {
-    return 'https://supabase.com/ui'
+    return 'https://supabase.com/library'
   } else if (process.env.NEXT_PUBLIC_VERCEL_TARGET_ENV === 'preview') {
     return `https://${process.env.NEXT_PUBLIC_VERCEL_BRANCH_URL}`
   } else {
-    return 'http://localhost:3004/ui'
+    return 'http://localhost:3004/library'
   }
 }
 
diff --git a/apps/ui-library/content/docs/getting-started/faq.mdx b/apps/ui-library/content/docs/getting-started/faq.mdx
index d0788fa82d8..52428e6c0cd 100644
--- a/apps/ui-library/content/docs/getting-started/faq.mdx
+++ b/apps/ui-library/content/docs/getting-started/faq.mdx
@@ -9,7 +9,7 @@ description: Frequently asked questions
     <AccordionContent>
       You run a command in a new or existing project that looks something like this:
       ```bash
-      npx shadcn@latest add http://supabase.com/ui/r/password-based-auth-nextjs.json
+      npx shadcn@latest add https://supabase.com/library/r/password-based-auth-nextjs.json
       ```
         This will add all of the files to your project and install the dependencies.
       After you've run the command, you can start using the components. In the case of Auth, you should be up and running with user sign in/sign up with just this one command.
@@ -55,7 +55,7 @@ description: Frequently asked questions
       <AccordionContent>
         No. You don't need to start with one of our framework quickstarts.
 
-        If you already have an existing project, you can just add the components in this library to your project. If you're starting from scratch, you should use one of the shadcn/ui setup guides for your framework of choice via the [Quickstart](/ui/docs/getting-started/quickstart) page.
+        If you already have an existing project, you can just add the components in this library to your project. If you're starting from scratch, you should use one of the shadcn/ui setup guides for your framework of choice via the [Quickstart](/library/docs/getting-started/quickstart) page.
       </AccordionContent>
     </AccordionItem>
     <AccordionItem value="ai-builder">
@@ -67,13 +67,13 @@ description: Frequently asked questions
       </AccordionContent>
     </AccordionItem>
     <AccordionItem value="react-only">
-      <AccordionTrigger>Why is this library React-only?</AccordionTrigger>
+      <AccordionTrigger>Why are many UI blocks React-only?</AccordionTrigger>
       <AccordionContent>
         Several reasons.
 
-        First, we use React ourselves and know the ecosystem really well. That makes this ui library easy for us to build and maintain.
+        First, we use React ourselves and know the ecosystem really well. That makes these UI blocks easy for us to build and maintain.
 
-        Second, this library is really just stitching together a bunch of existing shadcn/ui and internal components into Supabase-specific workflows. It's not technically a brand new, from the ground up ui library—it's using an established tool in shadcn/ui.
+        Second, the UI portion of the library stitches together existing shadcn/ui and internal components into Supabase-specific workflows. It builds on an established tool rather than creating a new UI framework from the ground up.
 
         Last, it's a way for us to better distribute components that we already had out there in different places (our docs and guides, different framework quickstarts, etc)
 
diff --git a/apps/ui-library/content/docs/getting-started/introduction.mdx b/apps/ui-library/content/docs/getting-started/introduction.mdx
index bc2cd067f34..493c8ae3680 100644
--- a/apps/ui-library/content/docs/getting-started/introduction.mdx
+++ b/apps/ui-library/content/docs/getting-started/introduction.mdx
@@ -1,11 +1,11 @@
 ---
 title: Introduction
-description: A flexible, open-source, React-based UI component library built on shadcn/ui, designed to simplify Supabase-powered projects with pre-built Auth, Storage, and Realtime features.
+description: A flexible, open-source collection of Supabase components, blocks, and developer tools built on shadcn/ui and other portable foundations.
 ---
 
-Our Supabase UI component library is a set of components built on top of the shadcn/ui registry system. It's designed to make building new or existing Supabase-powered projects faster and easier by providing pre-built solutions for common but challenging features—such as authentication, file uploads, and real-time updates.
+Supabase Library is a collection of UI components, full-featured blocks, and headless developer tools for Supabase projects. Many items build on the shadcn/ui registry system, while others—such as MCP blocks—ship portable integrations without a front end. It is designed to make new and existing Supabase-powered projects faster to build with ready-to-use solutions for authentication, file uploads, real-time updates, and more.
 
-Our Supabase UI library aims to solve these issues with:
+Supabase Library aims to solve these issues with:
 
 - **Extensible components**: Modify and extend simple primitives as needed.
 
diff --git a/apps/ui-library/content/docs/getting-started/quickstart.mdx b/apps/ui-library/content/docs/getting-started/quickstart.mdx
index fb50f1c7b51..20997eb5e5e 100644
--- a/apps/ui-library/content/docs/getting-started/quickstart.mdx
+++ b/apps/ui-library/content/docs/getting-started/quickstart.mdx
@@ -74,4 +74,4 @@ When you've finished setting up shadcn/ui, you can start exploring the component
 
 If you encounter issues, try deleting your existing `components.json` file and follow one of the guides to reset your setup.
 
-For issues and questions about specific frameworks, see the [FAQs](/ui/docs/getting-started/faq)
+For issues and questions about specific frameworks, see the [FAQs](/library/docs/getting-started/faq)
diff --git a/apps/ui-library/content/docs/nextjs/client.mdx b/apps/ui-library/content/docs/nextjs/client.mdx
index 10e7245ace5..f3f53a0aea7 100644
--- a/apps/ui-library/content/docs/nextjs/client.mdx
+++ b/apps/ui-library/content/docs/nextjs/client.mdx
@@ -33,7 +33,7 @@ NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY=
 <Callout type="warning" className="mt-4">
   {' '}
   This Supabase client is built for SSR with the Next.js App Router. If you're building a React SPA,
-  use the [React SPA client](/ui/docs/react-router/client) instead.{' '}
+  use the [React SPA client](/library/docs/react-router/client) instead.{' '}
 </Callout>
 
 ## Further reading
diff --git a/apps/ui-library/content/docs/nextjs/password-based-auth.mdx b/apps/ui-library/content/docs/nextjs/password-based-auth.mdx
index 1c48c7c6a50..9ffa9b401bf 100644
--- a/apps/ui-library/content/docs/nextjs/password-based-auth.mdx
+++ b/apps/ui-library/content/docs/nextjs/password-based-auth.mdx
@@ -14,7 +14,7 @@ description: Password-based authentication block for Next.js
 
 ## Folder structure
 
-This block includes the [Supabase client](/ui/docs/nextjs/client). If you already have one installed, you can skip overwriting it.
+This block includes the [Supabase client](/library/docs/nextjs/client). If you already have one installed, you can skip overwriting it.
 
 <RegistryBlock itemName="password-based-auth-nextjs" />
 
diff --git a/apps/ui-library/content/docs/nextjs/social-auth.mdx b/apps/ui-library/content/docs/nextjs/social-auth.mdx
index 114c60bb717..d64a3af2016 100644
--- a/apps/ui-library/content/docs/nextjs/social-auth.mdx
+++ b/apps/ui-library/content/docs/nextjs/social-auth.mdx
@@ -16,7 +16,7 @@ description: Social authentication block for Next.js
 
 ## Folder structure
 
-This block includes the [Supabase client](/ui/docs/nextjs/client). If you already have one installed, you can skip overwriting it.
+This block includes the [Supabase client](/library/docs/nextjs/client). If you already have one installed, you can skip overwriting it.
 
 <RegistryBlock itemName="social-auth-nextjs" />
 
diff --git a/apps/ui-library/content/docs/nuxtjs/client.mdx b/apps/ui-library/content/docs/nuxtjs/client.mdx
index e5a39cd5606..9eb258de305 100644
--- a/apps/ui-library/content/docs/nuxtjs/client.mdx
+++ b/apps/ui-library/content/docs/nuxtjs/client.mdx
@@ -35,7 +35,7 @@ NUXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY=
 <Callout type="warning" className="mt-4">
   {' '}
   This Supabase client is built for SSR with the Nuxt.js. If you're building a Vue SPA, use the [Vue
-  SPA client](/ui/docs/vue/client) instead.{' '}
+  SPA client](/library/docs/vue/client) instead.{' '}
 </Callout>
 
 ## Further reading
diff --git a/apps/ui-library/content/docs/react-router/password-based-auth.mdx b/apps/ui-library/content/docs/react-router/password-based-auth.mdx
index b392ef84e08..a9ed3bf7d8a 100644
--- a/apps/ui-library/content/docs/react-router/password-based-auth.mdx
+++ b/apps/ui-library/content/docs/react-router/password-based-auth.mdx
@@ -14,7 +14,7 @@ description: Password-based authentication block for React Router
 
 ## Folder structure
 
-This block includes the [Supabase client](/ui/docs/react-router/client). If you already have one installed, you can skip overwriting it.
+This block includes the [Supabase client](/library/docs/react-router/client). If you already have one installed, you can skip overwriting it.
 
 <RegistryBlock itemName="password-based-auth-react-router" />
 
diff --git a/apps/ui-library/content/docs/react-router/social-auth.mdx b/apps/ui-library/content/docs/react-router/social-auth.mdx
index b0689a4f52d..43df26c08c5 100644
--- a/apps/ui-library/content/docs/react-router/social-auth.mdx
+++ b/apps/ui-library/content/docs/react-router/social-auth.mdx
@@ -19,7 +19,7 @@ description: Social authentication block for React Router
 
 ## Folder structure
 
-This block includes the [Supabase client](/ui/docs/react-router/client). If you already have one installed, you can skip overwriting it.
+This block includes the [Supabase client](/library/docs/react-router/client). If you already have one installed, you can skip overwriting it.
 
 <RegistryBlock itemName="social-auth-react-router" />
 
diff --git a/apps/ui-library/content/docs/react/password-based-auth.mdx b/apps/ui-library/content/docs/react/password-based-auth.mdx
index 5b69ac6ca96..93c26e42ccb 100644
--- a/apps/ui-library/content/docs/react/password-based-auth.mdx
+++ b/apps/ui-library/content/docs/react/password-based-auth.mdx
@@ -14,7 +14,7 @@ description: Password-based authentication block for React Single Page Applicati
 
 ## Folder structure
 
-This block includes the [Supabase client](/ui/docs/react/client). If you already have one installed, you can skip overwriting it.
+This block includes the [Supabase client](/library/docs/react/client). If you already have one installed, you can skip overwriting it.
 
 <RegistryBlock itemName="password-based-auth-react" />
 
diff --git a/apps/ui-library/content/docs/react/social-auth.mdx b/apps/ui-library/content/docs/react/social-auth.mdx
index 3d617f35e06..5319a66c29c 100644
--- a/apps/ui-library/content/docs/react/social-auth.mdx
+++ b/apps/ui-library/content/docs/react/social-auth.mdx
@@ -16,7 +16,7 @@ description: Social authentication block for React Single Page Applications
 
 ## Folder structure
 
-This block includes the [Supabase client](/ui/docs/react/client). If you already have one installed, you can skip overwriting it.
+This block includes the [Supabase client](/library/docs/react/client). If you already have one installed, you can skip overwriting it.
 
 <RegistryBlock itemName="social-auth-react" />
 
diff --git a/apps/ui-library/content/docs/tanstack/password-based-auth.mdx b/apps/ui-library/content/docs/tanstack/password-based-auth.mdx
index 143ed625567..ff03760e519 100644
--- a/apps/ui-library/content/docs/tanstack/password-based-auth.mdx
+++ b/apps/ui-library/content/docs/tanstack/password-based-auth.mdx
@@ -11,7 +11,7 @@ description: Password-based authentication block for TanStack Start
 
 ## Folder structure
 
-This block includes the [Supabase client](/ui/docs/tanstack/client). If you already have one installed, you can skip overwriting it.
+This block includes the [Supabase client](/library/docs/tanstack/client). If you already have one installed, you can skip overwriting it.
 
 <RegistryBlock itemName="password-based-auth-tanstack" />
 
diff --git a/apps/ui-library/content/docs/tanstack/social-auth.mdx b/apps/ui-library/content/docs/tanstack/social-auth.mdx
index 5081ff963d8..6b82ab8c8c5 100644
--- a/apps/ui-library/content/docs/tanstack/social-auth.mdx
+++ b/apps/ui-library/content/docs/tanstack/social-auth.mdx
@@ -16,7 +16,7 @@ description: Social authentication block for Tanstack Start
 
 ## Folder structure
 
-This block includes the [Supabase client](/ui/docs/tanstack/client). If you already have one installed, you can skip overwriting it.
+This block includes the [Supabase client](/library/docs/tanstack/client). If you already have one installed, you can skip overwriting it.
 
 <RegistryBlock itemName="social-auth-tanstack" />
 
diff --git a/apps/ui-library/package.json b/apps/ui-library/package.json
index 62abc5c3b9e..7c3873babad 100644
--- a/apps/ui-library/package.json
+++ b/apps/ui-library/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "ui-library",
+  "name": "library",
   "version": "0.1.0",
   "private": true,
   "type": "module",
diff --git a/apps/ui-library/public/r/registry.json b/apps/ui-library/public/r/registry.json
index 88384326720..6968fddc64a 100644
--- a/apps/ui-library/public/r/registry.json
+++ b/apps/ui-library/public/r/registry.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://ui.shadcn.com/schema/registry.json",
-  "name": "Supabase UI Library",
-  "homepage": "https://supabase.com/ui",
+  "name": "Supabase Library",
+  "homepage": "https://supabase.com/library",
   "items": [
     {
       "name": "password-based-auth-nextjs",
@@ -2651,4 +2651,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/apps/ui-library/registry/default/components/ui/link.tsx b/apps/ui-library/registry/default/components/ui/link.tsx
index cdac52926b3..62f5a54c23a 100644
--- a/apps/ui-library/registry/default/components/ui/link.tsx
+++ b/apps/ui-library/registry/default/components/ui/link.tsx
@@ -2,7 +2,7 @@ import { type ComponentPropsWithoutRef } from 'react'
 import { cn } from 'ui'
 
 export function Link({ className, href, ...props }: ComponentPropsWithoutRef<'a'>) {
-  // A simplified link component for UI Library examples
+  // A simplified link component for Supabase Library examples
   // Renders as a regular <a> tag to support iframe base path routing
   // Remove leading slash for relative paths to work with base tag
   const relativeHref = href?.startsWith('/') ? href.slice(1) : href
diff --git a/apps/ui-library/registry/default/fixtures/lib/supabase/client.ts b/apps/ui-library/registry/default/fixtures/lib/supabase/client.ts
index 6fca173f0c0..b12150d7715 100644
--- a/apps/ui-library/registry/default/fixtures/lib/supabase/client.ts
+++ b/apps/ui-library/registry/default/fixtures/lib/supabase/client.ts
@@ -2,7 +2,7 @@ import { createBrowserClient } from '@supabase/ssr'
 
 import { Database } from '../../database.types'
 
-// This client is meant to be used for demo purposes only. It has types from the Supabase project in the ui-library app.
+// This client is meant to be used for demo purposes only. It has types from the Supabase project in the library app.
 export function createClient() {
   return createBrowserClient<Database>(
     process.env.NEXT_PUBLIC_SUPABASE_URL!,
diff --git a/apps/ui-library/registry/index.ts b/apps/ui-library/registry/index.ts
index 75b83c50909..ac1d6791ede 100644
--- a/apps/ui-library/registry/index.ts
+++ b/apps/ui-library/registry/index.ts
@@ -7,8 +7,8 @@ import { platform } from './platform'
 import { examples } from '@/registry/examples'
 
 export const registry = {
-  name: 'Supabase UI Library',
-  homepage: 'https://supabase.com/ui',
+  name: 'Supabase Library',
+  homepage: 'https://supabase.com/library',
   items: [
     ...blocks,
     ...clients,
diff --git a/apps/ui-library/scripts/build-llms-txt.ts b/apps/ui-library/scripts/build-llms-txt.ts
index a935f25e406..a3c533d2c38 100644
--- a/apps/ui-library/scripts/build-llms-txt.ts
+++ b/apps/ui-library/scripts/build-llms-txt.ts
@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'path'
 
-const BASE_URL = 'https://supabase.com/ui/docs'
+const BASE_URL = 'https://supabase.com/library/docs'
 
 interface DocMeta {
   title: string
@@ -77,7 +77,7 @@ function getDocFiles(): DocMeta[] {
 
 // Generate the llms.txt content
 const docs = getDocFiles()
-let content = `# Supabase UI Library
+let content = `# Supabase Library
 Last updated: ${new Date().toISOString()}
 
 ## Overview
diff --git a/apps/ui-library/supabase/config.toml b/apps/ui-library/supabase/config.toml
index bad426d3446..abd1b882e95 100644
--- a/apps/ui-library/supabase/config.toml
+++ b/apps/ui-library/supabase/config.toml
@@ -2,7 +2,7 @@
 # https://supabase.com/docs/guides/local-development/cli/config
 # A string used to distinguish different Supabase projects on the same host. Defaults to the
 # working directory name when running `supabase init`.
-project_id = "ui-library"
+project_id = "library"
 
 [api]
 enabled = true
diff --git a/apps/www/.env b/apps/www/.env
index ec35e2283db..cec21042802 100644
--- a/apps/www/.env
+++ b/apps/www/.env
@@ -8,5 +8,5 @@ NEXT_PUBLIC_URL="http://localhost:3000"
 NEXT_PUBLIC_DOCS_URL="http://localhost:3001"
 NEXT_PUBLIC_STUDIO_URL="http://localhost:8082"
 NEXT_PUBLIC_REFERENCE_DOCS_URL="http://localhost:3010"
-NEXT_PUBLIC_UI_LIBRARY_URL="http://localhost:3004"
+NEXT_PUBLIC_LIBRARY_URL="http://localhost:3004"
 NEXT_PUBLIC_DESIGN_SYSTEM_URL="http://localhost:3003"
diff --git a/apps/www/_blog/2025-03-31-supabase-ui-library.mdx b/apps/www/_blog/2025-03-31-supabase-ui-library.mdx
index a95743bb1b3..914507c201d 100644
--- a/apps/www/_blog/2025-03-31-supabase-ui-library.mdx
+++ b/apps/www/_blog/2025-03-31-supabase-ui-library.mdx
@@ -14,7 +14,7 @@ toc_depth: 3
 launchweek: '14'
 ---
 
-We're excited to release an [official Supabase UI Library](https://supabase.com/ui)—a collection of ready-to-use components built on top of [shadcn/ui](https://ui.shadcn.com/). Designed for flexibility, these components can be dropped into any Next.js, React Router, TanStack Start, or plain React app.
+We're excited to release an [official Supabase UI Library](https://supabase.com/library)—a collection of ready-to-use components built on top of [shadcn/ui](https://ui.shadcn.com/). Designed for flexibility, these components can be dropped into any Next.js, React Router, TanStack Start, or plain React app.
 
 <div className="video-container mb-8">
   <iframe
@@ -54,13 +54,13 @@ It's designed to take both the time and the pain out of building complex functio
 
 ## What's included?
 
-- [Supabase client](https://supabase.com/ui/docs/nextjs/client) initialization for client-side and server-side use
-- [Password-based authentication](https://supabase.com/ui/docs/nextjs/password-based-auth)
-- [File Upload Dropzone](https://supabase.com/ui/docs/nextjs/dropzone)
-- [Realtime Cursor Sharing](https://supabase.com/ui/docs/nextjs/realtime-cursor)
-- [Current User Avatar](https://supabase.com/ui/docs/nextjs/current-user-avatar)
-- [Realtime Avatar Stack](https://supabase.com/ui/docs/nextjs/realtime-avatar-stack)
-- [Realtime Chat](https://supabase.com/ui/docs/tanstack/realtime-chat)
+- [Supabase client](https://supabase.com/library/docs/nextjs/client) initialization for client-side and server-side use
+- [Password-based authentication](https://supabase.com/library/docs/nextjs/password-based-auth)
+- [File Upload Dropzone](https://supabase.com/library/docs/nextjs/dropzone)
+- [Realtime Cursor Sharing](https://supabase.com/library/docs/nextjs/realtime-cursor)
+- [Current User Avatar](https://supabase.com/library/docs/nextjs/current-user-avatar)
+- [Realtime Avatar Stack](https://supabase.com/library/docs/nextjs/realtime-avatar-stack)
+- [Realtime Chat](https://supabase.com/library/docs/tanstack/realtime-chat)
 
 We intend to release more Supabase UI Library components, and we'd love to get your feedback. Got a favorite component you want for your applications? Let us know on [X](https://x.com/supabase) or [Discord](https://discord.supabase.com/), or we'd be happy to get a [pull request](https://github.com/supabase/supabase).
 
@@ -158,4 +158,4 @@ Alongside our UI components, we're also shipping a curated set of LLM rules tail
 
 Skip the boilerplate and long setup times—focus on what really matters: building and shipping fast. Explore the Supabase UI Component Library, drop it into your projects, and let us know what you think. Be sure to [submit components](https://github.com/orgs/supabase/discussions/34578) you want to see next!
 
-Visit the [Supabase UI Library](https://supabase.com/ui).
+Visit the [Supabase UI Library](https://supabase.com/library).
diff --git a/apps/www/_blog/2025-07-14-supabase-ui-platform-kit.mdx b/apps/www/_blog/2025-07-14-supabase-ui-platform-kit.mdx
index 776e07be486..2e69813121f 100644
--- a/apps/www/_blog/2025-07-14-supabase-ui-platform-kit.mdx
+++ b/apps/www/_blog/2025-07-14-supabase-ui-platform-kit.mdx
@@ -93,7 +93,7 @@ Display all the data in your database:
 
 ## How does Supabase UI work?
 
-The library is 100% shadcn/ui compatible by leveraging the [component registry](https://x.com/shadcn/status/1829646556318089509) feature. Components are styled with shadcn/ui and Tailwind CSS and are completely customizable. Read the [original launch post](https://supabase.com/blog/supabase-ui-library) for more details, or check out the docs: [ui.supabase.com](https://supabase.com/ui)
+The library is 100% shadcn/ui compatible by leveraging the [component registry](https://x.com/shadcn/status/1829646556318089509) feature. Components are styled with shadcn/ui and Tailwind CSS and are completely customizable. Read the [original launch post](https://supabase.com/blog/supabase-ui-library) for more details, or check out the docs: [supabase.com/library](https://supabase.com/library)
 
 ## Supabase for Platforms
 
@@ -116,6 +116,6 @@ If you’re building your own plaform, reach out to the team: [supabase.com/solu
 
 ## Getting started with Platform UI
 
-Head on over to the docs to get started: [ui.supabase.com](https://supabase.com/ui/docs/platform/platform-kit)
+Head on over to the docs to get started: [ui.supabase.com](https://supabase.com/library/docs/platform/platform-kit)
 
 You can also check out the [repo](https://github.com/supabase/supabase/tree/master/apps/ui-library/registry/default/platform) to download and run the app yourself to see how it works, or just pull key files and components to use in your own implementation. The code is yours to use and improve however you see fit.
diff --git a/apps/www/_blog/2025-12-05-introducing-supabase-for-platforms.mdx b/apps/www/_blog/2025-12-05-introducing-supabase-for-platforms.mdx
index 22d99032e01..88d8b0368e6 100644
--- a/apps/www/_blog/2025-12-05-introducing-supabase-for-platforms.mdx
+++ b/apps/www/_blog/2025-12-05-introducing-supabase-for-platforms.mdx
@@ -128,9 +128,9 @@ Create ephemeral development environments for each project using branching. Your
   />
 </div>
 
-We built [Platform Kit](/ui/docs/platform/platform-kit), a collection of UI components for the Management API. Embed a lightweight version of the Supabase Dashboard directly in your app. Your users can manage their backend without leaving your product.
+We built [Platform Kit](/library/docs/platform/platform-kit), a collection of UI components for the Management API. Embed a lightweight version of the Supabase Dashboard directly in your app. Your users can manage their backend without leaving your product.
 
-[Docs](/ui/docs/platform/platform-kit)
+[Docs](/library/docs/platform/platform-kit)
 
 # Features available to select AI Builders
 
diff --git a/apps/www/components/Wrapped/Pages/ProductAnnouncements.tsx b/apps/www/components/Wrapped/Pages/ProductAnnouncements.tsx
index 1736bf4ab8d..26042654799 100644
--- a/apps/www/components/Wrapped/Pages/ProductAnnouncements.tsx
+++ b/apps/www/components/Wrapped/Pages/ProductAnnouncements.tsx
@@ -144,11 +144,11 @@ const months: Month[] = [
       },
       {
         title: 'Supabase UI Library now includes Infinite Query block',
-        url: 'https://supabase.com/ui/docs/infinite-query-hook',
+        url: 'https://supabase.com/library/docs/infinite-query-hook',
       },
       {
         title: 'Supabase UI Library now includes Social Auth',
-        url: 'https://supabase.com/ui/docs/nextjs/social-auth',
+        url: 'https://supabase.com/library/docs/nextjs/social-auth',
       },
       {
         title: 'New SOC2 Report',
diff --git a/apps/www/data/Developers.tsx b/apps/www/data/Developers.tsx
index 0175611b7e4..b78144c2dc6 100644
--- a/apps/www/data/Developers.tsx
+++ b/apps/www/data/Developers.tsx
@@ -25,8 +25,8 @@ export const data = {
           icon: () => <Pencil className="w-4 h-4" />,
         },
         {
-          text: 'Supabase UI',
-          url: 'https://supabase.com/ui',
+          text: 'Supabase Library',
+          url: 'https://supabase.com/library',
           icon: (props: any) => (
             <svg
               width="17"
diff --git a/apps/www/data/Footer.ts b/apps/www/data/Footer.ts
index cb5a27a3498..a14a12bed43 100644
--- a/apps/www/data/Footer.ts
+++ b/apps/www/data/Footer.ts
@@ -122,8 +122,8 @@ const footerData = [
         url: '/docs',
       },
       {
-        text: 'Supabase UI',
-        url: 'https://supabase.com/ui',
+        text: 'Supabase Library',
+        url: 'https://supabase.com/library',
       },
       {
         text: 'Changelog',
diff --git a/apps/www/lib/redirects.js b/apps/www/lib/redirects.js
index 866bef5ec9e..5ea900cc4bc 100644
--- a/apps/www/lib/redirects.js
+++ b/apps/www/lib/redirects.js
@@ -34,6 +34,16 @@ module.exports = [
     source: '/ui/docs/ai-editors-rules/skills',
     destination: '/docs/guides/ai-tools/ai-skills',
   },
+  {
+    permanent: true,
+    source: '/ui',
+    destination: '/library',
+  },
+  {
+    permanent: true,
+    source: '/ui/:path*',
+    destination: '/library/:path*',
+  },
   {
     permanent: true,
     source: '/auth/Auth',
diff --git a/apps/www/lib/rewrites.js b/apps/www/lib/rewrites.js
index 667de3dca48..281cc30bc86 100644
--- a/apps/www/lib/rewrites.js
+++ b/apps/www/lib/rewrites.js
@@ -1,3 +1,5 @@
+const LIBRARY_URL = process.env.NEXT_PUBLIC_LIBRARY_URL ?? process.env.NEXT_PUBLIC_UI_LIBRARY_URL
+
 const rewrites = [
   {
     source: '/:path*',
@@ -22,12 +24,12 @@ const rewrites = [
       ]
     : []),
   {
-    source: '/ui',
-    destination: `${process.env.NEXT_PUBLIC_UI_LIBRARY_URL}`,
+    source: '/library',
+    destination: `${LIBRARY_URL}`,
   },
   {
-    source: '/ui/:path*',
-    destination: `${process.env.NEXT_PUBLIC_UI_LIBRARY_URL}/:path*`,
+    source: '/library/:path*',
+    destination: `${LIBRARY_URL}/:path*`,
   },
   {
     source: '/design-system',
diff --git a/apps/www/next.config.test.ts b/apps/www/next.config.test.ts
index 832543fa7e2..b2faa5925af 100644
--- a/apps/www/next.config.test.ts
+++ b/apps/www/next.config.test.ts
@@ -23,4 +23,30 @@ describe('next.config.mjs', () => {
       ])
     )
   })
+
+  it('routes the library and permanently redirects the legacy UI URLs', async () => {
+    const { default: config } = (await import('./next.config.mjs')) as { default: NextConfig }
+    const rewrites = (await config.rewrites?.()) || []
+    const redirects = (await config.redirects?.()) || []
+
+    expect(rewrites).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ source: '/library' }),
+        expect.objectContaining({ source: '/library/:path*' }),
+      ])
+    )
+    expect(redirects).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ source: '/ui', destination: '/library', permanent: true }),
+        expect.objectContaining({
+          source: '/ui/:path*',
+          destination: '/library/:path*',
+          permanent: true,
+        }),
+      ])
+    )
+    expect(
+      redirects.findIndex((redirect) => redirect.source === '/ui/docs/ai-editors-rules/prompts')
+    ).toBeLessThan(redirects.findIndex((redirect) => redirect.source === '/ui/:path*'))
+  })
 })
diff --git a/apps/www/turbo.jsonc b/apps/www/turbo.jsonc
index 728b752ffc1..ea5a9af80f3 100644
--- a/apps/www/turbo.jsonc
+++ b/apps/www/turbo.jsonc
@@ -20,6 +20,8 @@
         "NEXT_PUBLIC_STUDIO_URL",
         "NEXT_PUBLIC_DOCS_URL",
         "NEXT_PUBLIC_REFERENCE_DOCS_URL",
+        "NEXT_PUBLIC_LIBRARY_URL",
+        // Temporary fallback during the production environment-variable migration.
         "NEXT_PUBLIC_UI_LIBRARY_URL",
         "NEXT_PUBLIC_SUPABASE_URL",
         "NEXT_PUBLIC_SUPABASE_ANON_KEY",
diff --git a/packages/common/telemetry-constants.ts b/packages/common/telemetry-constants.ts
index 236e0309e1e..c46f2bb96e3 100644
--- a/packages/common/telemetry-constants.ts
+++ b/packages/common/telemetry-constants.ts
@@ -1853,7 +1853,7 @@ export interface AssistantMessageRatingSubmittedEvent {
  *
  * @group Events
  * @source supabase-ui
- * @page /ui/docs/{framework}/{templateTitle}
+ * @page /library/docs/{framework}/{templateTitle}
  */
 export interface SupabaseUiCommandCopyButtonClickedEvent {
   action: 'supabase_ui_command_copy_button_clicked'