diff --git a/docs/reference/agents.md b/docs/reference/agents.md
index 7f88638d1..9c3bff074 100644
--- a/docs/reference/agents.md
+++ b/docs/reference/agents.md
@@ -20,7 +20,7 @@ This page lists the default BMM (Agile suite) agents that install with BMad Meth
 | Analyst (Mary)              | `bmad-analyst`       | `BP`, `RS`, `CB`, `WB`, `DP`       | Brainstorm Project, Research, Create Brief, PRFAQ Challenge, Document Project                       |
 | Product Manager (John)      | `bmad-pm`            | `CP`, `VP`, `EP`, `CE`, `IR`, `CC` | Create/Validate/Edit PRD, Create Epics and Stories, Implementation Readiness, Correct Course        |
 | Architect (Winston)         | `bmad-architect`     | `CA`, `IR`                         | Create Architecture, Implementation Readiness                                                       |
-| DevOps Lead (Riley)         | `bmad-devops`        | `CA`, `IR`                         | Create Architecture (infra focus), Implementation Readiness (deployment focus)                       |
+| DevOps Lead (Riley)         | `bmad-devops`        | `II`, `IP`, `CA`, `IR`             | Create Infrastructure, Create Pipeline, Create Architecture (infra focus), Implementation Readiness  |
 | Developer (Amelia)          | `bmad-agent-dev`     | `DS`, `QD`, `QA`, `CR`, `SP`, `CS`, `ER` | Dev Story, Quick Dev, QA Test Generation, Code Review, Sprint Planning, Create Story, Epic Retrospective |
 | UX Designer (Sally)         | `bmad-ux-designer`   | `CU`                               | Create UX Design                                                                                    |
 | Technical Writer (Paige)    | `bmad-tech-writer`   | `DP`, `WD`, `US`, `MG`, `VD`, `EC` | Document Project, Write Document, Update Standards, Mermaid Generate, Validate Doc, Explain Concept |
diff --git a/src/bmm-skills/3-solutioning/bmad-agent-devops/SKILL.md b/src/bmm-skills/3-solutioning/bmad-agent-devops/SKILL.md
index d38aedd07..8e3f61e8d 100644
--- a/src/bmm-skills/3-solutioning/bmad-agent-devops/SKILL.md
+++ b/src/bmm-skills/3-solutioning/bmad-agent-devops/SKILL.md
@@ -32,6 +32,8 @@ When you are in this persona and the user calls a skill, this persona must carry
 
 | Code | Description | Skill |
 |------|-------------|-------|
+| II | Guided workflow to define infrastructure-as-code strategy, environment topology, and state management | bmad-create-infrastructure |
+| IP | Guided workflow to design CI/CD pipeline architecture, deployment strategies, and promotion gates | bmad-create-pipeline |
 | CA | Collaborate on infrastructure and deployment decisions within the architecture workflow | bmad-create-architecture |
 | IR | Validate infrastructure and deployment readiness alongside architecture review | bmad-check-implementation-readiness |
 
diff --git a/src/bmm-skills/3-solutioning/bmad-create-architecture/steps/step-04-decisions.md b/src/bmm-skills/3-solutioning/bmad-create-architecture/steps/step-04-decisions.md
index 061b69a7e..71c680c66 100644
--- a/src/bmm-skills/3-solutioning/bmad-create-architecture/steps/step-04-decisions.md
+++ b/src/bmm-skills/3-solutioning/bmad-create-architecture/steps/step-04-decisions.md
@@ -121,6 +121,11 @@ Based on technical preferences, starter template choice, and project context, id
 - Monitoring and logging
 - Scaling strategy
 
+> **DevOps Deep Dive:** For detailed infrastructure-as-code, environment topology, container orchestration, and CI/CD pipeline design decisions, use the dedicated DevOps workflows after completing architecture decisions:
+>
+> - `bmad-create-infrastructure` — IaC tool selection, state management, environment strategy, container orchestration
+> - `bmad-create-pipeline` — Pipeline stage design, deployment strategies, promotion gates, rollback procedures
+
 ### 3. Facilitate Each Decision Category
 
 For each category, facilitate collaborative decision making:
@@ -236,6 +241,8 @@ After facilitating all decision categories, prepare the content to append:
 
 {{infrastructure_related_decisions_with_versions_and_rationale}}
 
+> _For detailed infrastructure and pipeline decisions, see the dedicated DevOps workflows: `bmad-create-infrastructure` and `bmad-create-pipeline`._
+
 ### Decision Impact Analysis
 
 **Implementation Sequence:**