diff --git a/docker-compose.yml b/docker-compose.yml
index 67621344..c1b4302e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,6 +43,9 @@ services:
       # to ensure Playwright works in Docker
       PLAYWRIGHT_BROWSERS_PATH: /ms-playwright
       PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 0
+      # Force container/CI detection for headless mode
+      CI: "true"
+      CONTAINER: "true"
       # DEBUG: pw:api
       # PWDEBUG: 1  # Enables debugging
       CHROMIUM_FLAGS: '--disable-gpu --no-sandbox --headless=new'
diff --git a/server/src/browser-management/classes/RemoteBrowser.ts b/server/src/browser-management/classes/RemoteBrowser.ts
index 6d758aef..7e5839c8 100644
--- a/server/src/browser-management/classes/RemoteBrowser.ts
+++ b/server/src/browser-management/classes/RemoteBrowser.ts
@@ -533,6 +533,7 @@ export class RemoteBrowser {
                         "--disable-extensions",
                         "--no-sandbox",
                         "--disable-dev-shm-usage",
+                        "--disable-gpu",
                         "--force-color-profile=srgb",
                         "--force-device-scale-factor=2",
                         "--ignore-certificate-errors",