diff --git a/skyvern-frontend/src/api/types.ts b/skyvern-frontend/src/api/types.ts
index 3926383c..4c471056 100644
--- a/skyvern-frontend/src/api/types.ts
+++ b/skyvern-frontend/src/api/types.ts
@@ -391,3 +391,12 @@ export type CreditCardCredential = {
   card_brand: string;
   card_holder_name: string;
 };
+
+export const RunEngine = {
+  SkyvernV1: "skyvern-1.0",
+  SkyvernV2: "skyvern-2.0",
+  OpenaiCua: "openai-cua",
+  AnthropicCua: "anthropic-cua",
+} as const;
+
+export type RunEngine = (typeof RunEngine)[keyof typeof RunEngine];
diff --git a/skyvern-frontend/src/components/EngineSelector.tsx b/skyvern-frontend/src/components/EngineSelector.tsx
new file mode 100644
index 00000000..b0a8024a
--- /dev/null
+++ b/skyvern-frontend/src/components/EngineSelector.tsx
@@ -0,0 +1,31 @@
+import { RunEngine } from "@/api/types";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "./ui/select";
+
+type Props = {
+  value: RunEngine | null;
+  onChange: (value: RunEngine) => void;
+  className?: string;
+};
+
+function RunEngineSelector({ value, onChange, className }: Props) {
+  return (
+    <Select value={value ?? RunEngine.SkyvernV1} onValueChange={onChange}>
+      <SelectTrigger className={className}>
+        <SelectValue />
+      </SelectTrigger>
+      <SelectContent>
+        <SelectItem value={RunEngine.SkyvernV1}>Skyvern 1.0</SelectItem>
+        <SelectItem value={RunEngine.OpenaiCua}>OpenAI CUA</SelectItem>
+        <SelectItem value={RunEngine.AnthropicCua}>Anthropic CUA</SelectItem>
+      </SelectContent>
+    </Select>
+  );
+}
+
+export { RunEngineSelector };
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/ActionNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/ActionNode.tsx
index 113b4afd..a9699c0f 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/ActionNode.tsx
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/ActionNode.tsx
@@ -34,6 +34,7 @@ import { AppNode } from "..";
 import { getAvailableOutputParameterKeys } from "../../workflowEditorUtils";
 import { ParametersMultiSelect } from "../TaskNode/ParametersMultiSelect";
 import { useIsFirstBlockInWorkflow } from "../../hooks/useIsFirstNodeInWorkflow";
+import { RunEngineSelector } from "@/components/EngineSelector";
 
 const urlTooltip =
   "The URL Skyvern is navigating to. Leave this field blank to pick up from where the last block left off.";
@@ -59,6 +60,7 @@ function ActionNode({ id, data }: NodeProps<ActionNode>) {
     downloadSuffix: data.downloadSuffix,
     totpVerificationUrl: data.totpVerificationUrl,
     totpIdentifier: data.totpIdentifier,
+    engine: data.engine,
   });
   const deleteNodeCallback = useDeleteNodeCallback();
 
@@ -181,6 +183,20 @@ function ActionNode({ id, data }: NodeProps<ActionNode>) {
                     }}
                   />
                 </div>
+                <div className="flex items-center justify-between">
+                  <div className="flex gap-2">
+                    <Label className="text-xs font-normal text-slate-300">
+                      Engine
+                    </Label>
+                  </div>
+                  <RunEngineSelector
+                    value={inputs.engine}
+                    onChange={(value) => {
+                      handleChange("engine", value);
+                    }}
+                    className="nopan w-52 text-xs"
+                  />
+                </div>
                 <div className="space-y-2">
                   <div className="flex gap-4">
                     <div className="flex gap-2">
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/types.ts
index 71cef107..e05711de 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/types.ts
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/ActionNode/types.ts
@@ -1,5 +1,6 @@
 import type { Node } from "@xyflow/react";
 import { NodeBaseData } from "../types";
