diff --git a/apps/web-next/package.json b/apps/web-next/package.json
index 2dd7148..7ac6630 100644
--- a/apps/web-next/package.json
+++ b/apps/web-next/package.json
@@ -21,6 +21,7 @@
     "@repo/media": "workspace:*",
     "@repo/navigation": "workspace:*",
     "@tanstack/react-query": "^5.66.0",
+    "@trpc/server": "^11.0.0",
     "next": "^15.3.0",
     "payload": "^3.14.0",
     "react": "^19.0.0",
diff --git a/apps/web-next/src/app/api/trpc/[trpc]/route.ts b/apps/web-next/src/app/api/trpc/[trpc]/route.ts
index 376b8c3..fbf179d 100644
--- a/apps/web-next/src/app/api/trpc/[trpc]/route.ts
+++ b/apps/web-next/src/app/api/trpc/[trpc]/route.ts
@@ -1,12 +1,15 @@
 import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
-import { appRouter } from "@repo/api";
+import { appRouter } from "@repo/core-api";
+import { bindAllProduction } from "../../../../server/bind-production";
 
-const handler = (req: Request) =>
-  fetchRequestHandler({
+const handler = async (req: Request) => {
+  await bindAllProduction();
+  return fetchRequestHandler({
     endpoint: "/api/trpc",
     req,
     router: appRouter,
     createContext: () => ({}),
   });
+};
 
 export { handler as GET, handler as POST };
diff --git a/apps/web-next/src/app/providers.tsx b/apps/web-next/src/app/providers.tsx
index c81e7bd..106aba8 100644
--- a/apps/web-next/src/app/providers.tsx
+++ b/apps/web-next/src/app/providers.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { ApiProvider } from "@repo/api-client";
+import { NextTrpcProvider } from "@repo/core-trpc/next";
 
 export function Providers({ children }: { children: React.ReactNode }) {
-  return <ApiProvider trpcUrl="/api/trpc">{children}</ApiProvider>;
+  return <NextTrpcProvider trpcUrl="/api/trpc">{children}</NextTrpcProvider>;
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f75775d..3de3cba 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -139,6 +139,9 @@ importers:
       '@tanstack/react-query':
         specifier: ^5.66.0
         version: 5.96.2(react@19.2.4)
+      '@trpc/server':
+        specifier: ^11.0.0
+        version: 11.16.0(typescript@5.9.3)
       next:
         specifier: ^15.3.0
         version: 15.5.14(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.99.0)