diff --git a/.github/issue_template.md b/.github/issue_template.md
index 4c7de65..9773b5c 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1 +1 @@
-This repository is only for issues relating to the website. If your issue relates to the app use the app's issue tracker: https://github.com/k9mail/k-9
+This repository is only for issues relating to the website. If your issue relates to the app use the app's issue tracker: https://github.com/thunderbird/thunderbird-android
diff --git a/_includes/footer.html b/_includes/footer.html
index 359441d..9f43067 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -36,7 +36,7 @@ <h5 class="text-white weight-700">Download</h5>
                     <div class="mb-2 size-14 weight-400"><a class="text-gray" target="_blank" rel="noopener"
                             href="https://f-droid.org/packages/com.fsck.k9/"><span>F-Droid</span></a></div>
                     <div class="mb-2 size-14 weight-400"><a class="text-gray" target="_blank" rel="noopener"
-                            href="https://github.com/k9mail/k-9/releases"><span>GitHub</span></a></div>
+                            href="https://github.com/thunderbird/thunderbird-android/releases"><span>GitHub</span></a></div>
                     <div class="mb-2 size-14 weight-400"><a class="text-gray" target="_blank" rel="noopener"
                             href="https://www.amazon.com/K-9-Dog-Walkers-Mail/dp/B004JK61K0/"><span>Amazon</span></a>
                     </div>
diff --git a/about.html b/about.html
index e591e60..9092539 100644
--- a/about.html
+++ b/about.html
@@ -24,7 +24,7 @@ <h2 class="text-main">History</h2>
     <h2 class="text-main pt-3">License</h2>
     <p class="text-main">K-9 Mail is licensed under the <a class="underline"
         href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank" rel="noopener">Apache License, Version
-        2.0</a>. The source code is available on <a class="underline" href="https://github.com/k9mail/k-9/"
+        2.0</a>. The source code is available on <a class="underline" href="https://github.com/thunderbird/thunderbird-android/"
         target="_blank" rel="noopener">GitHub</a>.</p>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/community.html b/community.html
index 40d58c3..37c2d57 100644
--- a/community.html
+++ b/community.html
@@ -35,7 +35,7 @@ <h3 class="text-main weight-700">Matrix</h3>
     </div>
     <div class="row justify-content-between pt-1 pb-3">
       <div class="col mx-3 gallery-item project-card full-width-sm">
-        <a class="text-dark stretched-link" target="_blank" rel="noopener" href="https://github.com/k9mail/k-9/issues">
+        <a class="text-dark stretched-link" target="_blank" rel="noopener" href="https://github.com/thunderbird/thunderbird-android/issues">
           <i class="fab fa-github size-36 text-main mb-3"></i>
           <h3 class="text-main weight-700">GitHub Bug Tracker</h3>
           <p>Use the issue tracker to report bugs or request new features.</p>
diff --git a/download.html b/download.html
index 314fd47..83baab5 100644
--- a/download.html
+++ b/download.html
@@ -37,7 +37,7 @@ <h3 class="text-main weight-700">F-Droid</h3>
     <div class="row justify-content-between pb-3">
       <div class="col mx-3 gallery-item project-card full-width-sm">
         <a class="text-dark stretched-link" target="_blank" rel="noopener"
-          href="https://github.com/k9mail/k-9/releases">
+          href="https://github.com/thunderbird/thunderbird-android/releases">
           <i class="fab fa-github size-36 text-main mb-3"></i>
           <h3 class="text-main weight-700">GitHub Releases</h3>
           <p>Direct APK downloads from GitHub, including pre-releases.</p>
@@ -53,4 +53,4 @@ <h3 class="text-main weight-700">Amazon App Store</h3>
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>