diff --git a/README.md b/README.md
index bcf8cd9..706e580 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Server for stable, curated Haskell package sets
 
-This repo is part of the [Stackage project](https://github.com/fpco/stackage),
+This repo is part of the [Stackage project](https://github.com/commercialhaskell/stackage),
 and the live server can be viewed at https://www.stackage.org.
 
 ## Building locally
diff --git a/src/Application.hs b/src/Application.hs
index a090513..9cf1f2a 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -138,7 +138,7 @@ withFoundation appLogFunc appSettings inner = do
             then do
                 fp <- runSimpleApp $ getStackageContentDir "."
                 gitRepoDev fp loadWebsiteContent
-            else gitRepo "https://github.com/fpco/stackage-content.git" "master" loadWebsiteContent
+            else gitRepo "https://github.com/commercialhaskell/stackage-content.git" "master" loadWebsiteContent
     let runContentUpdates =
             Concurrently $
             forever $
diff --git a/src/Handler/BuildPlan.hs b/src/Handler/BuildPlan.hs
index 4c53e59..1b0a0a2 100644
--- a/src/Handler/BuildPlan.hs
+++ b/src/Handler/BuildPlan.hs
@@ -6,7 +6,7 @@ import Import
 
 getBuildPlanR :: SnapName -> Handler TypedContent
 getBuildPlanR _slug = track "Handler.BuildPlan.getBuildPlanR" $ do
-    error "temporarily disabled, please open on issue on https://github.com/fpco/stackage-server/issues/ if you need it"
+    error "temporarily disabled, please open on issue on https://github.com/commercialhaskell/stackage-server/issues/ if you need it"
     {-
     fullDeps <- (== Just "true") <$> lookupGetParam "full-deps"
     spec <- parseSnapshotSpec $ toPathPiece slug
diff --git a/src/Handler/StackageHome.hs b/src/Handler/StackageHome.hs
index 8445fc6..613d9c0 100644
--- a/src/Handler/StackageHome.hs
+++ b/src/Handler/StackageHome.hs
@@ -97,7 +97,7 @@ getStackageCabalConfigR name = track "Handler.StackageHome.getStackageCabalConfi
         yield $ Chunk $ toBuilder '\n'
 
     revisionsWarning =
-        toBuilder (asText "-- NOTE: Due to revisions, this file may not work. See:\n-- https://github.com/fpco/stackage-server/issues/232\n\n")
+        toBuilder (asText "-- NOTE: Due to revisions, this file may not work. See:\n-- https://github.com/commercialhaskell/stackage-server/issues/232\n\n")
 
     headerGlobal render = yield $ Chunk $
         revisionsWarning ++
diff --git a/static/haddock/style.css b/static/haddock/style.css
index 3577fba..64389fa 100644
--- a/static/haddock/style.css
+++ b/static/haddock/style.css
@@ -311,7 +311,7 @@ div#style-menu-holder {
   display: none;
 }
 
-/* Fixes: https://github.com/fpco/stackage-server/issues/222 */
+/* Fixes: https://github.com/commercialhaskell/stackage-server/issues/222 */
 /* #synopsis { */
 /*   display: none; */
 /* } */
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index e434022..71d472c 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -13,7 +13,7 @@
             <li> <a href="/snapshots">Snapshots</a>
             <li> <a href="/lts">LTS</a>
             <li> <a href="/nightly">Nightly</a>
-            <li> <a href="https://github.com/fpco/stackage#frequently-asked-questions">FAQ</a>
+            <li> <a href="https://github.com/commercialhaskell/stackage#frequently-asked-questions">FAQ</a>
             <li> <a href="/blog">Blog</a>
 
 $maybe msg <- mmsg
diff --git a/templates/home.hamlet b/templates/home.hamlet
index bc01a7f..2a86c38 100644
--- a/templates/home.hamlet
+++ b/templates/home.hamlet
@@ -17,7 +17,7 @@
             <h3>Stable Haskell package sets
             <ul>
               <li>A distribution of compatible Haskell packages from <a href="https://hackage.haskell.org">Hackage</a> that build together
-              <li>Stackage is a community project: <a href="https://github.com/fpco/stackage/blob/master/MAINTAINERS.md#adding-a-package"><b>how to add packages to Stackage</b></a>
+              <li>Stackage is a community project: <a href="https://github.com/commercialhaskell/stackage/blob/master/MAINTAINERS.md#adding-a-package"><b>how to add packages to Stackage</b></a>
               <li><a href="https://haskellstack.org">stack</a> makes using Stackage easy
         <div .span6>
             $maybe post <- mrecentBlog
@@ -43,7 +43,7 @@
                 About Stackage
             <p>
                 Stackage provides consistent sets of Haskell packages, known to build together and pass their tests before becoming <a href="/nightly">Stackage Nightly</a> snapshots and <a href="/lts">LTS</a>
-                (<a href="https://github.com/fpco/lts-haskell#readme">Long Term Support</a>) releases.
+                (<a href="https://github.com/commercialhaskell/lts-haskell#readme">Long Term Support</a>) releases.
             <p>
                 It is a distribution of a subset of packages from <a href="https://hackage.haskell.org">Hackage</a>, each package chosen at a version to make the set self-consistent. Note that Stackage does not patch any packages.
             <p>
@@ -54,10 +54,10 @@
                 Stackage is a community project: Haskell users around the world work together to keep Stackage snapshots up to date with recent package versions:
                 Stackage itself and all the tools surrounding it are open-source.
                 See #
-                \<a href="https://github.com/fpco/stackage/blob/master/MAINTAINERS.md#adding-a-package"><b>how to add packages to Stackage</b></a>.
+                \<a href="https://github.com/commercialhaskell/stackage/blob/master/MAINTAINERS.md#adding-a-package"><b>how to add packages to Stackage</b></a>.
             <p>
                 Have more questions? We have a #
-                \<a href="https://github.com/fpco/stackage#frequently-asked-questions">FAQ section on Github</a>.
+                \<a href="https://github.com/commercialhaskell/stackage#frequently-asked-questions">FAQ section on Github</a>.
 
             <p>
                 Stackage's infrastructure, build machines, initial creation and ongoing maintenance were proudly sponsored by <a href="https://www.fpcomplete.com">FP Complete</a> from 2014 to 2024.
diff --git a/templates/hoogle.hamlet b/templates/hoogle.hamlet
index 498f199..cf1f624 100644
--- a/templates/hoogle.hamlet
+++ b/templates/hoogle.hamlet
@@ -5,7 +5,7 @@
         <p style="font-size:0.8em">
             <i>Note that Stackage only displays results for the latest LTS and Nightly snapshot.
             \ #
-            <a href="https://github.com/fpco/stackage-server/issues/305">Learn more.
+            <a href="https://github.com/commercialhaskell/stackage-server/issues/305">Learn more.
         ^{hoogleForm}
         $if null results
             <p>Your search produced no results.
diff --git a/templates/package.lucius b/templates/package.lucius
index a53c748..373a0b2 100644
--- a/templates/package.lucius
+++ b/templates/package.lucius
@@ -255,7 +255,7 @@ h2.changes-title {
   color: #fff;
 }
 
-/* https://github.com/fpco/stackage-server/issues/39 */
+/* https://github.com/commercialhaskell/stackage-server/issues/39 */
 div.plain-text {
   white-space: pre-wrap;
 }
diff --git a/templates/spam-package.hamlet b/templates/spam-package.hamlet
index 09ff84b..4e8a0ca 100644
--- a/templates/spam-package.hamlet
+++ b/templates/spam-package.hamlet
@@ -7,7 +7,7 @@
 
 <p>
   If you believe this is in error, please
-  <a href="https://github.com/fpco/stackage-content/edit/master/spam-packages.yaml">send a pull request
+  <a href="https://github.com/commercialhaskell/stackage-content/edit/master/spam-packages.yaml">send a pull request
   to remove this classification.
 
 <p>