diff --git a/.env.test b/.env.test
index f8481d8..c3f3cd8 100644
--- a/.env.test
+++ b/.env.test
@@ -1,7 +1,7 @@
 # user=password:user=password;
 NUXT_LOCAL_AUTHS=usertest1=a5756f781e0e433986364b82de545c3b:usertest2=963a71f1868248df912e7488e02233f0
 NUXT_PUBLIC_LOCAL_AUTH_ENABLED=true
-NUXT_APP_ENABLE_DRIZZLE_LOGGING=true
+NUXT_APP_ENABLE_DRIZZLE_LOGGING=false
 NUXT_DB_URL=http://localhost:8888
 NUXT_DB_AUTH_TOKEN=basic:c3FsZDppOHJ3ZXlzNzBkN2Zh
 NUXT_S3_ENDPOINT=http://localhost:9000
@@ -12,3 +12,4 @@ NUXT_PUBLIC_GOOGLE_CLIENT_ID=sample-fc72420db46b4bfaaba8ea97a74535a7.apps.google
 NUXT_APP_MIGRATION_ENABLE=true
 NUXT_APP_MIGRATION_DIR=
 NUXT_APP_API_AUTH_KEY=dy9ea7v24f9f46j94p4xp1gcozwn1qcmgweb7kdzhuxi9br7gi89t2uy2r1896ag
+WORKAROUND_FIX_BREAK_PLAYWRIGHT=1
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 49c02b2..d86d467 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -38,8 +38,6 @@ jobs:
     - name: Install Playwright Browsers
       if: steps.playwright-cache.outputs.cache-hit != 'true'
       run: bunx playwright install --with-deps
-    - name: Setup e2e env
-      run: echo "${{ secrets.ENV_TESTS_BASE64 }}" | base64 --decode >> .env
     - run: bun run e2e
 
     - name: Deploy
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 8c86a02..f493551 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -108,6 +108,10 @@ export default defineNuxtConfig({
     define: {
       global: {},
     },
+
+    optimizeDeps: {
+      exclude: process.env.WORKAROUND_FIX_BREAK_PLAYWRIGHT === '1' ? ['primevue'] : [],
+    },
   },
 
   app: {
diff --git a/pages/apps.vue b/pages/apps.vue
index a3a80a6..b2ed37c 100644
--- a/pages/apps.vue
+++ b/pages/apps.vue
@@ -87,7 +87,7 @@ const upperCase = (value: string | null | undefined) => {
                                 orgName: orgNameParam?.toString() ?? '',
                             },
                         }" v-if="isOrg">
-                            <Button icon="pi pi-cog" outlined aria-label="Settings" />
+                            <Button icon="pi pi-cog" outlined aria-label="Settings" data-testid="settings_btn" />
                         </NuxtLink>
                     </div>
                 </div>
diff --git a/setup-test.sh b/setup-test.sh
index 83aace8..f67f7ce 100755
--- a/setup-test.sh
+++ b/setup-test.sh
@@ -2,7 +2,7 @@
 
 dotenv() {
     set -a
-    [ -f .env ] && . .env.test
+    [ -f .env.test ] && . .env.test
     set +a
 }
 
diff --git a/tests-e2e/apps.test.mts b/tests-e2e/apps.test.mts
index b68db3f..73f48ec 100644
--- a/tests-e2e/apps.test.mts
+++ b/tests-e2e/apps.test.mts
@@ -38,8 +38,8 @@ test('Apps test', async ({ page, goto, context }) => {
 
     await test.step('User admin can delete org', async () => {
         await page.getByTestId('a_menus').getByText(orgName).click()
-        await page.getByLabel('Settings').click()
-        await page.getByLabel('Danger').click()
+        await page.getByTestId('settings_btn').click()
+        await page.getByRole('menuitem').nth(2).click()
         const orgId = await page.getByTestId('org_name_span').textContent()
         await page.getByTestId('orgName').fill(orgId!)
         await page.getByTestId('deleteOrgBtn').click()