diff --git a/.github/workflows/code-quality-caller.yml b/.github/workflows/code-quality-caller.yml
index 3600fcc..eb1e992 100644
--- a/.github/workflows/code-quality-caller.yml
+++ b/.github/workflows/code-quality-caller.yml
@@ -31,4 +31,3 @@ jobs:
       # fleet-wide + advisory soak done (backend#1303).
       soft-fail: false
       all-files: ${{ inputs.all-files || false }}
-      gitleaks-baseline: .gitleaks-baseline.json
diff --git a/.gitleaks-baseline.json b/.gitleaks-baseline.json
deleted file mode 100644
index d9c7cbd..0000000
--- a/.gitleaks-baseline.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[
- {
-  "RuleID": "generic-api-key",
-  "Description": "Detected a Generic API Key, potentially exposing access to various services and sensitive operations.",
-  "StartLine": 212,
-  "EndLine": 212,
-  "StartColumn": 4,
-  "EndColumn": 45,
-  "Match": "IdempotencyKey:   \"REDACTED\"",
-  "Secret": "REDACTED",
-  "File": "internal/submit/submit_test.go",
-  "SymlinkFile": "",
-  "Commit": "d2754bd0e71bd5363b7c7f51a286b7d705e7928d",
-  "Link": "https://github.com/tracebloc/cli/blob/d2754bd0e71bd5363b7c7f51a286b7d705e7928d/internal/submit/submit_test.go#L212",
-  "Entropy": 4.004886,
-  "Author": "lukasWuttke",
-  "Email": "54042461+LukasWodka@users.noreply.github.com",
-  "Date": "2026-07-13T11:27:35Z",
-  "Message": "feat(push): print the run's correlation id on submit (backend#1028 item 3) (#245)\n\nThe idempotency key the CLI already sends is becoming the end-to-end\ningest correlation id: jobs-manager derives the Job name from it, labels\nevery spawned resource with it, and (client-runtime) stamps it into the\ningestor container as TRACEBLOC_INGEST_CORRELATION_ID, where the\ningestor (data-ingestors) logs it and carries it into the backend\nregistration payload.\n\nThe CLI was the only layer that never showed the key, so the customer\nhad no copy of the one string that threads all layers together. Print\nit as a hint line on every submit path — fresh and replay (a replayed\nrun is exactly when you reach for the id to find the already-running\nJob).\n\nNo wire change: the key was already in the POST body.\n\nCo-authored-by: Claude Fable 5 \u003cnoreply@anthropic.com\u003e",
-  "Tags": [],
-  "Fingerprint": "d2754bd0e71bd5363b7c7f51a286b7d705e7928d:internal/submit/submit_test.go:generic-api-key:212"
- }
-]
diff --git a/.gitleaks.toml b/.gitleaks.toml
new file mode 100644
index 0000000..b627140
--- /dev/null
+++ b/.gitleaks.toml
@@ -0,0 +1,12 @@
+title = "tracebloc/cli gitleaks config"
+
+[extend]
+useDefault = true
+
+[[allowlists]]
+description = "synthetic idempotency key in submit tests (1 baseline entry)"
+targetRules = ["generic-api-key"]
+condition = "and"
+paths = ['''_test\.go$''']
+regexTarget = "line"
+regexes = ['''IdempotencyKey:\s*"nightly-claims-[0-9.]+"''']