diff --git a/energy-tests/nextcloud_create_doc_and_share.py b/energy-tests/nextcloud_create_doc_and_share.py
index 5266dff5..e736df92 100644
--- a/energy-tests/nextcloud_create_doc_and_share.py
+++ b/energy-tests/nextcloud_create_doc_and_share.py
@@ -35,7 +35,7 @@ def run(playwright: Playwright, browser_name: str) -> None:
         page.get_by_role("button", name="Create a new file with the selected template").click()
         sleep(5)
         with contextlib.suppress(TimeoutError):
-            page.locator('button.first-run-wizard__close-button').click(timeout=15_000)
+            page.locator('#firstrunwizard .modal-container__content button[aria-label=Close]').click(timeout=15_000)
         page.keyboard.press("Escape")
         log_note("Share file with other user")
         page.get_by_role("link", name="colab_meeting .md").get_by_role("link", name="Share").click()
diff --git a/energy-tests/nextcloud_docs_collaboration.py b/energy-tests/nextcloud_docs_collaboration.py
index 5105b692..7b28d358 100644
--- a/energy-tests/nextcloud_docs_collaboration.py
+++ b/energy-tests/nextcloud_docs_collaboration.py
@@ -45,7 +45,7 @@ def collaborate(playwright: Playwright, browser_name: str) -> None:
         log_note("Opening document with both users")
         with contextlib.suppress(TimeoutError):
             sleep(5)
-            docs_user.locator('button.first-run-wizard__close-button').click(timeout=15_000)
+            docs_user.locator('#firstrunwizard .modal-container__content button[aria-label=Close]').click(timeout=15_000)
         admin_user.get_by_role("link", name="Files", exact=True).click()
         docs_user.get_by_role("link", name="Files", exact=True).click()
         admin_user.get_by_role("link", name="Shares", exact=True).click()
diff --git a/energy-tests/nextcloud_talk.py b/energy-tests/nextcloud_talk.py
index 637eb246..e025e1a5 100644
--- a/energy-tests/nextcloud_talk.py
+++ b/energy-tests/nextcloud_talk.py
@@ -45,7 +45,7 @@ def create_conversation(playwright: Playwright, browser_name: str) -> str:
         log_note("Close first-time run popup")
         with contextlib.suppress(TimeoutError):
             sleep(5)
-            page.locator('button.first-run-wizard__close-button').click(timeout=15_000)
+            page.locator('#firstrunwizard .modal-container__content button[aria-label=Close]').click(timeout=15_000)
 
         log_note("Open Talk app")
         page.locator('#header').get_by_role("link", name="Talk", exact=True).click()