diff --git a/.maestro/tests/account/logout.yaml b/.maestro/tests/account/logout.yaml
index 270020c82c..27700109f6 100644
--- a/.maestro/tests/account/logout.yaml
+++ b/.maestro/tests/account/logout.yaml
@@ -13,14 +13,12 @@ appId: ${MAESTRO_APP_ID}
 - tapOn: "Cancel"
 - tapOn: "Remove this device"
 - tapOn:
-    text: "Remove this device"
-    index: 1
+    id: "sign-out-submit"
 # Cancel the dialog cancels the logout
 - tapOn:
     id: "dialog-negative"
 - tapOn:
-    text: "Remove this device"
-    index: 1
+    id: "sign-out-submit"
 - tapOn:
     id: "dialog-positive"
 - runFlow: ../assertions/assertInitDisplayed.yaml