diff --git a/.changeset/afraid-cups-clap.md b/.changeset/afraid-cups-clap.md
new file mode 100644
index 0000000..64b1cc5
--- /dev/null
+++ b/.changeset/afraid-cups-clap.md
@@ -0,0 +1,5 @@
+---
+"create-better-t-stack": patch
+---
+
+add react query devtools in next template
diff --git a/apps/cli/templates/frontend/react/next/next-env.d.ts b/apps/cli/templates/frontend/react/next/next-env.d.ts.hbs
similarity index 100%
rename from apps/cli/templates/frontend/react/next/next-env.d.ts
rename to apps/cli/templates/frontend/react/next/next-env.d.ts.hbs
diff --git a/apps/cli/templates/frontend/react/next/next.config.ts b/apps/cli/templates/frontend/react/next/next.config.ts.hbs
similarity index 100%
rename from apps/cli/templates/frontend/react/next/next.config.ts
rename to apps/cli/templates/frontend/react/next/next.config.ts.hbs
diff --git a/apps/cli/templates/frontend/react/next/package.json b/apps/cli/templates/frontend/react/next/package.json.hbs
similarity index 100%
rename from apps/cli/templates/frontend/react/next/package.json
rename to apps/cli/templates/frontend/react/next/package.json.hbs
diff --git a/apps/cli/templates/frontend/react/next/postcss.config.mjs b/apps/cli/templates/frontend/react/next/postcss.config.mjs.hbs
similarity index 100%
rename from apps/cli/templates/frontend/react/next/postcss.config.mjs
rename to apps/cli/templates/frontend/react/next/postcss.config.mjs.hbs
diff --git a/apps/cli/templates/frontend/react/next/src/app/layout.tsx b/apps/cli/templates/frontend/react/next/src/app/layout.tsx.hbs
similarity index 92%
rename from apps/cli/templates/frontend/react/next/src/app/layout.tsx
rename to apps/cli/templates/frontend/react/next/src/app/layout.tsx.hbs
index 07a1adf..faa9d0f 100644
--- a/apps/cli/templates/frontend/react/next/src/app/layout.tsx
+++ b/apps/cli/templates/frontend/react/next/src/app/layout.tsx.hbs
@@ -15,8 +15,8 @@ const geistMono = Geist_Mono({
 });
 
 export const metadata: Metadata = {
-  title: "Create Next App",
-  description: "Generated by create next app",
+  title: "{{projectName}}",
+  description: "{{projectName}}",
 };
 
 export default function RootLayout({
diff --git a/apps/cli/templates/frontend/react/next/src/components/mode-toggle.tsx b/apps/cli/templates/frontend/react/next/src/components/mode-toggle.tsx.hbs
similarity index 100%
rename from apps/cli/templates/frontend/react/next/src/components/mode-toggle.tsx
rename to apps/cli/templates/frontend/react/next/src/components/mode-toggle.tsx.hbs
diff --git a/apps/cli/templates/frontend/react/next/src/components/providers.tsx.hbs b/apps/cli/templates/frontend/react/next/src/components/providers.tsx.hbs
index cfa1d4d..700362b 100644
--- a/apps/cli/templates/frontend/react/next/src/components/providers.tsx.hbs
+++ b/apps/cli/templates/frontend/react/next/src/components/providers.tsx.hbs
@@ -1,9 +1,11 @@
-"use client"
+"use client";
+
 {{#if (eq backend "convex")}}
   import { ConvexProvider, ConvexReactClient } from "convex/react";
 {{else}}
   {{#unless (eq api "none")}}
     import { QueryClientProvider } from "@tanstack/react-query";
+    import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
     {{#if (eq api "orpc")}}
       import { orpc, ORPCContext, queryClient } from "@/utils/orpc";
     {{/if}}
@@ -12,6 +14,7 @@
     {{/if}}
   {{/unless}}
 {{/if}}
+
 import { ThemeProvider } from "./theme-provider";
 import { Toaster } from "./ui/sonner";
 
@@ -19,32 +22,33 @@ import { Toaster } from "./ui/sonner";
   const convex = new ConvexReactClient(process.env.NEXT_PUBLIC_CONVEX_URL!);
 {{/if}}
 
-export default function Providers({ children, }: { children: React.ReactNode })
-{ return (
-<ThemeProvider
-  attribute="class"
-  defaultTheme="system"
-  enableSystem
-  disableTransitionOnChange
->
-  {{#if (eq backend "convex")}}
-    <ConvexProvider client={convex}>{children}</ConvexProvider>
-  {{else}}
-    {{#unless (eq api "none")}}
-      <QueryClientProvider client={queryClient}>
-        {{#if (eq api "orpc")}}
-          <ORPCContext.Provider value={orpc}>
-            {children}
-          </ORPCContext.Provider>
-        {{/if}}
-        {{#if (eq api "trpc")}}
+export default function Providers({ children }: { children: React.ReactNode }) {  return (
+    <ThemeProvider
+      attribute="class"
+      defaultTheme="system"
+      enableSystem
+      disableTransitionOnChange
+    >
+      {{#if (eq backend "convex")}}
+        <ConvexProvider client={convex}>{children}</ConvexProvider>
+      {{else}}
+        {{#unless (eq api "none")}}
+          <QueryClientProvider client={queryClient}>
+            {{#if (eq api "orpc")}}
+              <ORPCContext.Provider value={orpc}>
+                {children}
+              </ORPCContext.Provider>
+            {{/if}}
+            {{#if (eq api "trpc")}}
+              {children}
+            {{/if}}
+            <ReactQueryDevtools />
+          </QueryClientProvider>
+        {{else}}
           {children}
-        {{/if}}
-      </QueryClientProvider>
-    {{else}}
-      {children}
-    {{/unless}}
-  {{/if}}
-  <Toaster richColors />
-</ThemeProvider>
-) }
+        {{/unless}}
+      {{/if}}
+      <Toaster richColors />
+    </ThemeProvider>
+  );
+}
diff --git a/apps/cli/templates/frontend/react/next/src/components/theme-provider.tsx b/apps/cli/templates/frontend/react/next/src/components/theme-provider.tsx.hbs
similarity index 100%
rename from apps/cli/templates/frontend/react/next/src/components/theme-provider.tsx
rename to apps/cli/templates/frontend/react/next/src/components/theme-provider.tsx.hbs
diff --git a/apps/cli/templates/frontend/react/tanstack-start/package.json b/apps/cli/templates/frontend/react/tanstack-start/package.json
index 61a282b..43629e1 100644
--- a/apps/cli/templates/frontend/react/tanstack-start/package.json
+++ b/apps/cli/templates/frontend/react/tanstack-start/package.json
@@ -36,7 +36,6 @@
   },
   "devDependencies": {
     "@tanstack/react-router-devtools": "^1.114.3",
-    "@tanstack/react-query-devtools": "^5.71.10",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.2.0",
     "@types/react": "^19.0.8",