diff --git a/apps/web-tanstack/package.json b/apps/web-tanstack/package.json
index b3abd43..589d140 100644
--- a/apps/web-tanstack/package.json
+++ b/apps/web-tanstack/package.json
@@ -10,9 +10,13 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@repo/api": "workspace:*",
-    "@repo/api-client": "workspace:*",
-    "@repo/ui": "workspace:*",
+    "@repo/blog": "workspace:*",
+    "@repo/core-api": "workspace:*",
+    "@repo/core-trpc": "workspace:*",
+    "@repo/core-ui": "workspace:*",
+    "@repo/marketing-pages": "workspace:*",
+    "@repo/navigation": "workspace:*",
+    "@tanstack/react-query": "^5.66.0",
     "@tanstack/react-router": "^1.120.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
diff --git a/apps/web-tanstack/src/routes/__root.tsx b/apps/web-tanstack/src/routes/__root.tsx
index dee54ac..7cd91cd 100644
--- a/apps/web-tanstack/src/routes/__root.tsx
+++ b/apps/web-tanstack/src/routes/__root.tsx
@@ -1,10 +1,10 @@
 import { Outlet, createRootRoute } from "@tanstack/react-router";
-import { ApiProvider } from "@repo/api-client";
+import { TanstackTrpcProvider } from "@repo/core-trpc/tanstack";
 
 export const Route = createRootRoute({
   component: () => (
-    <ApiProvider trpcUrl="http://localhost:3000/api/trpc">
+    <TanstackTrpcProvider trpcUrl="http://localhost:3000/api/trpc">
       <Outlet />
-    </ApiProvider>
+    </TanstackTrpcProvider>
   ),
 });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3de3cba..f14b2bd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -176,15 +176,27 @@ importers:
 
   apps/web-tanstack:
     dependencies:
-      '@repo/api':
+      '@repo/blog':
         specifier: workspace:*
-        version: link:../../packages/api
-      '@repo/api-client':
+        version: link:../../packages/blog
+      '@repo/core-api':
         specifier: workspace:*
-        version: link:../../packages/api-client
-      '@repo/ui':
+        version: link:../../packages/core-api
+      '@repo/core-trpc':
         specifier: workspace:*
-        version: link:../../packages/ui
+        version: link:../../packages/core-trpc
+      '@repo/core-ui':
+        specifier: workspace:*
+        version: link:../../packages/core-ui
+      '@repo/marketing-pages':
+        specifier: workspace:*
+        version: link:../../packages/marketing-pages
+      '@repo/navigation':
+        specifier: workspace:*
+        version: link:../../packages/navigation
+      '@tanstack/react-query':
+        specifier: ^5.66.0
+        version: 5.96.2(react@19.2.4)
       '@tanstack/react-router':
         specifier: ^1.120.0
         version: 1.168.10(react-dom@19.2.4(react@19.2.4))(react@19.2.4)