diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index e838d1ae2c..ecd8cb5086 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -147,6 +147,16 @@ jobs:
                   CYPRESS_dhis2Password_trackerAutoTestRestricted: ${{ secrets.CYPRESS_DHIS2_PASSWORD_TRACKER_AUTO_TEST_RESTRICTED }}
                   NODE_OPTIONS: "--openssl-legacy-provider"
 
+            - uses: actions/upload-artifact@v7
+              if: failure()
+              with:
+                  name: cypress-failure-${{ matrix.versions }}-${{ matrix.spec-group.id }}
+                  path: |
+                      cypress/screenshots
+                      cypress/videos
+                  if-no-files-found: ignore
+                  retention-days: 7
+
     call-e2e-tests-result:
         needs: cypress
         uses: ./.github/workflows/e2e-tests-result.yml
diff --git a/.github/workflows/verify-app.yml b/.github/workflows/verify-app.yml
index 9e3b485fc9..50f1efdf99 100644
--- a/.github/workflows/verify-app.yml
+++ b/.github/workflows/verify-app.yml
@@ -158,6 +158,16 @@ jobs:
           CYPRESS_dhis2Password_trackerAutoTestRestricted: ${{ secrets.CYPRESS_DHIS2_PASSWORD_TRACKER_AUTO_TEST_RESTRICTED }}
           NODE_OPTIONS: "--openssl-legacy-provider"
 
+      - uses: actions/upload-artifact@v7
+        if: failure()
+        with:
+          name: cypress-failure-dev-${{ matrix.spec-group.id }}
+          path: |
+            cypress/screenshots
+            cypress/videos
+          if-no-files-found: ignore
+          retention-days: 7
+
   build:
     runs-on: ubuntu-latest
     needs: [lint, typescript, unit-tests]
diff --git a/cypress/e2e/WorkingLists/sharedSteps.js b/cypress/e2e/WorkingLists/sharedSteps.js
index 5a4f48c094..003aa086b5 100644
--- a/cypress/e2e/WorkingLists/sharedSteps.js
+++ b/cypress/e2e/WorkingLists/sharedSteps.js
@@ -235,7 +235,10 @@ Then(/^you can load the view with the name ?(.*)$/, (name) => {
 When('you change the sharing settings', () => {
     cy.get('[data-test="list-view-menu-button"]').click();
     cy.contains('Share view').click();
-    cy.get('[placeholder="Search"]').type('Boateng');
+    cy.get('[data-test="sharing-dialog"]')
+        .find('[placeholder="Search"]')
+        .should('be.enabled')
+        .type('Boateng');
     cy.contains('Kevin Boateng').click();
     cy.contains('Choose a level').click();
     cy.contains('View and edit').click({ force: true });