diff --git a/src/codegen/agents/code_agent.py b/src/codegen/agents/code_agent.py
index 3c3cc9b88..157df294d 100644
--- a/src/codegen/agents/code_agent.py
+++ b/src/codegen/agents/code_agent.py
@@ -60,6 +60,7 @@ def __init__(
             additional_tools=tools,
             **kwargs,
         )
+        self.model_name = model_name
         self.langsmith_client = Client()
         self.run_id = run_id
         self.instance_id = instance_id
@@ -92,8 +93,8 @@ def run(self, prompt: str, thread_id: Optional[str] = None) -> str:
         # this message has a reducer which appends the current message to the existing history
         # see more https://langchain-ai.github.io/langgraph/concepts/low_level/#reducers
         input = {"messages": [("user", prompt)]}
-        metadata = {"project": self.project_name}
-        tags = []
+        metadata = {"project": self.project_name, "model": self.model_name}
+        tags = [self.model_name]
         # Add SWEBench run ID and instance ID to the metadata and tags for filtering
         if self.run_id is not None:
             metadata["swebench_run_id"] = self.run_id