diff --git a/Dockerfile b/Dockerfile
index d519c465..b439b564 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,9 +36,8 @@ ENV DISPLAY_CONFIGURATION='1024x768x24'
 # Agent Environment
 ENV AGENT_NAME='Katalon Agent'
 ENV SERVER_URL='https://testops.katalon.io'
-ENV KATALON_USERNAME=''
 ENV KATALON_API_KEY=''
-ENV TEAM_ID=''
+ENV ORGANIZATION_ID=''
 ENV PROXY=''
 ENV LOG_LEVEL='INFO'
 ENV XVFB_RUN=''
diff --git a/docker/scripts/agent.sh b/docker/scripts/agent.sh
index 31d1ff34..ff33cc13 100755
--- a/docker/scripts/agent.sh
+++ b/docker/scripts/agent.sh
@@ -11,7 +11,6 @@ cd $KATALON_AGENT_DIR
 
 ./cli-linux-x64 config \
     --server-url "$SERVER_URL" \
-    --username "$KATALON_USERNAME" \
     --apikey "$KATALON_API_KEY" \
     --organizationid "$ORGANIZATION_ID" \
     --agent-name "$AGENT_NAME" \