diff --git a/apps/server/src/integrations/tanstack-query/devtools.tsx b/apps/server/src/integrations/tanstack-query/devtools.tsx
deleted file mode 100644
index a377fe0..0000000
--- a/apps/server/src/integrations/tanstack-query/devtools.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TanStackDevtoolsReactPlugin } from '@tanstack/react-devtools'
-import { ReactQueryDevtoolsPanel } from '@tanstack/react-query-devtools'
-
-export const devtools = {
-  name: 'TanStack Query',
-  render: <ReactQueryDevtoolsPanel />,
-} satisfies TanStackDevtoolsReactPlugin
diff --git a/apps/server/src/integrations/tanstack-query/index.ts b/apps/server/src/integrations/tanstack-query/index.ts
deleted file mode 100644
index 39356ff..0000000
--- a/apps/server/src/integrations/tanstack-query/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './devtools'
diff --git a/apps/server/src/integrations/tanstack-router/devtools.tsx b/apps/server/src/integrations/tanstack-router/devtools.tsx
deleted file mode 100644
index 47d8af5..0000000
--- a/apps/server/src/integrations/tanstack-router/devtools.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TanStackDevtoolsReactPlugin } from '@tanstack/react-devtools'
-import { TanStackRouterDevtoolsPanel } from '@tanstack/react-router-devtools'
-
-export const devtools = {
-  name: 'TanStack Router',
-  render: <TanStackRouterDevtoolsPanel />,
-} satisfies TanStackDevtoolsReactPlugin
diff --git a/apps/server/src/integrations/tanstack-router/index.ts b/apps/server/src/integrations/tanstack-router/index.ts
deleted file mode 100644
index 39356ff..0000000
--- a/apps/server/src/integrations/tanstack-router/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './devtools'
diff --git a/apps/server/src/routes/__root.tsx b/apps/server/src/routes/__root.tsx
index 056109b..67b2b30 100644
--- a/apps/server/src/routes/__root.tsx
+++ b/apps/server/src/routes/__root.tsx
@@ -1,15 +1,15 @@
 import { TanStackDevtools } from '@tanstack/react-devtools'
 import type { QueryClient } from '@tanstack/react-query'
+import { ReactQueryDevtoolsPanel } from '@tanstack/react-query-devtools'
 import {
   createRootRouteWithContext,
   HeadContent,
   Scripts,
 } from '@tanstack/react-router'
+import { TanStackRouterDevtoolsPanel } from '@tanstack/react-router-devtools'
 import type { ReactNode } from 'react'
 import { ErrorComponent } from '@/components/Error'
 import { NotFoundComponent } from '@/components/NotFount'
-import { devtools as queryDevtools } from '@/integrations/tanstack-query'
-import { devtools as routerDevtools } from '@/integrations/tanstack-router'
 import appCss from '@/styles.css?url'
 
 export interface RouterContext {
@@ -54,7 +54,16 @@ function RootDocument({ children }: Readonly<{ children: ReactNode }>) {
           config={{
             position: 'bottom-right',
           }}
-          plugins={[routerDevtools, queryDevtools]}
+          plugins={[
+            {
+              name: 'TanStack Router',
+              render: <TanStackRouterDevtoolsPanel />,
+            },
+            {
+              name: 'TanStack Query',
+              render: <ReactQueryDevtoolsPanel />,
+            },
+          ]}
         />
         <Scripts />
       </body>