diff --git a/templates/default/.env.template b/templates/default/.env.template
index 34531e0..f97d26e 100644
--- a/templates/default/.env.template
+++ b/templates/default/.env.template
@@ -1,8 +1,18 @@
-# Environment template for agent workspace
-# This file is processed and copied to .env in the workspace
+# Environment template for agent workspaces
+
+# Agent identification
 AGENT_ID={agentName}
 WORKSPACE_PATH={workspacePath}
 AGENT_WORKSPACE={workspacePath}
-GIT_USER_EMAIL={gitUserEmail}
+
+# Git user configuration (set by git-agent-sync)
 GIT_USER_NAME={gitUserName}
-AGENT_CREATED_AT={agentCreatedAt}
+GIT_USER_EMAIL={gitUserEmail}
+
+# Agent metadata
+AGENT_CREATED_AT={createdAt}
+
+# Custom environment variables can be added below
+# Example:
+# API_KEY=your-api-key
+# DEBUG=true