diff --git a/deploy/autopush.yaml b/deploy/autopush.yaml
index 48f54957..858e12df 100644
--- a/deploy/autopush.yaml
+++ b/deploy/autopush.yaml
@@ -72,6 +72,8 @@ steps:
         --platform=managed \
         --no-allow-unauthenticated \
         --set-env-vars=MCP_VERSION=$(cat _version.txt) \
+        --set-env-vars=DC_USE_AGENT_API=true \
+        --set-env-vars=DC_AGENT_API_ROOT=https://autopush.api.datacommons.org/v2 \
         --set-env-vars=DC_API_ROOT=https://autopush.api.datacommons.org/v2 \
         --set-env-vars=DC_SEARCH_ROOT=https://datacommons.org \
         --set-env-vars=DC_API_KEY_VALIDATION_ROOT=https://autopush.api.datacommons.org \
diff --git a/deploy/release.yaml b/deploy/release.yaml
index ed5514e0..424527fa 100644
--- a/deploy/release.yaml
+++ b/deploy/release.yaml
@@ -72,6 +72,8 @@ steps:
         --platform=managed \
         --no-allow-unauthenticated \
         --set-env-vars=MCP_VERSION=$(cat _version.txt) \
+        --set-env-vars=DC_USE_AGENT_API=true \
+        --set-env-vars=DC_AGENT_API_ROOT=https://api.datacommons.org/v2 \
         --set-secrets=DC_API_KEY=dc-api-key-for-mcp:latest \
         --service-account=datacommons-mcp-server@datcom-mixer.iam.gserviceaccount.com \
         --project=datcom-mixer
diff --git a/deploy/staging.yaml b/deploy/staging.yaml
index b4be8270..a47a4ca1 100644
--- a/deploy/staging.yaml
+++ b/deploy/staging.yaml
@@ -67,6 +67,8 @@ steps:
         --platform=managed \
         --no-allow-unauthenticated \
         --set-env-vars=MCP_VERSION=$(cat _version.txt) \
+        --set-env-vars=DC_USE_AGENT_API=true \
+        --set-env-vars=DC_AGENT_API_ROOT=https://staging.api.datacommons.org/v2 \
         --set-env-vars=DC_API_ROOT=https://staging.api.datacommons.org/v2 \
         --set-env-vars=DC_SEARCH_ROOT=https://staging.datacommons.org \
         --set-env-vars=DC_API_KEY_VALIDATION_ROOT=https://staging.api.datacommons.org \