diff --git a/.claude/skills/.gitignore b/.claude/skills/.gitignore
new file mode 100644
index 0000000000..08243027e5
--- /dev/null
+++ b/.claude/skills/.gitignore
@@ -0,0 +1,8 @@
+# Ignore dotagents-managed skills (synced from agents.toml)
+*
+# Keep custom repo-specific skills
+!.gitignore
+!create-java-pr/
+!create-java-pr/**
+!test/
+!test/**
diff --git a/.gitignore b/.gitignore
index f232c32db5..a7899736a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,6 @@ spy.log
 # Local Claude Code settings/state that should not be committed
 .claude/settings.local.json
 .claude/worktrees/
+# Auto-generated by dotagents — do not commit these files.
+agents.lock
+.agents/.gitignore
diff --git a/agents.toml b/agents.toml
new file mode 100644
index 0000000000..b2347f8e7e
--- /dev/null
+++ b/agents.toml
@@ -0,0 +1,33 @@
+# Whenever you make changes to this file, run the following to update all generated dotagent files 
+# npx @sentry/dotagents install
+# npx @sentry/dotagents sync
+
+version = 1
+
+[[skills]]
+name = "dotagents"
+source = "getsentry/dotagents"
+
+[[skills]]
+name = "sentry-workflow"
+source = "getsentry/sentry-for-ai"
+
+[[skills]]
+name = "sentry-fix-issues"
+source = "getsentry/sentry-for-ai"
+
+[[skills]]
+name = "sentry-code-review"
+source = "getsentry/sentry-for-ai"
+
+[[skills]]
+name = "sentry-pr-code-review"
+source = "getsentry/sentry-for-ai"
+
+[[skills]]
+name = "create-java-pr"
+source = "path:.agents/skills/create-java-pr"
+
+[[skills]]
+name = "test"
+source = "path:.agents/skills/test"