diff --git a/.github/workflows/reusable-e2e-test-job.yml b/.github/workflows/reusable-e2e-test-job.yml
index 9ef55b1..2c3c2a5 100644
--- a/.github/workflows/reusable-e2e-test-job.yml
+++ b/.github/workflows/reusable-e2e-test-job.yml
@@ -15,8 +15,6 @@ jobs:
     env:
       USER_ID: ${{ secrets.TEST_TRAINEE_ID }}
       URL: ${{ secrets.FRONTEND_URL }}
-      BASICAUTHENTICATION_USERNAME: ${{ secrets.BASICAUTHENTICATION_USERNAME }}
-      BASICAUTHENTICATION_PASSWORD: ${{ secrets.BASICAUTHENTICATION_PASSWORD }}
       ENVIRONMENT_NAME: staging
     steps:
       - uses: actions/checkout@v4
@@ -42,11 +40,6 @@ jobs:
           npx playwright install
           npx playwright test --output test-results --config playwright.config.ts
 
-      - if: failure()
-        run: |
-          cd packages/e2e
-          npx playwright show-trace test-results/tests-entry-entry-switch-language-chromium/trace.zip
-
       - name: Upload Playwright test results
         if: failure()
         uses: actions/upload-artifact@v4
diff --git a/packages/e2e/playwright.config.ts b/packages/e2e/playwright.config.ts
index 8605f64..7eb1e20 100644
--- a/packages/e2e/playwright.config.ts
+++ b/packages/e2e/playwright.config.ts
@@ -1,10 +1,9 @@
 // playwright.config.ts
 import { PlaywrightTestConfig, devices } from '@playwright/test'
-const { BASICAUTHENTICATION_USERNAME, BASICAUTHENTICATION_PASSWORD } = process.env
 
 const config: PlaywrightTestConfig = {
   forbidOnly: !!process.env.CI,
-  retries: 0,
+  retries: process.env.CI ? 2 : 0,
   outputDir: 'test-results',
   use: {
     trace: 'on',
@@ -14,10 +13,6 @@ const config: PlaywrightTestConfig = {
       name: 'chromium',
       use: {
         ...devices['Desktop Chrome'],
-        httpCredentials: {
-          username: BASICAUTHENTICATION_USERNAME ? BASICAUTHENTICATION_USERNAME : '',
-          password: BASICAUTHENTICATION_PASSWORD ? BASICAUTHENTICATION_PASSWORD : '',
-        },
       },
     },
     // {
diff --git a/packages/e2e/tests/entry.spec.ts b/packages/e2e/tests/entry.spec.ts
index d7e3785..65d7193 100644
--- a/packages/e2e/tests/entry.spec.ts
+++ b/packages/e2e/tests/entry.spec.ts
@@ -8,7 +8,6 @@ URL ??= 'http://localhost:8080'
 async function goto(page: Page, path: string = '') {
   await page.goto(`${URL}${path}`)
   const statusBar = page.locator('#status-bar')
-  await statusBar.waitFor({ timeout: 10000 })
   await statusBar.hover()
 
   const input = page.locator('#dev-login-user-id')