diff --git a/README.md b/README.md
index 5997fd7c..7004da81 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # Flatpak External Data Checker
 
-![Tests](https://github.com/flathub/flatpak-external-data-checker/workflows/Tests/badge.svg)
+![Tests](https://github.com/flathub-infra/flatpak-external-data-checker/workflows/Tests/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/github/flathub/flatpak-external-data-checker/badge.svg)](https://coveralls.io/github/flathub/flatpak-external-data-checker)
-[![CodeFactor](https://www.codefactor.io/repository/github/flathub/flatpak-external-data-checker/badge)](https://www.codefactor.io/repository/github/flathub/flatpak-external-data-checker)
+[![CodeFactor](https://www.codefactor.io/repository/github/flathub-infra/flatpak-external-data-checker/badge)](https://www.codefactor.io/repository/github/flathub-infra/flatpak-external-data-checker)
 
 This is a tool for checking for outdated or broken links of external
 data in Flatpak manifests.
@@ -107,7 +107,7 @@ jobs:
         with:
           ref: ${{ matrix.branch }}
 
-      - uses: docker://ghcr.io/flathub/flatpak-external-data-checker:latest
+      - uses: docker://ghcr.io/flathub-infra/flatpak-external-data-checker:latest
         env:
           GIT_AUTHOR_NAME: Flatpak External Data Checker
           GIT_COMMITTER_NAME: Flatpak External Data Checker
diff --git a/data/org.flathub.flatpak-external-data-checker.metainfo.xml b/data/org.flathub.flatpak-external-data-checker.metainfo.xml
index 0a2ab0f3..c3a7b2e9 100644
--- a/data/org.flathub.flatpak-external-data-checker.metainfo.xml
+++ b/data/org.flathub.flatpak-external-data-checker.metainfo.xml
@@ -3,8 +3,8 @@
   <id>org.flathub.flatpak-external-data-checker</id>
   <name>Flatpak External Data Checker</name>
   <summary>A tool for checking if the external data used in Flatpak manifests is still up to date</summary>
-  <url type="homepage">https://github.com/flathub/flatpak-external-data-checker</url>
-  <url type="bugtracker">https://github.com/flathub/flatpak-external-data-checker/issues</url>
+  <url type="homepage">https://github.com/flathub-infra/flatpak-external-data-checker</url>
+  <url type="bugtracker">https://github.com/flathub-infra/flatpak-external-data-checker/issues</url>
   <description>
     <p>This is a tool for checking for outdated or broken links of external data in Flatpak manifests.</p>
   </description>
diff --git a/run-in-container.sh b/run-in-container.sh
index 794a3125..512245e5 100755
--- a/run-in-container.sh
+++ b/run-in-container.sh
@@ -14,5 +14,5 @@ podman run --rm --privileged \
     -e GIT_COMMITTER_NAME="$GIT_USER_NAME" \
     -e GIT_AUTHOR_EMAIL="$GIT_USER_EMAIL" \
     -e GIT_COMMITTER_EMAIL="$GIT_USER_EMAIL" \
-    -it ghcr.io/flathub/flatpak-external-data-checker \
+    -it ghcr.io/flathub-infra/flatpak-external-data-checker \
     $*
diff --git a/src/lib/__init__.py b/src/lib/__init__.py
index abbafbab..d46133b3 100644
--- a/src/lib/__init__.py
+++ b/src/lib/__init__.py
@@ -10,7 +10,7 @@
 # With the default urllib User-Agent, dl.discordapp.net returns 403
 USER_AGENT = (
     "flatpak-external-data-checker/1.0 "
-    "(+https://github.com/flathub/flatpak-external-data-checker)"
+    "(+https://github.com/flathub-infra/flatpak-external-data-checker)"
 )
 
 HTTP_CLIENT_HEADERS = {"User-Agent": USER_AGENT}
diff --git a/src/main.py b/src/main.py
index e4dfa068..85756736 100755
--- a/src/main.py
+++ b/src/main.py
@@ -228,8 +228,8 @@ def commit_changes(changes: t.List[str]) -> CommittedChanges:
 
 DISCLAIMER = (
     "🤖 This pull request was automatically generated by "
-    "[flathub/flatpak-external-data-checker]"
-    "(https://github.com/flathub/flatpak-external-data-checker). "
+    "[flathub-infra/flatpak-external-data-checker]"
+    "(https://github.com/flathub-infra/flatpak-external-data-checker). "
     "Please [open an issue]"
     "(https://github.com/flathub-infra/flatpak-external-data-checker/issues/new) "
     "if you have any questions or complaints. 🤖"
diff --git a/tests/test_util.py b/tests/test_util.py
index 9b66152b..2dbbfb8d 100755
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -196,7 +196,7 @@ def test_parse_valid(self):
             "Wed, 20 Jan 2021 15:25:15 +0000",
             "Wed, 20 Jan 2021 18:25:15 +0300",
             "Wed, 20 Jan 2021 07:25:15 -0800",
-            # https://github.com/flathub/flatpak-external-data-checker/issues/370
+            # https://github.com/flathub-infra/flatpak-external-data-checker/issues/370
             "Wed, 20 Jan 2021 23:25:15 +0800",
             "Wed, 20 Jan 2021 23:25:15 Asia/Shanghai",
         ]: