diff --git a/apps/dashboard/src/@/constants/public-envs.ts b/apps/dashboard/src/@/constants/public-envs.ts
index fe471c31f92..468a62f94c5 100644
--- a/apps/dashboard/src/@/constants/public-envs.ts
+++ b/apps/dashboard/src/@/constants/public-envs.ts
@@ -28,7 +28,7 @@ export const NEXT_PUBLIC_DEMO_ENGINE_URL =
   process.env.NEXT_PUBLIC_DEMO_ENGINE_URL || "";
 
 export const NEXT_PUBLIC_THIRDWEB_AI_HOST =
-  process.env.NEXT_PUBLIC_THIRDWEB_AI_HOST || "https://nebula-api.thirdweb.com";
+  process.env.NEXT_PUBLIC_THIRDWEB_AI_HOST || "https://api.thirdweb.com/ai";
 
 export const NEXT_PUBLIC_BRIDGE_PAGE_CLIENT_ID =
   process.env.NEXT_PUBLIC_BRIDGE_PAGE_CLIENT_ID;
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/ai/api/chat.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/ai/api/chat.ts
index 0b4e0732412..7a5398ecfb4 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/ai/api/chat.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/ai/api/chat.ts
@@ -18,25 +18,22 @@ export async function promptNebula(params: {
   project: Project;
 }) {
   const body: Record<string, string | boolean | object> = {
+    context: {
+      chain_ids: params.context?.chainIds || [],
+      from: params.context?.walletAddress,
+      networks: params.context?.networks,
+      session_id: params.sessionId,
+    },
     messages: [params.message],
-    session_id: params.sessionId,
     stream: true,
   };
 
-  if (params.context) {
-    body.context = {
-      chain_ids: params.context.chainIds || [],
-      networks: params.context.networks,
-      wallet_address: params.context.walletAddress,
-    };
-  }
-
   try {
     const events = await stream(`${NEXT_PUBLIC_THIRDWEB_AI_HOST}/chat`, {
       body: JSON.stringify(body),
       headers: {
         Authorization: `Bearer ${params.authToken}`,
-        "x-team-id": params.project.teamId,
+        "x-thirdweb-team-id": params.project.teamId,
         "x-client-id": params.project.publishableKey,
         "Content-Type": "application/json",
       },
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/ai/api/fetchWithAuthToken.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/ai/api/fetchWithAuthToken.ts
index 37a4f2b3e88..dcd8f156814 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/ai/api/fetchWithAuthToken.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/ai/api/fetchWithAuthToken.ts
@@ -33,7 +33,7 @@ export async function fetchWithAuthToken(options: FetchWithKeyOptions) {
       headers: {
         Accept: "application/json",
         Authorization: `Bearer ${authToken}`,
-        "x-team-id": options.project.teamId,
+        "x-thirdweb-team-id": options.project.teamId,
         "x-client-id": options.project.publishableKey,
         "Content-Type": "application/json",
       },
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/rotate-admin-key.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/rotate-admin-key.client.tsx
index e4dc1489e4d..7c42566703d 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/rotate-admin-key.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/rotate-admin-key.client.tsx
@@ -90,8 +90,7 @@ export default function RotateAdminKeyButton(props: {
   // The confirm checkbox is the only way out of this dialog, and closing it
   // discards the response. Require the keys to actually leave the screen
   // first: a download, or a copy of both values.
-  const keysCaptured =
-    keysDownloaded || (adminKeyCopied && accessTokenCopied);
+  const keysCaptured = keysDownloaded || (adminKeyCopied && accessTokenCopied);
 
   const closeBlocked =
     rotateAdminKeyMutation.isPending || (!!ejectedKeys && !keysConfirmed);