diff --git a/.claude/settings.json b/.claude/settings.json
index b26bb12516e..5d87853f81a 100644
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -3,7 +3,7 @@
     "CLAUDE_CODE_ENABLE_TELEMETRY": "0",
     "DISABLE_TELEMETRY": "1",
     "OTEL_METRICS_EXPORTER": "otlp",
-    "AWS_PROFILE": "my-sandbox",
+    "AWS_PROFILE": "my-sandbox-1",
     "AWS_REGION": "eu-central-1",
     "CLAUDE_CODE_USE_BEDROCK": "1",
     "ANTHROPIC_MODEL": "eu.anthropic.claude-sonnet-4-5-20250929-v1:0",
diff --git a/.github/workflows/claude-settings-warning.yml b/.github/workflows/claude-settings-warning.yml
new file mode 100644
index 00000000000..fc7de09076f
--- /dev/null
+++ b/.github/workflows/claude-settings-warning.yml
@@ -0,0 +1,44 @@
+name: Check Claude Settings
+
+on:
+  pull_request:
+    paths:
+      - '.claude/settings.json'
+
+jobs:
+  check-settings:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for settings.json changes
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const comment = `⚠️ **Claude Settings Warning**
+
+            You've modified \`.claude/settings.json\`. This file contains the shared configuration for all contributors.
+
+            **If you're changing AWS_PROFILE:**
+            The default profile name is \`my-sandbox\`. If your AWS profile has a different name, override it locally instead of changing the shared file.
+
+            Create or edit \`.claude/settings.local.json\` in the repo root:
+
+            \`\`\`json
+            {
+              "env": {
+                "AWS_PROFILE": "your-sandbox-name"
+              }
+            }
+            \`\`\`
+
+            This local file is gitignored and will override the repo default.
+
+            **Only modify \`.claude/settings.json\` if you're changing shared configurations that apply to everyone and have discussed this change with the TW team.**`;
+
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: comment
+            });
+
+            core.setFailed('Settings.json was modified - see comment for guidance');