diff --git a/src/compile/common.rs b/src/compile/common.rs
index 0f072235..a49936ab 100644
--- a/src/compile/common.rs
+++ b/src/compile/common.rs
@@ -1248,7 +1248,7 @@ pub fn generate_template_parameters(front_matter: &FrontMatter) -> Result<String
 /// Version of the AWF (Agentic Workflow Firewall) binary to download from GitHub Releases.
 /// Update this when upgrading to a new AWF release.
 /// See: https://github.com/github/gh-aw-firewall/releases
-pub const AWF_VERSION: &str = "0.25.48";
+pub const AWF_VERSION: &str = "0.25.57";
 
 /// Prefix used to identify agentic pipeline YAML files generated by ado-aw.
 pub const HEADER_MARKER: &str = "# @ado-aw";
@@ -1330,7 +1330,7 @@ pub fn generate_header_comment(input_path: &std::path::Path) -> String {
 /// Docker image and version for the MCP Gateway (gh-aw-mcpg).
 /// Update this when upgrading to a new MCPG release.
 /// See: https://github.com/github/gh-aw-mcpg/releases
-pub const MCPG_VERSION: &str = "0.3.12";
+pub const MCPG_VERSION: &str = "0.3.21";
 
 /// Docker image for the MCPG container.
 pub const MCPG_IMAGE: &str = "ghcr.io/github/gh-aw-mcpg";