diff --git a/api/core/workflow/nodes/datasource/datasource_node.py b/api/core/workflow/nodes/datasource/datasource_node.py
index 1d7d2e6842..824ff2b600 100644
--- a/api/core/workflow/nodes/datasource/datasource_node.py
+++ b/api/core/workflow/nodes/datasource/datasource_node.py
@@ -376,7 +376,7 @@ class DatasourceNode(Node):
                 assert isinstance(message.message, DatasourceMessage.TextMessage)
 
                 url = message.message.text
-                transfer_method = FileTransferMethod.TOOL_FILE
+                transfer_method = FileTransferMethod.DATASOURCE_FILE
 
                 datasource_file_id = str(url).split("/")[-1].split(".")[0]
 
@@ -387,7 +387,7 @@ class DatasourceNode(Node):
                         raise ToolFileError(f"Tool file {datasource_file_id} does not exist")
 
                 mapping = {
-                    "id": datasource_file_id,
+                    "datasource_file_id": datasource_file_id,
                     "type": file_factory.get_file_type_by_mime_type(datasource_file.mime_type),
                     "transfer_method": transfer_method,
                     "url": url,
@@ -410,8 +410,8 @@ class DatasourceNode(Node):
                         raise ToolFileError(f"datasource file {datasource_file_id} not exists")
 
                 mapping = {
-                    "id": datasource_file_id,
-                    "transfer_method": FileTransferMethod.TOOL_FILE,
+                    "datasource_file_id": datasource_file_id,
+                    "transfer_method": FileTransferMethod.DATASOURCE_FILE,
                 }
 
                 files.append(
@@ -513,7 +513,7 @@ class DatasourceNode(Node):
                 assert isinstance(message.message, DatasourceMessage.TextMessage)
 
                 url = message.message.text
-                transfer_method = FileTransferMethod.TOOL_FILE
+                transfer_method = FileTransferMethod.DATASOURCE_FILE
 
                 datasource_file_id = str(url).split("/")[-1].split(".")[0]
 
@@ -524,7 +524,7 @@ class DatasourceNode(Node):
                         raise ToolFileError(f"Tool file {datasource_file_id} does not exist")
 
                 mapping = {
-                    "id": datasource_file_id,
+                    "datasource_file_id": datasource_file_id,
                     "type": file_factory.get_file_type_by_mime_type(datasource_file.mime_type),
                     "transfer_method": transfer_method,
                     "url": url,
diff --git a/api/factories/file_factory.py b/api/factories/file_factory.py
index 0556ab5ae9..a0cc803114 100644
--- a/api/factories/file_factory.py
+++ b/api/factories/file_factory.py
@@ -355,7 +355,7 @@ def _build_from_datasource_file(
         tenant_id=tenant_id,
         filename=datasource_file.name,
         type=file_type,
-        transfer_method=transfer_method,
+        transfer_method=FileTransferMethod.TOOL_FILE,
         remote_url=datasource_file.source_url,
         related_id=datasource_file.id,
         extension=extension,