diff --git a/agent.py b/agent.py
index f980b45..e7b9681 100644
--- a/agent.py
+++ b/agent.py
@@ -27,7 +27,7 @@ def prewarm(proc: JobProcess):
 server.setup_fnc = prewarm
 
 
-@server.rtc_session()
+@server.rtc_session(agent_name=os.environ.get("AGENT_NAME", "matrix-ai"))
 async def entrypoint(ctx: JobContext):
     logger.info("Job received for room %s", ctx.job.room.name)
 
diff --git a/docker-compose.yml b/docker-compose.yml
index ab743a4..9c33884 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   agent:
     build: .
-    command: python agent.py start --agent-name matrix-ai
+    command: python agent.py start
     env_file: .env
     restart: unless-stopped
     network_mode: host