diff --git a/skyvern-frontend/src/router.tsx b/skyvern-frontend/src/router.tsx
index c19ff24f..a15d0a2e 100644
--- a/skyvern-frontend/src/router.tsx
+++ b/skyvern-frontend/src/router.tsx
@@ -1,4 +1,5 @@
 import { Navigate, Outlet, createBrowserRouter } from "react-router-dom";
+import { DebugToBuildRedirect } from "@/routes/workflows/DebugToBuildRedirect";
 import { BrowserSession } from "@/routes/browserSessions/BrowserSession";
 import { BrowserSessions } from "@/routes/browserSessions/BrowserSessions";
 import { PageLayout } from "./components/PageLayout";
@@ -132,13 +133,21 @@ const router = createBrowserRouter([
                 element: <Navigate to="runs" />,
               },
               {
-                path: "debug",
+                path: "build",
                 element: <Debugger />,
               },
               {
-                path: ":workflowRunId/:blockLabel/debug",
+                path: ":workflowRunId/:blockLabel/build",
                 element: <Debugger />,
               },
+              {
+                path: "debug",
+                element: <DebugToBuildRedirect />,
+              },
+              {
+                path: ":workflowRunId/:blockLabel/debug",
+                element: <DebugToBuildRedirect />,
+              },
               {
                 path: "edit",
                 element: <WorkflowEditor />,
diff --git a/skyvern-frontend/src/routes/discover/WorkflowTemplates.tsx b/skyvern-frontend/src/routes/discover/WorkflowTemplates.tsx
index 83e432f3..2b690024 100644
--- a/skyvern-frontend/src/routes/discover/WorkflowTemplates.tsx
+++ b/skyvern-frontend/src/routes/discover/WorkflowTemplates.tsx
@@ -54,7 +54,7 @@ function WorkflowTemplates() {
                 }
                 onClick={() => {
                   navigate(
-                    `/workflows/${workflow.workflow_permanent_id}/debug`,
+                    `/workflows/${workflow.workflow_permanent_id}/build`,
                   );
                 }}
               />
diff --git a/skyvern-frontend/src/routes/root/Header.tsx b/skyvern-frontend/src/routes/root/Header.tsx
index e018f4c8..0e7181f3 100644
--- a/skyvern-frontend/src/routes/root/Header.tsx
+++ b/skyvern-frontend/src/routes/root/Header.tsx
@@ -8,6 +8,7 @@ function Header() {
   const embed = searchParams.get("embed");
   const match =
     useMatch("/workflows/:workflowPermanentId/edit") ||
+    location.pathname.includes("build") ||
     location.pathname.includes("debug") ||
     embed === "true";
 
diff --git a/skyvern-frontend/src/routes/tasks/create/PromptBox.tsx b/skyvern-frontend/src/routes/tasks/create/PromptBox.tsx
index ef6981e0..76d63f65 100644
--- a/skyvern-frontend/src/routes/tasks/create/PromptBox.tsx
+++ b/skyvern-frontend/src/routes/tasks/create/PromptBox.tsx
@@ -219,7 +219,7 @@ function PromptBox() {
         setAutoplay(workflow.workflow_permanent_id, firstBlock.label);
       }
 
-      navigate(`/workflows/${workflow.workflow_permanent_id}/debug`);
+      navigate(`/workflows/${workflow.workflow_permanent_id}/build`);
     },
     onError: (error: AxiosError) => {
       toast({
diff --git a/skyvern-frontend/src/routes/workflows/DebugToBuildRedirect.tsx b/skyvern-frontend/src/routes/workflows/DebugToBuildRedirect.tsx
new file mode 100644
index 00000000..d1483109
--- /dev/null
+++ b/skyvern-frontend/src/routes/workflows/DebugToBuildRedirect.tsx
@@ -0,0 +1,17 @@
+import { Navigate, useLocation } from "react-router-dom";
+
+function DebugToBuildRedirect() {
+  const location = useLocation();
+  return (
+    <Navigate
+      to={
+        location.pathname.replace(/\/debug(\/|$)/, "/build$1") +
+        location.search +
+        location.hash
+      }
+      replace
+    />
+  );
+}
+
+export { DebugToBuildRedirect };
diff --git a/skyvern-frontend/src/routes/workflows/RunWorkflowForm.tsx b/skyvern-frontend/src/routes/workflows/RunWorkflowForm.tsx
index a9c8e118..aa13b44d 100644
--- a/skyvern-frontend/src/routes/workflows/RunWorkflowForm.tsx
+++ b/skyvern-frontend/src/routes/workflows/RunWorkflowForm.tsx
@@ -574,7 +574,7 @@ function RunWorkflowForm({
               </ul>
               <p className="mt-2">
                 <Link
-                  to={`/workflows/${workflowPermanentId}/debug`}
+                  to={`/workflows/${workflowPermanentId}/build`}
                   className="underline hover:no-underline"
                 >
                   Go to the editor
diff --git a/skyvern-frontend/src/routes/workflows/WorkflowPage.tsx b/skyvern-frontend/src/routes/workflows/WorkflowPage.tsx
index 7592fb05..335a7e80 100644
--- a/skyvern-frontend/src/routes/workflows/WorkflowPage.tsx
+++ b/skyvern-frontend/src/routes/workflows/WorkflowPage.tsx
@@ -139,7 +139,7 @@ function WorkflowPage() {
             />
           )}
           <Button asChild variant="secondary">
-            <Link to={`/workflows/${workflowPermanentId}/debug`}>
+            <Link to={`/workflows/${workflowPermanentId}/build`}>
               <Pencil2Icon className="mr-2 size-4" />
               Edit
             </Link>
diff --git a/skyvern-frontend/src/routes/workflows/WorkflowRun.tsx b/skyvern-frontend/src/routes/workflows/WorkflowRun.tsx
index 070afb76..baa6fe09 100644
--- a/skyvern-frontend/src/routes/workflows/WorkflowRun.tsx
+++ b/skyvern-frontend/src/routes/workflows/WorkflowRun.tsx
@@ -392,7 +392,7 @@ function WorkflowRun() {
               hideTrigger
             />
             <Button asChild variant="secondary">
-              <Link to={`/workflows/${workflowPermanentId}/debug`}>
+              <Link to={`/workflows/${workflowPermanentId}/build`}>
                 <Pencil2Icon className="mr-2 h-4 w-4" />
                 Edit
               </Link>
diff --git a/skyvern-frontend/src/routes/workflows/Workflows.tsx b/skyvern-frontend/src/routes/workflows/Workflows.tsx
index ce928d6b..f4808f40 100644
--- a/skyvern-frontend/src/routes/workflows/Workflows.tsx
+++ b/skyvern-frontend/src/routes/workflows/Workflows.tsx
@@ -670,7 +670,7 @@ function Workflows() {
                                       onClick={(event) => {
                                         handleIconClick(
                                           event,
-                                          `/workflows/${workflow.workflow_permanent_id}/debug`,
+                                          `/workflows/${workflow.workflow_permanent_id}/build`,
                                         );
                                       }}
                                     >
diff --git a/skyvern-frontend/src/routes/workflows/WorkflowsPageLayout.tsx b/skyvern-frontend/src/routes/workflows/WorkflowsPageLayout.tsx
index 66ac292b..0f6d4019 100644
--- a/skyvern-frontend/src/routes/workflows/WorkflowsPageLayout.tsx
+++ b/skyvern-frontend/src/routes/workflows/WorkflowsPageLayout.tsx
@@ -6,6 +6,7 @@ function WorkflowsPageLayout() {
   const embed = searchParams.get("embed");
   const match =
     useMatch("/workflows/:workflowPermanentId/edit") ||
+    location.pathname.includes("build") ||
     location.pathname.includes("debug") ||
     embed === "true";
   return (
diff --git a/skyvern-frontend/src/routes/workflows/debugger/DebuggerBlockRuns.tsx b/skyvern-frontend/src/routes/workflows/debugger/DebuggerBlockRuns.tsx
index a1a1a58c..1dd5598b 100644
--- a/skyvern-frontend/src/routes/workflows/debugger/DebuggerBlockRuns.tsx
+++ b/skyvern-frontend/src/routes/workflows/debugger/DebuggerBlockRuns.tsx
@@ -61,7 +61,7 @@ function DebuggerBlockRuns() {
     }
 
     navigate(
-      `/workflows/${run.workflow_permanent_id}/${run.workflow_run_id}/${blockLabel}/debug`,
+      `/workflows/${run.workflow_permanent_id}/${run.workflow_run_id}/${blockLabel}/build`,
     );
   };
 
diff --git a/skyvern-frontend/src/routes/workflows/editor/WorkflowHeader.tsx b/skyvern-frontend/src/routes/workflows/editor/WorkflowHeader.tsx
index 06795283..f6867b5e 100644
--- a/skyvern-frontend/src/routes/workflows/editor/WorkflowHeader.tsx
+++ b/skyvern-frontend/src/routes/workflows/editor/WorkflowHeader.tsx
@@ -300,7 +300,7 @@ function WorkflowHeader({
                       if (debugStore.isDebugMode) {
                         navigate(`/workflows/${workflowPermanentId}/edit`);
                       } else {
-                        navigate(`/workflows/${workflowPermanentId}/debug`);
+                        navigate(`/workflows/${workflowPermanentId}/build`);
                       }
                     }}
                   >
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/components/NodeHeader.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/components/NodeHeader.tsx
index 4d2515e2..b0a7e461 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/components/NodeHeader.tsx
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/components/NodeHeader.tsx
@@ -261,7 +261,7 @@ function NodeHeader({
       workflowRunId === workflowRun?.workflow_run_id &&
       statusIsFinalized(workflowRun)
     ) {
-      // navigate(`/workflows/${workflowPermanentId}/debug`);
+      // navigate(`/workflows/${workflowPermanentId}/build`);
 
       if (statusIsAFailureType(workflowRun)) {
         toast({
@@ -406,7 +406,7 @@ function NodeHeader({
       });
 
       navigate(
-        `/workflows/${workflowPermanentId}/${response.data.run_id}/${label}/debug`,
+        `/workflows/${workflowPermanentId}/${response.data.run_id}/${label}/build`,
       );
     },
     onError: (error: AxiosError) => {
diff --git a/skyvern-frontend/src/routes/workflows/hooks/useCreateWorkflowMutation.ts b/skyvern-frontend/src/routes/workflows/hooks/useCreateWorkflowMutation.ts
index edab55b2..bfc39585 100644
--- a/skyvern-frontend/src/routes/workflows/hooks/useCreateWorkflowMutation.ts
+++ b/skyvern-frontend/src/routes/workflows/hooks/useCreateWorkflowMutation.ts
@@ -32,7 +32,7 @@ function useCreateWorkflowMutation() {
       queryClient.invalidateQueries({
         queryKey: ["folders"],
       });
-      navigate(`/workflows/${response.data.workflow_permanent_id}/debug`);
+      navigate(`/workflows/${response.data.workflow_permanent_id}/build`);
     },
   });
 }
diff --git a/skyvern-frontend/src/store/DebugStoreContext.tsx b/skyvern-frontend/src/store/DebugStoreContext.tsx
index f774aa7c..7b8e127d 100644
--- a/skyvern-frontend/src/store/DebugStoreContext.tsx
+++ b/skyvern-frontend/src/store/DebugStoreContext.tsx
@@ -4,7 +4,7 @@ import { useLocation } from "react-router-dom";
 function useIsDebugMode() {
   const location = useLocation();
   return useMemo(
-    () => location.pathname.includes("debug"),
+    () => location.pathname.includes("build"),
     [location.pathname],
   );
 }