diff --git a/api/core/tools/workflow_as_tool/tool.py b/api/core/tools/workflow_as_tool/tool.py
index 962b9f7a8..db6b84082 100644
--- a/api/core/tools/workflow_as_tool/tool.py
+++ b/api/core/tools/workflow_as_tool/tool.py
@@ -142,7 +142,7 @@ class WorkflowTool(Tool):
         if not version:
             workflow = (
                 db.session.query(Workflow)
-                .where(Workflow.app_id == app_id, Workflow.version != "draft")
+                .where(Workflow.app_id == app_id, Workflow.version != Workflow.VERSION_DRAFT)
                 .order_by(Workflow.created_at.desc())
                 .first()
             )
diff --git a/api/services/workflow/workflow_converter.py b/api/services/workflow/workflow_converter.py
index abf6824d7..afcf1f762 100644
--- a/api/services/workflow/workflow_converter.py
+++ b/api/services/workflow/workflow_converter.py
@@ -185,7 +185,7 @@ class WorkflowConverter:
             tenant_id=app_model.tenant_id,
             app_id=app_model.id,
             type=WorkflowType.from_app_mode(new_app_mode).value,
-            version="draft",
+            version=Workflow.VERSION_DRAFT,
             graph=json.dumps(graph),
             features=json.dumps(features),
             created_by=account_id,
diff --git a/api/services/workflow_service.py b/api/services/workflow_service.py
index e9f21fc5f..858814498 100644
--- a/api/services/workflow_service.py
+++ b/api/services/workflow_service.py
@@ -105,7 +105,9 @@ class WorkflowService:
         workflow = (
             db.session.query(Workflow)
             .where(
-                Workflow.tenant_id == app_model.tenant_id, Workflow.app_id == app_model.id, Workflow.version == "draft"
+                Workflow.tenant_id == app_model.tenant_id,
+                Workflow.app_id == app_model.id,
+                Workflow.version == Workflow.VERSION_DRAFT,
             )
             .first()
         )
@@ -219,7 +221,7 @@ class WorkflowService:
                 tenant_id=app_model.tenant_id,
                 app_id=app_model.id,
                 type=WorkflowType.from_app_mode(app_model.mode).value,
-                version="draft",
+                version=Workflow.VERSION_DRAFT,
                 graph=json.dumps(graph),
                 features=json.dumps(features),
                 created_by=account.id,
@@ -257,7 +259,7 @@ class WorkflowService:
         draft_workflow_stmt = select(Workflow).where(
             Workflow.tenant_id == app_model.tenant_id,
             Workflow.app_id == app_model.id,
-            Workflow.version == "draft",
+            Workflow.version == Workflow.VERSION_DRAFT,
         )
         draft_workflow = session.scalar(draft_workflow_stmt)
         if not draft_workflow:
@@ -382,9 +384,9 @@ class WorkflowService:
             tenant_id=app_model.tenant_id,
         )
 
-        eclosing_node_type_and_id = draft_workflow.get_enclosing_node_type_and_id(node_config)
-        if eclosing_node_type_and_id:
-            _, enclosing_node_id = eclosing_node_type_and_id
+        enclosing_node_type_and_id = draft_workflow.get_enclosing_node_type_and_id(node_config)
+        if enclosing_node_type_and_id:
+            _, enclosing_node_id = enclosing_node_type_and_id
         else:
             enclosing_node_id = None
 
@@ -644,7 +646,7 @@ class WorkflowService:
             raise ValueError(f"Workflow with ID {workflow_id} not found")
 
         # Check if workflow is a draft version
-        if workflow.version == "draft":
+        if workflow.version == Workflow.VERSION_DRAFT:
             raise DraftWorkflowDeletionError("Cannot delete draft workflow versions")
 
         # Check if this workflow is currently referenced by an app