diff --git a/src/backend/services/system_agent_service.py b/src/backend/services/system_agent_service.py
index 91a33d535..ce7e4745f 100644
--- a/src/backend/services/system_agent_service.py
+++ b/src/backend/services/system_agent_service.py
@@ -225,9 +225,12 @@ async def _create_system_agent(self) -> dict:
             'trinity.platform': 'agent',
             'trinity.agent-name': SYSTEM_AGENT_NAME,
             'trinity.agent-type': agent_type,
+            'trinity.ssh-port': str(ssh_port),  # Required for port tracking
+            'trinity.cpu': str(resources.get('cpu', '4')),
+            'trinity.memory': resources.get('memory', '8g'),
+            'trinity.created': datetime.utcnow().isoformat(),
             'trinity.template': SYSTEM_AGENT_TEMPLATE,
             'trinity.is-system': 'true',  # Mark as system agent
-            'trinity.created-at': datetime.utcnow().isoformat()
         }
 
         # Create the container