diff --git a/platform/mcp/Dockerfile.athena-operator b/platform/mcp/Dockerfile.athena-operator
index 921a9c5..35908fd 100644
--- a/platform/mcp/Dockerfile.athena-operator
+++ b/platform/mcp/Dockerfile.athena-operator
@@ -3,7 +3,8 @@ FROM python:3.13-slim@sha256:ffb752e139c0a19692a43af8d8523b274222dd68eebad5d583b
 ARG MCP_PROXY_VERSION=0.12.0
 ARG MCP_VERSION=1.29.0
 RUN pip install --no-cache-dir "mcp==${MCP_VERSION}" "mcp-proxy==${MCP_PROXY_VERSION}" \
-    && useradd --system --uid 10003 --create-home --home-dir /app operator
+    && groupadd --system --gid 10003 athenaoperator \
+    && useradd --system --uid 10003 --gid 10003 --create-home --home-dir /app athenaoperator
 COPY athena_operator_mcp.py /app/athena_operator_mcp.py
 RUN chown -R 10003:10003 /app
 USER 10003:10003