diff --git a/AGENTS.md b/AGENTS.md
index 79b2c1a..9d42b26 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -13,6 +13,7 @@ Robocopy_Overhaul: Codex-ready repository baseline for a Robocopy overhaul proje
 - Do not rewrite history or run destructive git commands unless explicitly requested.
 - Do not create a release unless explicitly requested.
 - Check the working tree before editing and before finishing. Preserve unrelated user changes.
+- Derive the repository owner and repository name from the target repository remote or `GITHUB_REPOSITORY`. Never reuse the owner from the template repository.
 - If `GITEA_TOKEN` is available locally, use it only for read-only Gitea API checks such as private repository metadata, package-read visibility, and Actions run status. Never print, commit, or store the token.
 - Repository cleanup automation must be non-destructive if added later.
 - Dependency, compliance, and release dry-run automation must report findings only unless the user explicitly asks for write actions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ed52d3..5a7d0ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,4 +4,5 @@ All notable changes to this project are documented here.
 
 ## Unreleased
 
+- Updated agent instructions for target-remote repository owner detection.
 - Added Codex Agent Repository Kit baseline files.
diff --git a/docs/agent-handoff.md b/docs/agent-handoff.md
index 29c4f8a..1736aa5 100644
--- a/docs/agent-handoff.md
+++ b/docs/agent-handoff.md
@@ -5,7 +5,7 @@ Use this file when a task spans multiple sessions, has unresolved follow-up work
 ## Current State
 
 ```text
-Codex repository baseline added. Implementation code, stack, commands, CI, and release artifacts are still pending.
+Codex repository baseline added and aligned with the latest kit owner-detection guidance. Implementation code, stack, commands, CI, and release artifacts are still pending.
 ```
 
 ## Changes Made
@@ -13,6 +13,7 @@ Codex repository baseline added. Implementation code, stack, commands, CI, and r
 - Added agent context files.
 - Added repository security and release documentation.
 - Added baseline README and ignore rules.
+- Updated agent instructions to derive repository owner and name from the target remote.
 
 ## Verification