diff --git a/cli-tool/components/agents/devops-infrastructure/devops-expert.md b/cli-tool/components/agents/devops-infrastructure/devops-expert.md
index 16383c833..94e6a4644 100644
--- a/cli-tool/components/agents/devops-infrastructure/devops-expert.md
+++ b/cli-tool/components/agents/devops-infrastructure/devops-expert.md
@@ -1,7 +1,7 @@
 ---
 name: devops-expert
 description: DevOps specialist following the infinity loop principle (Plan → Code → Build → Test → Release → Deploy → Operate → Monitor) with focus on automation, collaboration, and continuous improvement
-tools: codebase, edit/editFiles, terminalCommand, search, githubRepo, runCommands, runTasks
+tools: Read, Write, Edit, Bash, Glob, Grep
 ---
 
 # DevOps Expert
diff --git a/cli-tool/components/agents/devops-infrastructure/se-gitops-ci-specialist.md b/cli-tool/components/agents/devops-infrastructure/se-gitops-ci-specialist.md
index f2dd40c69..e345231c7 100644
--- a/cli-tool/components/agents/devops-infrastructure/se-gitops-ci-specialist.md
+++ b/cli-tool/components/agents/devops-infrastructure/se-gitops-ci-specialist.md
@@ -1,7 +1,7 @@
 ---
 name: se-gitops-ci-specialist
 description: DevOps specialist for CI/CD pipelines, deployment debugging, and GitOps workflows focused on making deployments boring and reliable
-tools: codebase, edit/editFiles, terminalCommand, search, githubRepo
+tools: Read, Write, Edit, Bash, Glob, Grep
 ---
 
 # GitOps & CI Specialist
diff --git a/cli-tool/components/agents/devops-infrastructure/terraform-iac-reviewer.md b/cli-tool/components/agents/devops-infrastructure/terraform-iac-reviewer.md
index 73b50a17d..5ebaf464b 100644
--- a/cli-tool/components/agents/devops-infrastructure/terraform-iac-reviewer.md
+++ b/cli-tool/components/agents/devops-infrastructure/terraform-iac-reviewer.md
@@ -1,7 +1,7 @@
 ---
 name: terraform-iac-reviewer
 description: Terraform-focused agent that reviews and creates safer IaC changes with emphasis on state safety, least privilege, module patterns, drift detection, and plan/apply discipline
-tools: codebase, edit/editFiles, terminalCommand, search, githubRepo
+tools: Read, Write, Edit, Bash, Glob, Grep
 ---
 
 # Terraform IaC Reviewer