diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e-v2.yml
similarity index 99%
rename from .github/workflows/e2e.yml
rename to .github/workflows/e2e-v2.yml
index 48c2ec055c..e7a4738921 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e-v2.yml
@@ -1,4 +1,4 @@
-name: End-to-End Tests
+name: End-to-End Tests V2
 
 on:
   push:
diff --git a/dev-packages/e2e-tests/cli.mjs b/dev-packages/e2e-tests/cli.mjs
index cb910ef938..c9281549f3 100755
--- a/dev-packages/e2e-tests/cli.mjs
+++ b/dev-packages/e2e-tests/cli.mjs
@@ -234,16 +234,35 @@ if (actions.includes('test')) {
   if (!sentryAuthToken) {
     console.log('Skipping maestro test due to unavailable or empty SENTRY_AUTH_TOKEN');
   } else {
-    execSync(
-      `maestro test maestro \
-        --env=APP_ID="${appId}" \
-        --env=SENTRY_AUTH_TOKEN="${sentryAuthToken}" \
-        --debug-output maestro-logs \
-        --flatten-debug-output`,
-      {
-        stdio: 'inherit',
-        cwd: e2eDir,
-      },
-    );
+    try {
+      execSync(
+        `maestro test maestro \
+          --env=APP_ID="${appId}" \
+          --env=SENTRY_AUTH_TOKEN="${sentryAuthToken}" \
+          --debug-output maestro-logs \
+          --flatten-debug-output`,
+        {
+          stdio: 'inherit',
+          cwd: e2eDir,
+        },
+      );
+    } finally {
+      // Always redact sensitive data, even if the test fails
+      const redactScript = `
+        if [[ "$(uname)" == "Darwin" ]]; then
+          find ./maestro-logs -type f -exec sed -i '' "s/${sentryAuthToken}/[REDACTED]/g" {} +
+          echo 'Redacted sensitive data from logs on MacOS'
+        else
+          find ./maestro-logs -type f -exec sed -i "s/${sentryAuthToken}/[REDACTED]/g" {} +
+          echo 'Redacted sensitive data from logs on Ubuntu'
+        fi
+      `;
+
+      try {
+        execSync(redactScript, { stdio: 'inherit', cwd: e2eDir, shell: '/bin/bash' });
+      } catch (error) {
+        console.warn('Failed to redact sensitive data from logs:', error.message);
+      }
+    }
   }
 }