diff --git a/versions.json b/versions.json
index 28d9616487..0dd1bcb7d4 100644
--- a/versions.json
+++ b/versions.json
@@ -1,6 +1,6 @@
 {
     "backstage": "1.54.6",
     "node": "24.19.0",
-    "cli": "2.0.3",
+    "cli": "2.1.0",
     "cliPackage": "@red-hat-developer-hub/cli"
 }
diff --git a/workspaces/backstage/e2e-tests/tests/specs/gitlab-scaffolder-actions.spec.ts b/workspaces/backstage/e2e-tests/tests/specs/gitlab-scaffolder-actions.spec.ts
index d0b45fa9bc..344c4efa83 100644
--- a/workspaces/backstage/e2e-tests/tests/specs/gitlab-scaffolder-actions.spec.ts
+++ b/workspaces/backstage/e2e-tests/tests/specs/gitlab-scaffolder-actions.spec.ts
@@ -35,7 +35,11 @@ async function runScaffolderTemplate(
   fillParameters: () => Promise<void>,
 ): Promise<void> {
   await uiHelper.verifyHeading("Templates");
-  await uiHelper.clickBtnInCard(templateTitle, "Choose");
+  await page
+    .locator('div[class*="MuiCard-root"]')
+    .filter({ hasText: templateTitle })
+    .getByRole("button", { name: "Choose" })
+    .click();
   await uiHelper.waitForTitle(templateTitle, 2);
   await fillParameters();
   const reviewButton = page.getByRole("button", { name: "Review" });