diff --git a/agents/devops.yml b/agents/devops.yml
index 4d254ae7..1959fa5e 100644
--- a/agents/devops.yml
+++ b/agents/devops.yml
@@ -15,9 +15,9 @@ agent:
 dependencies:
   tasks:
     - create-doc-from-template
-    - create-platform-infrastructure
-    - review-infrastructure
-    - validate-infrastructure
+    - infra/create-platform-infrastructure
+    - infra/review-infrastructure
+    - infra/validate-infrastructure
   templates:
     - infrastructure-architecture-tmpl
   checklists:
diff --git a/bmad-core/tasks/create-infrastructure-architecture.md b/bmad-core/tasks/infra/create-infrastructure-architecture.md
similarity index 100%
rename from bmad-core/tasks/create-infrastructure-architecture.md
rename to bmad-core/tasks/infra/create-infrastructure-architecture.md
diff --git a/bmad-core/tasks/create-platform-infrastructure.md b/bmad-core/tasks/infra/create-platform-infrastructure.md
similarity index 100%
rename from bmad-core/tasks/create-platform-infrastructure.md
rename to bmad-core/tasks/infra/create-platform-infrastructure.md
diff --git a/bmad-core/tasks/review-infrastructure.md b/bmad-core/tasks/infra/review-infrastructure.md
similarity index 100%
rename from bmad-core/tasks/review-infrastructure.md
rename to bmad-core/tasks/infra/review-infrastructure.md
diff --git a/bmad-core/tasks/validate-infrastructure.md b/bmad-core/tasks/infra/validate-infrastructure.md
similarity index 100%
rename from bmad-core/tasks/validate-infrastructure.md
rename to bmad-core/tasks/infra/validate-infrastructure.md