diff --git a/docker/agents/entrypoint.sh b/docker/agents/entrypoint.sh
index 0dc7f3f..968803b 100644
--- a/docker/agents/entrypoint.sh
+++ b/docker/agents/entrypoint.sh
@@ -58,6 +58,27 @@ _setup_git_creds() {
   _GIT_CREDS_LOG_FN=log repair_baked_cred_urls /home/agent/repos
 }
 
+# Configure git author identity for commits made by this container.
+# Derives identity from the resolved bot user (BOT_USER) to ensure commits
+# are visibly attributable to the correct bot in the forge timeline.
+configure_git_identity() {
+  # Resolve BOT_USER from FORGE_TOKEN if not already set
+  if [ -z "${BOT_USER:-}" ] && [ -n "${FORGE_TOKEN:-}" ]; then
+    BOT_USER=$(curl -sf --max-time 10 \
+      -H "Authorization: token ${FORGE_TOKEN}" \
+      "${FORGE_URL:-http://localhost:3000}/api/v1/user" 2>/dev/null | jq -r '.login // empty') || true
+  fi
+
+  # Default to dev-bot if resolution fails
+  BOT_USER="${BOT_USER:-dev-bot}"
+
+  # Configure git identity for all repositories
+  gosu agent git config --global user.name "${BOT_USER}"
+  gosu agent git config --global user.email "${BOT_USER}@disinto.local"
+
+  log "Git identity configured: ${BOT_USER} <${BOT_USER}@disinto.local>"
+}
+
 # Configure tea CLI login for forge operations (runs as agent user).
 # tea stores config in ~/.config/tea/ — persistent across container restarts
 # only if that directory is on a mounted volume.
@@ -277,6 +298,7 @@ pull_factory_repo() {
 
 # Configure git and tea once at startup (as root, then drop to agent)
 _setup_git_creds
+configure_git_identity
 configure_tea_login
 
 # Clone project repo on first run (makes agents self-healing, #589)
diff --git a/lib/formula-session.sh b/lib/formula-session.sh
index 450b655..e5fa274 100644
--- a/lib/formula-session.sh
+++ b/lib/formula-session.sh
@@ -314,7 +314,7 @@ _profile_commit_and_push() {
 
     if ! git diff --cached --quiet 2>/dev/null; then
       git config user.name "${AGENT_IDENTITY}" || true
-      git config user.email "${AGENT_IDENTITY}@users.noreply.codeberg.org" || true
+      git config user.email "${AGENT_IDENTITY}@disinto.local" || true
       git commit -m "$msg" --no-verify 2>/dev/null || true
       git push origin main --quiet 2>/dev/null || git push origin master --quiet 2>/dev/null || true
     fi