diff --git a/cypress/composables/workflow.ts b/cypress/composables/workflow.ts
index 29b871f560..3289d43a79 100644
--- a/cypress/composables/workflow.ts
+++ b/cypress/composables/workflow.ts
@@ -46,7 +46,10 @@ export function getNodes() {
 }
 
 export function getNodeByName(name: string) {
-	return cy.getByTestId('canvas-node').filter(`[data-name="${name}"]`).eq(0);
+	return cy.ifCanvasVersion(
+		() => cy.getByTestId('canvas-node').filter(`[data-name="${name}"]`).eq(0),
+		() => cy.getByTestId('canvas-node').filter(`[data-node-name="${name}"]`).eq(0),
+	);
 }
 
 export function disableNode(name: string) {
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
index ff42272288..5dbd08db32 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
@@ -311,7 +311,12 @@ onBeforeUnmount(() => {
 </script>
 
 <template>
-	<div :class="classes" data-test-id="canvas-node" :data-node-type="data.type">
+	<div
+		:class="classes"
+		data-test-id="canvas-node"
+		:data-node-name="data.name"
+		:data-node-type="data.type"
+	>
 		<template
 			v-for="source in mappedOutputs"
 			:key="`${source.handleId}(${source.index + 1}/${mappedOutputs.length})`"
@@ -321,7 +326,7 @@ onBeforeUnmount(() => {
 				:mode="CanvasConnectionMode.Output"
 				:is-read-only="readOnly"
 				:is-valid-connection="isValidConnection"
-				:data-node-name="label"
+				:data-node-name="data.name"
 				data-test-id="canvas-node-output-handle"
 				:data-handle-index="source.index"
 				@add="onAdd"
@@ -339,7 +344,7 @@ onBeforeUnmount(() => {
 				:is-valid-connection="isValidConnection"
 				data-test-id="canvas-node-input-handle"
 				:data-handle-index="target.index"
-				:data-node-name="label"
+				:data-node-name="data.name"
 				@add="onAdd"
 			/>
 		</template>