diff --git a/frontend/src/ui-components/components/form/TileSelectionOption.vue b/frontend/src/ui-components/components/form/TileSelectionOption.vue
index 6f120fe169..2178a734fe 100644
--- a/frontend/src/ui-components/components/form/TileSelectionOption.vue
+++ b/frontend/src/ui-components/components/form/TileSelectionOption.vue
@@ -7,6 +7,7 @@
              class="ff-tile-selection-option"
              :style="{'--ff-tile-selection-color': color || null}"
              tabindex="0"
+             :data-form="`tile-selection-option-${value}`"
              @click="select(false)"
              @keydown.space.prevent="select(true)"
         >
diff --git a/test/e2e/frontend/cypress/tests-ee/applications/pipelines.spec.js b/test/e2e/frontend/cypress/tests-ee/applications/pipelines.spec.js
index a0186273ea..fd5836c2cd 100644
--- a/test/e2e/frontend/cypress/tests-ee/applications/pipelines.spec.js
+++ b/test/e2e/frontend/cypress/tests-ee/applications/pipelines.spec.js
@@ -388,7 +388,7 @@ describe('FlowForge - Application - DevOps Pipelines', () => {
             cy.get('[data-action="add-stage"]').click()
         })
 
-        cy.get('[data-form="stage-type"]').find('.ff-tile-selection-option:contains("Device")').click()
+        cy.get('[data-form="stage-type"]').find('.ff-tile-selection-option[data-form="tile-selection-option-device"]').click()
 
         cy.get('[data-form="stage-name"] input[type="text"]').type('Stage 1')
 
@@ -511,7 +511,7 @@ describe('FlowForge - Application - DevOps Pipelines', () => {
         cy.get(`[data-el="pipelines-list"] [data-el="pipeline-row"]:contains("${PIPELINE_NAME}")`).within(() => {
             cy.get('[data-action="add-stage"]').click()
         })
-        cy.get('[data-form="stage-type"]').find('.ff-tile-selection-option:contains("Device")').not(':contains("Group")').click()
+        cy.get('[data-form="stage-type"]').find('.ff-tile-selection-option[data-form="tile-selection-option-device"]').click()
 
         cy.get('[data-form="stage-name"] input[type="text"]').type('Stage 2')
 
@@ -627,7 +627,7 @@ describe('FlowForge - Application - DevOps Pipelines', () => {
             cy.get('[data-action="add-stage"]').click()
         })
 
-        cy.get('[data-form="stage-type"]').find('.ff-tile-selection-option:contains("Device Group")').click()
+        cy.get('[data-form="stage-type"]').find('.ff-tile-selection-option[data-form="tile-selection-option-device-group"]').click()
 
         cy.get('[data-form="stage-name"] input[type="text"]').type('Stage 2')
         // stage-action should not be present for device group