diff --git a/apps/golden-sample-app-e2e/specs/login.spec.ts b/apps/golden-sample-app-e2e/specs/login.spec.ts
index a3a13041..ea1fea10 100644
--- a/apps/golden-sample-app-e2e/specs/login.spec.ts
+++ b/apps/golden-sample-app-e2e/specs/login.spec.ts
@@ -14,7 +14,7 @@ const i18n = {
 
 test.describe.configure({ mode: 'parallel' });
 
-test.describe('@feature @i18n Login tests', () => {
+test.describe('@feature @i18n @e2e Login tests', () => {
   test('Empty user name', async ({ identityPage }) => {
     identityPage.open();
     await test.step('Validate Input fields labels', async () => {
diff --git a/package.json b/package.json
index 5d12b65d..b7ea563e 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "affected:test": "nx affected:test",
     "xi18n": "ng extract-i18n golden-sample-app --output-path=apps/golden-sample-app/src/locale && xliffmerge --profile apps/golden-sample-app/src/xliffmerge.json nl-NL",
     "e2e": "nx e2e",
-    "e2e-test": "npx playwright test --project 'Web Chrome'",
+    "e2e-test": "npx playwright test --project 'Web Chrome' --grep '@e2e'",
     "e2e-test-responsive": "npx playwright test --project 'mobile-chrome' --project 'mobile-safari' --grep '@visual.+@responsive|@responsive.+@visual' --workers=2",
     "lint": "nx run-many --all --target=lint",
     "format": "prettier --write \"{apps,libs}/**/*.{ts,md,html}\" \"!{apps,libs}/**/coverage\" ",
diff --git a/playwright.config.ts b/playwright.config.ts
index 09032bd5..ad07536a 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -79,7 +79,13 @@ const config: PlaywrightTestConfig = {
     {
       command: 'npx nx serve -c=mocks --port=4201',
       url: 'http://localhost:4201/',
-      timeout: 120 * 1000,
+      timeout: 30 * 1000,
+      reuseExistingServer: false,
+    },
+    {
+      command: 'npm run start',
+      url: 'http://localhost:4200/',
+      timeout: 30 * 1000,
       reuseExistingServer: false,
     },
   ],