+import { RunEngine } from "@/api/types";
 
 export type ActionNodeData = NodeBaseData & {
   url: string;
@@ -12,6 +13,7 @@ export type ActionNodeData = NodeBaseData & {
   totpVerificationUrl: string | null;
   totpIdentifier: string | null;
   cacheActions: boolean;
+  engine: RunEngine | null;
 };
 
 export type ActionNode = Node<ActionNodeData, "action">;
@@ -30,6 +32,7 @@ export const actionNodeDefaultData: ActionNodeData = {
   totpIdentifier: null,
   continueOnFailure: false,
   cacheActions: false,
+  engine: RunEngine.SkyvernV1,
 } as const;
 
 export function isActionNode(node: Node): node is ActionNode {
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/ExtractionNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/ExtractionNode.tsx
index b46c4615..75552ba6 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/ExtractionNode.tsx
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/ExtractionNode.tsx
@@ -33,6 +33,7 @@ import { getAvailableOutputParameterKeys } from "../../workflowEditorUtils";
 import { ParametersMultiSelect } from "../TaskNode/ParametersMultiSelect";
 import { WorkflowDataSchemaInputGroup } from "@/components/DataSchemaInputGroup/WorkflowDataSchemaInputGroup";
 import { useIsFirstBlockInWorkflow } from "../../hooks/useIsFirstNodeInWorkflow";
+import { RunEngineSelector } from "@/components/EngineSelector";
 
 function ExtractionNode({ id, data }: NodeProps<ExtractionNode>) {
   const { updateNodeData } = useReactFlow();
@@ -48,6 +49,7 @@ function ExtractionNode({ id, data }: NodeProps<ExtractionNode>) {
     maxStepsOverride: data.maxStepsOverride,
     continueOnFailure: data.continueOnFailure,
     cacheActions: data.cacheActions,
+    engine: data.engine,
   });
   const deleteNodeCallback = useDeleteNodeCallback();
   const nodes = useNodes<AppNode>();
@@ -159,6 +161,20 @@ function ExtractionNode({ id, data }: NodeProps<ExtractionNode>) {
                     }}
                   />
                 </div>
+                <div className="flex items-center justify-between">
+                  <div className="flex gap-2">
+                    <Label className="text-xs font-normal text-slate-300">
+                      Engine
+                    </Label>
+                  </div>
+                  <RunEngineSelector
+                    value={inputs.engine}
+                    onChange={(value) => {
+                      handleChange("engine", value);
+                    }}
+                    className="nopan w-52 text-xs"
+                  />
+                </div>
                 <div className="flex items-center justify-between">
                   <div className="flex gap-2">
                     <Label className="text-xs font-normal text-slate-300">
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/types.ts
index bb724dc1..9bfa2c4b 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/types.ts
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/ExtractionNode/types.ts
@@ -1,5 +1,6 @@
 import type { Node } from "@xyflow/react";
 import { NodeBaseData } from "../types";
+import { RunEngine } from "@/api/types";
 
 export type ExtractionNodeData = NodeBaseData & {
   url: string;
@@ -9,6 +10,7 @@ export type ExtractionNodeData = NodeBaseData & {
   maxStepsOverride: number | null;
   parameterKeys: Array<string>;
   cacheActions: boolean;
+  engine: RunEngine | null;
 };
 
 export type ExtractionNode = Node<ExtractionNodeData, "extraction">;
@@ -24,6 +26,7 @@ export const extractionNodeDefaultData: ExtractionNodeData = {
   parameterKeys: [],
   continueOnFailure: false,
   cacheActions: false,
+  engine: RunEngine.SkyvernV1,
 } as const;
 
 export function isExtractionNode(node: Node): node is ExtractionNode {
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/FileDownloadNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/FileDownloadNode.tsx
index af98c235..49bb8a4d 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/FileDownloadNode.tsx
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/FileDownloadNode.tsx
@@ -33,6 +33,7 @@ import { AppNode } from "..";
 import { getAvailableOutputParameterKeys } from "../../workflowEditorUtils";
 import { ParametersMultiSelect } from "../TaskNode/ParametersMultiSelect";
 import { useIsFirstBlockInWorkflow } from "../../hooks/useIsFirstNodeInWorkflow";
+import { RunEngineSelector } from "@/components/EngineSelector";
 
 const urlTooltip =
   "The URL Skyvern is navigating to. Leave this field blank to pick up from where the last block left off.";
@@ -58,6 +59,7 @@ function FileDownloadNode({ id, data }: NodeProps<FileDownloadNode>) {
     downloadSuffix: data.downloadSuffix,
     totpVerificationUrl: data.totpVerificationUrl,
     totpIdentifier: data.totpIdentifier,
+    engine: data.engine,
   });
   const deleteNodeCallback = useDeleteNodeCallback();
 
@@ -173,6 +175,20 @@ function FileDownloadNode({ id, data }: NodeProps<FileDownloadNode>) {
                     }}
                   />
                 </div>
+                <div className="flex items-center justify-between">
+                  <div className="flex gap-2">
+                    <Label className="text-xs font-normal text-slate-300">
+                      Engine
+                    </Label>
+                  </div>
+                  <RunEngineSelector
+                    value={inputs.engine}
+                    onChange={(value) => {
+                      handleChange("engine", value);
+                    }}
+                    className="nopan w-52 text-xs"
+                  />
+                </div>
                 <div className="flex items-center justify-between">
                   <div className="flex gap-2">
                     <Label className="text-xs font-normal text-slate-300">
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/types.ts
index 73eb18e2..69c08773 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/types.ts
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/FileDownloadNode/types.ts
@@ -1,5 +1,6 @@
 import type { Node } from "@xyflow/react";
 import { NodeBaseData } from "../types";
+import { RunEngine } from "@/api/types";
 
 export type FileDownloadNodeData = NodeBaseData & {
   url: string;
@@ -11,6 +12,7 @@ export type FileDownloadNodeData = NodeBaseData & {
   parameterKeys: Array<string>;
   totpVerificationUrl: string | null;
   totpIdentifier: string | null;
+  engine: RunEngine | null;
   cacheActions: boolean;
 };
 
@@ -30,6 +32,7 @@ export const fileDownloadNodeDefaultData: FileDownloadNodeData = {
   totpIdentifier: null,
   continueOnFailure: false,
   cacheActions: false,
+  engine: RunEngine.SkyvernV1,
 } as const;
 
 export function isFileDownloadNode(node: Node): node is FileDownloadNode {
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/LoginNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/LoginNode.tsx
index 9ae28b28..db294fae 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/LoginNode.tsx
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/LoginNode.tsx
@@ -35,6 +35,7 @@ import { AppNode } from "..";
 import { getAvailableOutputParameterKeys } from "../../workflowEditorUtils";
 import { useIsFirstBlockInWorkflow } from "../../hooks/useIsFirstNodeInWorkflow";
 import { LoginBlockCredentialSelector } from "./LoginBlockCredentialSelector";
+import { RunEngineSelector } from "@/components/EngineSelector";
 function LoginNode({ id, data }: NodeProps<LoginNode>) {
   const { updateNodeData } = useReactFlow();
   const { editable } = data;
@@ -53,6 +54,7 @@ function LoginNode({ id, data }: NodeProps<LoginNode>) {
     totpIdentifier: data.totpIdentifier,
     completeCriterion: data.completeCriterion,
     terminateCriterion: data.terminateCriterion,
+    engine: data.engine,
   });
   const deleteNodeCallback = useDeleteNodeCallback();
 
@@ -197,6 +199,20 @@ function LoginNode({ id, data }: NodeProps<LoginNode>) {
                   />
                 </div>
                 <Separator />
+                <div className="flex items-center justify-between">
+                  <div className="flex gap-2">
+                    <Label className="text-xs font-normal text-slate-300">
+                      Engine
+                    </Label>
+                  </div>
+                  <RunEngineSelector
+                    value={inputs.engine}
+                    onChange={(value) => {
+                      handleChange("engine", value);
+                    }}
+                    className="nopan w-52 text-xs"
+                  />
+                </div>
                 <div className="flex items-center justify-between">
                   <div className="flex gap-2">
                     <Label className="text-xs font-normal text-slate-300">
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/types.ts
index a056a3a8..08f6e2df 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/types.ts
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/LoginNode/types.ts
@@ -1,5 +1,6 @@
 import type { Node } from "@xyflow/react";
 import { NodeBaseData } from "../types";
+import { RunEngine } from "@/api/types";
 
 export type LoginNodeData = NodeBaseData & {
   url: string;
@@ -13,6 +14,7 @@ export type LoginNodeData = NodeBaseData & {
   cacheActions: boolean;
   completeCriterion: string;
   terminateCriterion: string;
+  engine: RunEngine | null;
 };
 
 export type LoginNode = Node<LoginNodeData, "login">;
@@ -33,6 +35,7 @@ export const loginNodeDefaultData: LoginNodeData = {
   cacheActions: false,
   completeCriterion: "",
   terminateCriterion: "",
+  engine: RunEngine.SkyvernV1,
 } as const;
 
 export function isLoginNode(node: Node): node is LoginNode {
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/NavigationNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/NavigationNode.tsx
index 73dc543b..f762c611 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/NavigationNode.tsx
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/NavigationNode.tsx
@@ -35,13 +35,7 @@ import { ParametersMultiSelect } from "../TaskNode/ParametersMultiSelect";
 import { AppNode } from "..";
 import { getAvailableOutputParameterKeys } from "../../workflowEditorUtils";
 import { useIsFirstBlockInWorkflow } from "../../hooks/useIsFirstNodeInWorkflow";
-import {
-  Select,
-  SelectTrigger,
-  SelectContent,
-  SelectValue,
-  SelectItem,
-} from "@/components/ui/select";
+import { RunEngineSelector } from "@/components/EngineSelector";
 
 function NavigationNode({ id, data }: NodeProps<NavigationNode>) {
   const { updateNodeData } = useReactFlow();
@@ -210,23 +204,13 @@ function NavigationNode({ id, data }: NodeProps<NavigationNode>) {
                       Engine
                     </Label>
                   </div>
-                  <Select
-                    value={inputs.engine ?? "skyvern-1.0"}
-                    onValueChange={(value) => {
+                  <RunEngineSelector
+                    value={inputs.engine}
+                    onChange={(value) => {
                       handleChange("engine", value);
                     }}
-                  >
-                    <SelectTrigger className="nopan w-52 text-xs">
-                      <SelectValue />
-                    </SelectTrigger>
-                    <SelectContent>
-                      <SelectItem value="skyvern-1.0">Skyvern 1.0</SelectItem>
-                      <SelectItem value="openai-cua">OpenAI CUA</SelectItem>
-                      <SelectItem value="anthropic-cua">
-                        Anthropic CUA
-                      </SelectItem>
-                    </SelectContent>
-                  </Select>
+                    className="nopan w-52 text-xs"
+                  />
                 </div>
                 <div className="flex items-center justify-between">
                   <div className="flex gap-2">
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/types.ts
index c90165ce..79694135 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/types.ts
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/NavigationNode/types.ts
@@ -1,5 +1,6 @@
 import type { Node } from "@xyflow/react";
 import { NodeBaseData } from "../types";
+import { RunEngine } from "@/api/types";
 
 export type NavigationNodeData = NodeBaseData & {
   url: string;
@@ -7,7 +8,7 @@ export type NavigationNodeData = NodeBaseData & {
   errorCodeMapping: string;
   completeCriterion: string;
   terminateCriterion: string;
-  engine: string | null;
+  engine: RunEngine | null;
   maxRetries: number | null;
   maxStepsOverride: number | null;
   allowDownloads: boolean;
@@ -28,7 +29,7 @@ export const navigationNodeDefaultData: NavigationNodeData = {
   completeCriterion: "",
   terminateCriterion: "",
   errorCodeMapping: "null",
-  engine: "skyvern-1.0",
+  engine: RunEngine.SkyvernV1,
   maxRetries: null,
   maxStepsOverride: null,
   allowDownloads: false,
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/TaskNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/TaskNode.tsx
index 54b7af96..2a29db9d 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/TaskNode.tsx
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/TaskNode.tsx
@@ -36,6 +36,7 @@ import { ParametersMultiSelect } from "./ParametersMultiSelect";
 import type { TaskNode } from "./types";
 import { WorkflowDataSchemaInputGroup } from "@/components/DataSchemaInputGroup/WorkflowDataSchemaInputGroup";
 import { useIsFirstBlockInWorkflow } from "../../hooks/useIsFirstNodeInWorkflow";
+import { RunEngineSelector } from "@/components/EngineSelector";
 
 function TaskNode({ id, data }: NodeProps<TaskNode>) {
   const { updateNodeData } = useReactFlow();
@@ -67,6 +68,7 @@ function TaskNode({ id, data }: NodeProps<TaskNode>) {
     totpVerificationUrl: data.totpVerificationUrl,
     totpIdentifier: data.totpIdentifier,
     includeActionHistoryInVerification: data.includeActionHistoryInVerification,
+    engine: data.engine,
   });
 
   function handleChange(key: string, value: unknown) {
@@ -229,6 +231,20 @@ function TaskNode({ id, data }: NodeProps<TaskNode>) {
                   />
                 </div>
                 <Separator />
+                <div className="flex items-center justify-between">
+                  <div className="flex gap-2">
+                    <Label className="text-xs font-normal text-slate-300">
+                      Engine
+                    </Label>
+                  </div>
+                  <RunEngineSelector
+                    value={inputs.engine}
+                    onChange={(value) => {
+                      handleChange("engine", value);
+                    }}
+                    className="nopan w-52 text-xs"
+                  />
+                </div>
                 <div className="flex items-center justify-between">
                   <div className="flex gap-2">
                     <Label className="text-xs font-normal text-slate-300">
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/types.ts
index f35cf1bf..d37c93a1 100644
--- a/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/types.ts
+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/TaskNode/types.ts
@@ -1,5 +1,6 @@
 import type { Node } from "@xyflow/react";
 import { NodeBaseData } from "../types";
+import { RunEngine } from "@/api/types";
 
 export type TaskNodeData = NodeBaseData & {
   url: string;
@@ -18,6 +19,7 @@ export type TaskNodeData = NodeBaseData & {
   totpIdentifier: string | null;
   cacheActions: boolean;
   includeActionHistoryInVerification: boolean;
+  engine: RunEngine | null;
 };
 
 export type TaskNode = Node<TaskNodeData, "task">;
@@ -42,6 +44,7 @@ export const taskNodeDefaultData: TaskNodeData = {
   continueOnFailure: false,
   cacheActions: false,
   includeActionHistoryInVerification: false,
+  engine: RunEngine.SkyvernV1,
 } as const;
 
 export function isTaskNode(node: Node): node is TaskNode {
diff --git a/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts b/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts
index b49b63a3..9f690608 100644
--- a/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts
+++ b/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts
@@ -91,7 +91,7 @@ import {
 import { loginNodeDefaultData } from "./nodes/LoginNode/types";
 import { isWaitNode, waitNodeDefaultData } from "./nodes/WaitNode/types";
 import { fileDownloadNodeDefaultData } from "./nodes/FileDownloadNode/types";
-import { ProxyLocation } from "@/api/types";
+import { ProxyLocation, RunEngine } from "@/api/types";
 import {
   isPdfParserNode,
   pdfParserNodeDefaultData,
@@ -234,6 +234,7 @@ function convertToNode(
           terminateCriterion: block.terminate_criterion ?? "",
           includeActionHistoryInVerification:
             block.include_action_history_in_verification ?? false,
+          engine: block.engine ?? RunEngine.SkyvernV1,
         },
       };
     }
@@ -283,6 +284,7 @@ function convertToNode(
           totpIdentifier: block.totp_identifier ?? null,
           totpVerificationUrl: block.totp_verification_url ?? null,
           cacheActions: block.cache_actions,
+          engine: block.engine ?? RunEngine.SkyvernV1,
         },
       };
     }
@@ -306,7 +308,7 @@ function convertToNode(
           maxStepsOverride: block.max_steps_per_run ?? null,
           completeCriterion: block.complete_criterion ?? "",
           terminateCriterion: block.terminate_criterion ?? "",
-          engine: block.engine ?? "skyvern-1.0",
+          engine: block.engine ?? RunEngine.SkyvernV1,
           includeActionHistoryInVerification:
             block.include_action_history_in_verification ?? false,
         },
@@ -326,6 +328,7 @@ function convertToNode(
           maxRetries: block.max_retries ?? null,
           maxStepsOverride: block.max_steps_per_run ?? null,
           cacheActions: block.cache_actions,
+          engine: block.engine ?? RunEngine.SkyvernV1,
         },
       };
     }
@@ -347,6 +350,7 @@ function convertToNode(
           maxStepsOverride: block.max_steps_per_run ?? null,
           completeCriterion: block.complete_criterion ?? "",
           terminateCriterion: block.terminate_criterion ?? "",
+          engine: block.engine ?? RunEngine.SkyvernV1,
         },
       };
     }
@@ -378,6 +382,7 @@ function convertToNode(
           totpVerificationUrl: block.totp_verification_url ?? null,
           cacheActions: block.cache_actions,
           maxStepsOverride: block.max_steps_per_run ?? null,
+          engine: block.engine ?? RunEngine.SkyvernV1,
         },
       };
     }
@@ -982,6 +987,7 @@ function getWorkflowBlock(node: WorkflowBlockNode): BlockYAML {
         cache_actions: node.data.cacheActions,
         include_action_history_in_verification:
           node.data.includeActionHistoryInVerification,
+        engine: node.data.engine,
       };
     }
     case "taskv2": {
@@ -1028,6 +1034,7 @@ function getWorkflowBlock(node: WorkflowBlockNode): BlockYAML {
         totp_identifier: node.data.totpIdentifier,
         totp_verification_url: node.data.totpVerificationUrl,
         cache_actions: node.data.cacheActions,
+        engine: node.data.engine,
       };
     }
     case "navigation": {
@@ -1072,6 +1079,7 @@ function getWorkflowBlock(node: WorkflowBlockNode): BlockYAML {
         max_steps_per_run: node.data.maxStepsOverride,
         parameter_keys: node.data.parameterKeys,
         cache_actions: node.data.cacheActions,
+        engine: node.data.engine,
       };
     }
     case "login": {
@@ -1095,6 +1103,7 @@ function getWorkflowBlock(node: WorkflowBlockNode): BlockYAML {
         cache_actions: node.data.cacheActions,
         complete_criterion: node.data.completeCriterion,
         terminate_criterion: node.data.terminateCriterion,
+        engine: node.data.engine,
       };
     }
     case "wait": {
@@ -1124,6 +1133,7 @@ function getWorkflowBlock(node: WorkflowBlockNode): BlockYAML {
         totp_identifier: node.data.totpIdentifier,
         totp_verification_url: node.data.totpVerificationUrl,
         cache_actions: node.data.cacheActions,
+        engine: node.data.engine,
       };
     }
     case "sendEmail": {
@@ -1715,6 +1725,7 @@ function convertBlocksToBlockYAML(
           cache_actions: block.cache_actions,
           include_action_history_in_verification:
             block.include_action_history_in_verification,
+          engine: block.engine,
         };
         return blockYaml;
       }
@@ -1756,6 +1767,7 @@ function convertBlocksToBlockYAML(
           totp_identifier: block.totp_identifier,
           totp_verification_url: block.totp_verification_url,
           cache_actions: block.cache_actions,
+          engine: block.engine,
         };
         return blockYaml;
       }
@@ -1795,6 +1807,7 @@ function convertBlocksToBlockYAML(
           max_steps_per_run: block.max_steps_per_run,
           parameter_keys: block.parameters.map((p) => p.key),
           cache_actions: block.cache_actions,
+          engine: block.engine,
         };
         return blockYaml;
       }
@@ -1814,6 +1827,7 @@ function convertBlocksToBlockYAML(
           cache_actions: block.cache_actions,
           complete_criterion: block.complete_criterion,
           terminate_criterion: block.terminate_criterion,
+          engine: block.engine,
         };
         return blockYaml;
       }
@@ -1840,6 +1854,7 @@ function convertBlocksToBlockYAML(
           totp_identifier: block.totp_identifier,
           totp_verification_url: block.totp_verification_url,
           cache_actions: block.cache_actions,
+          engine: block.engine,
         };
         return blockYaml;
       }
diff --git a/skyvern-frontend/src/routes/workflows/types/workflowTypes.ts b/skyvern-frontend/src/routes/workflows/types/workflowTypes.ts
index 34c4ba74..21c504f0 100644
--- a/skyvern-frontend/src/routes/workflows/types/workflowTypes.ts
+++ b/skyvern-frontend/src/routes/workflows/types/workflowTypes.ts
@@ -1,4 +1,4 @@
-import { ProxyLocation } from "@/api/types";
+import { ProxyLocation, RunEngine } from "@/api/types";
 
 export type WorkflowParameterBase = {
   parameter_type: WorkflowParameterType;
@@ -252,6 +252,7 @@ export type TaskBlock = WorkflowBlockBase & {
   totp_identifier?: string | null;
   cache_actions: boolean;
   include_action_history_in_verification: boolean;
+  engine: RunEngine | null;
 };
 
 export type Taskv2Block = WorkflowBlockBase & {
@@ -346,6 +347,7 @@ export type ActionBlock = WorkflowBlockBase & {
   totp_verification_url?: string | null;
   totp_identifier?: string | null;
   cache_actions: boolean;
+  engine: RunEngine | null;
 };
 
 export type NavigationBlock = WorkflowBlockBase & {
@@ -364,7 +366,7 @@ export type NavigationBlock = WorkflowBlockBase & {
   cache_actions: boolean;
   complete_criterion: string | null;
   terminate_criterion: string | null;
-  engine: string | null;
+  engine: RunEngine | null;
   include_action_history_in_verification: boolean;
 };
 
@@ -378,6 +380,7 @@ export type ExtractionBlock = WorkflowBlockBase & {
   max_steps_per_run?: number | null;
   parameters: Array<WorkflowParameter>;
   cache_actions: boolean;
+  engine: RunEngine | null;
 };
 
 export type LoginBlock = WorkflowBlockBase & {
@@ -394,6 +397,7 @@ export type LoginBlock = WorkflowBlockBase & {
   cache_actions: boolean;
   complete_criterion: string | null;
   terminate_criterion: string | null;
+  engine: RunEngine | null;
 };
 
 export type WaitBlock = WorkflowBlockBase & {
@@ -414,6 +418,7 @@ export type FileDownloadBlock = WorkflowBlockBase & {
   totp_verification_url?: string | null;
   totp_identifier?: string | null;
   cache_actions: boolean;
+  engine: RunEngine | null;
 };
 
 export type PDFParserBlock = WorkflowBlockBase & {
diff --git a/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.ts b/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.ts
index 413ddc77..80f34e52 100644
--- a/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.ts
+++ b/skyvern-frontend/src/routes/workflows/types/workflowYamlTypes.ts
@@ -1,3 +1,4 @@
+import { RunEngine } from "@/api/types";
 import { WorkflowBlockType } from "./workflowTypes";
 
 export type WorkflowCreateYAMLRequest = {
@@ -135,6 +136,7 @@ export type TaskBlockYAML = BlockYAMLBase & {
   complete_criterion: string | null;
   terminate_criterion: string | null;
   include_action_history_in_verification: boolean;
+  engine: RunEngine | null;
 };
 
 export type Taskv2BlockYAML = BlockYAMLBase & {
@@ -167,6 +169,7 @@ export type ActionBlockYAML = BlockYAMLBase & {
   totp_verification_url?: string | null;
   totp_identifier?: string | null;
   cache_actions: boolean;
+  engine: RunEngine | null;
 };
 
 export type NavigationBlockYAML = BlockYAMLBase & {
@@ -185,7 +188,7 @@ export type NavigationBlockYAML = BlockYAMLBase & {
   cache_actions: boolean;
   complete_criterion: string | null;
   terminate_criterion: string | null;
-  engine: string | null;
+  engine: RunEngine | null;
   include_action_history_in_verification: boolean;
 };
 
@@ -199,6 +202,7 @@ export type ExtractionBlockYAML = BlockYAMLBase & {
   max_steps_per_run?: number | null;
   parameter_keys?: Array<string> | null;
   cache_actions: boolean;
+  engine: RunEngine | null;
 };
 
 export type LoginBlockYAML = BlockYAMLBase & {
@@ -215,6 +219,7 @@ export type LoginBlockYAML = BlockYAMLBase & {
   cache_actions: boolean;
   complete_criterion: string | null;
   terminate_criterion: string | null;
+  engine: RunEngine | null;
 };
 
 export type WaitBlockYAML = BlockYAMLBase & {
@@ -235,6 +240,7 @@ export type FileDownloadBlockYAML = BlockYAMLBase & {
   totp_verification_url?: string | null;
   totp_identifier?: string | null;
   cache_actions: boolean;
+  engine: RunEngine | null;
 };
 
 export type CodeBlockYAML = BlockYAMLBase & {
diff --git a/skyvern/forge/sdk/workflow/models/yaml.py b/skyvern/forge/sdk/workflow/models/yaml.py
index 12629558..0cd29b3a 100644
--- a/skyvern/forge/sdk/workflow/models/yaml.py
+++ b/skyvern/forge/sdk/workflow/models/yaml.py
@@ -128,6 +128,7 @@ class TaskBlockYAML(BlockYAML):
 
     url: str | None = None
     title: str = ""
+    engine: RunEngine = RunEngine.skyvern_v1
     navigation_goal: str | None = None
     data_extraction_goal: str | None = None
     data_schema: dict[str, Any] | list | None = None
@@ -259,6 +260,7 @@ class ActionBlockYAML(BlockYAML):
 
     url: str | None = None
     title: str = ""
+    engine: RunEngine = RunEngine.skyvern_v1
     navigation_goal: str | None = None
     error_code_mapping: dict[str, str] | None = None
     max_retries: int = 0
@@ -298,6 +300,7 @@ class ExtractionBlockYAML(BlockYAML):
     data_extraction_goal: str
     url: str | None = None
     title: str = ""
+    engine: RunEngine = RunEngine.skyvern_v1
     data_schema: dict[str, Any] | list | None = None
     max_retries: int = 0
     max_steps_per_run: int | None = None
@@ -310,6 +313,7 @@ class LoginBlockYAML(BlockYAML):
 
     url: str | None = None
     title: str = ""
+    engine: RunEngine = RunEngine.skyvern_v1
     navigation_goal: str | None = None
     error_code_mapping: dict[str, str] | None = None
     max_retries: int = 0
@@ -334,6 +338,7 @@ class FileDownloadBlockYAML(BlockYAML):
     navigation_goal: str
     url: str | None = None
     title: str = ""
+    engine: RunEngine = RunEngine.skyvern_v1
     error_code_mapping: dict[str, str] | None = None
     max_retries: int = 0
     max_steps_per_run: int | None = None
diff --git a/skyvern/forge/sdk/workflow/service.py b/skyvern/forge/sdk/workflow/service.py
index 7aaefcdd..d54fb54c 100644
--- a/skyvern/forge/sdk/workflow/service.py
+++ b/skyvern/forge/sdk/workflow/service.py
@@ -1642,6 +1642,7 @@ class WorkflowService:
                 label=block_yaml.label,
                 url=block_yaml.url,
                 title=block_yaml.title,
+                engine=block_yaml.engine,
                 parameters=task_block_parameters,
                 output_parameter=output_parameter,
                 navigation_goal=block_yaml.navigation_goal,
@@ -1812,6 +1813,7 @@ class WorkflowService:
                 label=block_yaml.label,
                 url=block_yaml.url,
                 title=block_yaml.title,
+                engine=block_yaml.engine,
                 task_type=TaskType.action,
                 parameters=action_block_parameters,
                 output_parameter=output_parameter,
@@ -1868,6 +1870,7 @@ class WorkflowService:
                 label=block_yaml.label,
                 url=block_yaml.url,
                 title=block_yaml.title,
+                engine=block_yaml.engine,
                 parameters=extraction_block_parameters,
                 output_parameter=output_parameter,
                 data_extraction_goal=block_yaml.data_extraction_goal,
@@ -1889,6 +1892,7 @@ class WorkflowService:
                 label=block_yaml.label,
                 url=block_yaml.url,
                 title=block_yaml.title,
+                engine=block_yaml.engine,
                 parameters=login_block_parameters,
                 output_parameter=output_parameter,
                 navigation_goal=block_yaml.navigation_goal,
@@ -1925,6 +1929,7 @@ class WorkflowService:
                 label=block_yaml.label,
                 url=block_yaml.url,
                 title=block_yaml.title,
+                engine=block_yaml.engine,
                 parameters=file_download_block_parameters,
                 output_parameter=output_parameter,
                 navigation_goal=block_yaml.navigation_goal,