diff --git a/.gitea/workflows/promote-master.yaml b/.gitea/workflows/promote-master.yaml
index 7ab54fc..b96395c 100644
--- a/.gitea/workflows/promote-master.yaml
+++ b/.gitea/workflows/promote-master.yaml
@@ -156,6 +156,7 @@ jobs:
         env:
           CI: "true"
           PLAYWRIGHT_BASE_URL: "https://localhost:5173"
+          E2E_ACCESS_TOKEN_EXPIRY_MINUTES: "180"
 
   deploy:
     runs-on: ubuntu-latest
diff --git a/backend/api/auth_api.py b/backend/api/auth_api.py
index 7ef2f77..ea79d47 100644
--- a/backend/api/auth_api.py
+++ b/backend/api/auth_api.py
@@ -39,7 +39,10 @@ UserQuery = Query()
 TokenQuery = Query()
 TOKEN_EXPIRY_MINUTES = 60 * 4
 RESET_PASSWORD_TOKEN_EXPIRY_MINUTES = 10
-ACCESS_TOKEN_EXPIRY_MINUTES = 15
+try:
+    ACCESS_TOKEN_EXPIRY_MINUTES = int(os.environ.get('ACCESS_TOKEN_EXPIRY_MINUTES', '15'))
+except ValueError:
+    ACCESS_TOKEN_EXPIRY_MINUTES = 15
 E2E_TEST_EMAIL = 'e2e@test.com'
 E2E_TEST_PASSWORD = 'E2eTestPass1!'
 E2E_TEST_PIN = '1234'
diff --git a/frontend/playwright.config.ts b/frontend/playwright.config.ts
index efefd3c..46c75b9 100644
--- a/frontend/playwright.config.ts
+++ b/frontend/playwright.config.ts
@@ -244,6 +244,7 @@ export default defineConfig({
         DB_ENV: 'e2e',
         DATA_ENV: 'e2e',
         SECRET_KEY: 'dev-secret-key-change-in-production',
+        ACCESS_TOKEN_EXPIRY_MINUTES: process.env.E2E_ACCESS_TOKEN_EXPIRY_MINUTES || '180',
         REFRESH_TOKEN_EXPIRY_DAYS: '90',
         DIGEST_TOKEN_SECRET: 'dev-digest-token',
         VAPID_PUBLIC_KEY: