diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index eee10617..b87b31d8 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -4,7 +4,7 @@ contact_links:
     about: Please report security vulnerabilities to security@tiangolo.com
   - name: Question or Problem
     about: Ask a question or ask about a problem in GitHub Discussions.
-    url: https://github.com/tiangolo/fastapi-cli/discussions/categories/questions
+    url: https://github.com/fastapi/fastapi-cli/discussions/categories/questions
   - name: Feature Request
     about: To suggest an idea or ask about a feature, please start with a question saying what you would like to achieve. There might be a way to do it already.
-    url: https://github.com/tiangolo/fastapi-cli/discussions/categories/questions
+    url: https://github.com/fastapi/fastapi-cli/discussions/categories/questions
diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml
index b85c31c7..40428d0f 100644
--- a/.github/workflows/issue-manager.yml
+++ b/.github/workflows/issue-manager.yml
@@ -19,7 +19,7 @@ permissions:
 
 jobs:
   issue-manager:
-    if: github.repository_owner == 'tiangolo'
+    if: github.repository_owner == 'fastapi'
     runs-on: ubuntu-latest
     steps:
       - name: Dump GitHub context
diff --git a/CITATION.cff b/CITATION.cff
index f491a8e8..41e4150d 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -12,7 +12,7 @@ authors:
     family-names: Ramírez
     email: tiangolo@gmail.com
 identifiers:
-repository-code: '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/tiangolo/fastapi-cli'
+repository-code: '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/fastapi/fastapi-cli'
 url: 'https://fastapi.tiangolo.com'
 abstract: >-
   Run and manage FastAPI apps from the command line with FastAPI CLI. 🚀
diff --git a/README.md b/README.md
index 4d908f07..ef22bcea 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,20 @@
 # FastAPI CLI
 
-<a href="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/tiangolo/fastapi-cli/actions/workflows/test.yml" target="_blank">
-    <img src="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/tiangolo/fastapi-cli/actions/workflows/test.yml/badge.svg" alt="Test">
+<a href="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/fastapi/fastapi-cli/actions/workflows/test.yml" target="_blank">
+    <img src="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/fastapi/fastapi-cli/actions/workflows/test.yml/badge.svg" alt="Test">
 </a>
-<a href="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/tiangolo/fastapi-cli/actions/workflows/publish.yml" target="_blank">
-    <img src="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/tiangolo/fastapi-cli/actions/workflows/publish.yml/badge.svg" alt="Publish">
+<a href="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/fastapi/fastapi-cli/actions/workflows/publish.yml" target="_blank">
+    <img src="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/fastapi/fastapi-cli/actions/workflows/publish.yml/badge.svg" alt="Publish">
 </a>
-<a href="https://coverage-badge.samuelcolvin.workers.dev/redirect/tiangolo/fastapi-cli" target="_blank">
-    <img src="https://coverage-badge.samuelcolvin.workers.dev/tiangolo/fastapi-cli.svg" alt="Coverage">
+<a href="https://coverage-badge.samuelcolvin.workers.dev/redirect/fastapi/fastapi-cli" target="_blank">
+    <img src="https://coverage-badge.samuelcolvin.workers.dev/fastapi/fastapi-cli.svg" alt="Coverage">
 <a href="https://pypi.org/project/fastapi-cli" target="_blank">
     <img src="https://img.shields.io/pypi/v/fastapi-cli?color=%2334D058&label=pypi%20package" alt="Package version">
 </a>
 
 ---
 
-**Source Code**: <a href="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/tiangolo/fastapi-cli" target="_blank">https://github.com/tiangolo/fastapi-cli</a>
+**Source Code**: <a href="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/fastapi/fastapi-cli" target="_blank">https://github.com/fastapi/fastapi-cli</a>
 
 ---
 
diff --git a/pyproject.toml b/pyproject.toml
index 7d325e54..72967cea 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -44,8 +44,8 @@ standard = [
 
 [project.urls]
 Documentation = "https://fastapi.tiangolo.com"
-homepage = "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/tiangolo/fastapi-cli"
-Repository = "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/tiangolo/fastapi-cli"
+homepage = "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/fastapi/fastapi-cli"
+Repository = "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/fastapi/fastapi-cli"
 
 [project.scripts]
 fastapi = "fastapi_cli.cli:main"