diff --git a/exgentic_a2a_runner/deploy-agent.sh b/exgentic_a2a_runner/deploy-agent.sh
index 82c2e42..94bbac8 100755
--- a/exgentic_a2a_runner/deploy-agent.sh
+++ b/exgentic_a2a_runner/deploy-agent.sh
@@ -191,7 +191,7 @@ IMAGE_TAG="${IMAGE_TAG:-latest}"
 REMOTE_IMAGE_NAME="${EXGENTIC_REGISTRY}/${FULL_AGENT_NAME}:${IMAGE_TAG}"
 
 TOOL_NAME="exgentic-mcp-${BENCHMARK_NAME}"
-NAMESPACE="team1"
+NAMESPACE="${NAMESPACE:-team1}"
 
 # Load shared URL helpers (kagenti_api_url, keycloak_api_url, agent_http_url, …)
 export CLUSTER_MODE INGRESS_DOMAIN
diff --git a/exgentic_a2a_runner/deploy-benchmark.sh b/exgentic_a2a_runner/deploy-benchmark.sh
index 72624a6..4d767df 100755
--- a/exgentic_a2a_runner/deploy-benchmark.sh
+++ b/exgentic_a2a_runner/deploy-benchmark.sh
@@ -123,7 +123,7 @@ EXGENTIC_REGISTRY="${EXGENTIC_REGISTRY:-ghcr.io/exgentic}"
 IMAGE_TAG="${IMAGE_TAG:-latest}"
 REMOTE_IMAGE_NAME="${EXGENTIC_REGISTRY}/exgentic-mcp-${BENCHMARK_NAME}:${IMAGE_TAG}"
 TOOL_NAME="exgentic-mcp-${BENCHMARK_NAME}"
-NAMESPACE="team1"
+NAMESPACE="${NAMESPACE:-team1}"
 KAGENTI_API="$(kagenti_api_url)"
 KEYCLOAK_API="$(keycloak_api_url)"
 
diff --git a/exgentic_a2a_runner/evaluate-benchmark.sh b/exgentic_a2a_runner/evaluate-benchmark.sh
index 033f899..3124a18 100755
--- a/exgentic_a2a_runner/evaluate-benchmark.sh
+++ b/exgentic_a2a_runner/evaluate-benchmark.sh
@@ -172,9 +172,9 @@ AGENT_DEPLOYMENT="$AGENT_SERVICE"
 if [ "$USE_MCP_GATEWAY" = "true" ]; then
     MCP_BASE_URL="$(mcp_gateway_url)"
 else
-    MCP_BASE_URL="$(tool_http_url "$BENCHMARK_DEPLOYMENT" "team1")"
+    MCP_BASE_URL="$(tool_http_url "$BENCHMARK_DEPLOYMENT" "${NAMESPACE:-team1}")"
 fi
-AGENT_BASE_URL="$(agent_http_url "$AGENT_SERVICE" "team1")"
+AGENT_BASE_URL="$(agent_http_url "$AGENT_SERVICE" "${NAMESPACE:-team1}")"
 
 echo ""
 echo "Using service endpoints..."
@@ -387,7 +387,7 @@ export MAX_PARALLEL_SESSIONS="$MAX_PARALLEL_SESSIONS"
 export PROMETHEUS_URL="$(prometheus_url)"
 export INFRA_MCP_POD_PREFIX="$BENCHMARK_DEPLOYMENT"
 export INFRA_A2A_POD_PREFIX="$AGENT_DEPLOYMENT"
-export INFRA_NAMESPACE="team1"
+export INFRA_NAMESPACE="${NAMESPACE:-team1}"
 
 if [ "$MLFLOW_ENABLED" = "true" ]; then
     # Send OTEL traces to the collector, which forwards to MLflow's /v1/traces