diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f766e8..a66e55a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,8 +34,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   as discovered tools in coverage summaries.
 - `agentshield ci install` no longer generates a workflow that points to the
   nonexistent `limaronaldo/agentshield@v1` action ref.
-- The GitHub Action now follows repository redirects when resolving
-  `version: latest`.
+- `agentshield ci install` now generates workflows with the canonical
+  `aiconnai/agentshield@main` action ref.
+- The GitHub Action now resolves release assets from the canonical
+  `aiconnai/agentshield` repository.
 
 ## [0.8.6] - 2026-06-07
 
diff --git a/README.md b/README.md
index 1dacf30..d175879 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: limaronaldo/agentshield@main
+      - uses: aiconnai/agentshield@main
         with:
           path: '.'
           fail-on: 'high'
diff --git a/action.yml b/action.yml
index 4666525..b6551c0 100644
--- a/action.yml
+++ b/action.yml
@@ -60,7 +60,7 @@ runs:
       run: |
         if [ "${{ inputs.version }}" = "latest" ]; then
           VERSION=$(
-            curl -fsSL https://api.github.com/repos/limaronaldo/agentshield/releases/latest 2>/dev/null \
+            curl -fsSL https://api.github.com/repos/aiconnai/agentshield/releases/latest 2>/dev/null \
               | sed -nE 's/.*"tag_name": *"([^"]+)".*/\1/p' \
               | head -n 1 || true
           )
@@ -92,7 +92,7 @@ runs:
       run: |
         VERSION="${{ steps.version.outputs.version }}"
         TARGET="${{ steps.platform.outputs.target }}"
-        BASE_URL="https://github.com/limaronaldo/agentshield/releases/download/${VERSION}"
+        BASE_URL="https://github.com/aiconnai/agentshield/releases/download/${VERSION}"
 
         if [[ "$TARGET" == *"windows"* ]]; then
           ARCHIVE="agentshield-${VERSION}-${TARGET}.zip"
diff --git a/src/ux.rs b/src/ux.rs
index 3bac518..9d2c2b6 100644
--- a/src/ux.rs
+++ b/src/ux.rs
@@ -85,7 +85,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: limaronaldo/agentshield@main
+      - uses: aiconnai/agentshield@main
         with:
           path: "{scan_path}"
           fail-on: "{fail_on}"
@@ -543,7 +543,7 @@ mod tests {
             upload_sarif: true,
         });
 
-        assert!(workflow.contains("uses: limaronaldo/agentshield@main"));
+        assert!(workflow.contains("uses: aiconnai/agentshield@main"));
         assert!(workflow.contains("fail-on: \"high\""));
         assert!(workflow.contains("ignore-tests: true"));
         assert!(workflow.contains("upload-sarif: true"));