diff --git a/blog/config.yaml b/blog/config.yaml
--- a/blog/config.yaml
+++ b/blog/config.yaml
@@ -6,7 +6,7 @@ url: "https://blog.tangled.org/"
 description: ""
 author:
   name: "Anirudh Oppiliappan"
-  email: "anirudh@tangled.sh"
+  email: "anirudh@tangled.org"
 defaultTemplate: text.html
 extraTemplateDirs:
   - ../appview/pages/templates
diff --git a/blog/posts/6-months.md b/blog/posts/6-months.md
--- a/blog/posts/6-months.md
+++ b/blog/posts/6-months.md
@@ -74,7 +74,7 @@ their owner, and any appview can verify ownership. Once we stabilize the
 [lexicon definitions](lexicons) for these XRPC calls, building clients
 for knots, or alternate implementations should become much simpler.
 
-[lexicons]: https://tangled.sh/@tangled.sh/core/tree/master/lexicons
+[lexicons]: https://tangled.org/tangled.org/core/tree/master/lexicons
 
 ## issues rework
 
@@ -94,7 +94,7 @@ detail.
 
 To address this, we spun up the tngl.sh PDS hosted right here in
 Finland. The only way to get an account on this PDS is by [signing
-up](https://tangled.sh/signup). There's a lot we can do to improve this
+up](https://tangled.org/signup). There's a lot we can do to improve this
 experience as a generic PDS host, but we're still working out details
 around that.
 
diff --git a/blog/posts/ci.md b/blog/posts/ci.md
--- a/blog/posts/ci.md
+++ b/blog/posts/ci.md
@@ -7,10 +7,10 @@ subtitle: Tangled's new CI runner is now generally available
 date: 2025-08-06
 authors:
   - name: Anirudh
-    email: anirudh@tangled.sh
+    email: anirudh@tangled.org
     handle: anirudh.fi
   - name: Akshay
-    email: akshay@tangled.sh
+    email: akshay@tangled.org
     handle: oppi.li
 ---
 
@@ -22,7 +22,7 @@ Meet **spindle**: Tangled's new CI runner built atop Nix and
 AT Protocol. In typical Tangled fashion we've been
 dogfooding spindle for a while now; this very blog post
 you're reading was [built and published using
-spindle](https://tangled.sh/@tangled.sh/site/pipelines/452/workflow/deploy.yaml).
+spindle](https://tangled.org/tangled.org/core/pipelines).
 
 Tangled is a new social-enabled Git collaboration platform,
 [read our intro](/intro) for more about the project.
@@ -197,17 +197,17 @@ ## get started now
 
 You can run your own spindle instance pretty easily: the
 [spindle self-hosting
-guide](https://tangled.sh/@tangled.sh/core/blob/master/docs/spindle/hosting.md)
+guide](https://docs.tangled.org/spindles#self-hosting-guide)
 should have you covered. Once done, head to your
 repository's settings tab and set it up! Doesn't work? Feel
-free to pop into [Discord](https://chat.tangled.sh) to get
+free to pop into [Discord](https://chat.tangled.org) to get
 help -- we have a nice little crew that's always around to
 help.
 
 All Tangled users have access to our hosted spindle
 instance, free of charge[^3]. You don't have any more
 excuses to not migrate to Tangled now -- [get
-started](https://tangled.sh/login) with your AT Protocol
+started](https://tangled.org/login) with your AT Protocol
 account today.
 
 [^3]: We can't promise we won't charge for it at some point
diff --git a/blog/posts/intro.md b/blog/posts/intro.md
--- a/blog/posts/intro.md
+++ b/blog/posts/intro.md
@@ -7,12 +7,12 @@ subtitle: A git collaboration platform, built on AT Protocol
 date: 2025-03-02
 authors:
   - name: Anirudh
-    email: anirudh@tangled.sh
+    email: anirudh@tangled.org
     handle: anirudh.fi
 ---
 
 
-[Tangled](https://tangled.sh) is a new social-enabled Git collaboration
+[Tangled](https://tangled.org) is a new social-enabled Git collaboration
 platform, built on top of the [AT Protocol](https://atproto.com). We
 envision a place where developers have complete ownership of their code,
 open source communities can freely self-govern and most importantly,
@@ -33,7 +33,7 @@ perfect for self-hosting on a Raspberry Pi at home, or larger
 "community" servers. By default, Tangled provides managed knots where
 you can host your repositories for free.
 
-The [App View][appview] at [tangled.sh](https://tangled.sh) acts as a
+The [App View][appview] at [tangled.org](https://tangled.org) acts as a
 consolidated "view" into the whole network, allowing users to access,
 clone and contribute to repositories hosted across different knots --
 completely seamlessly.
@@ -57,8 +57,8 @@ invite-only access to Tangled -- join us on IRC at `#tangled` on
 [libera.chat](https://libera.chat) and we'll get you set up.
 
 **Update**: Tangled is open to public, simply login at
-[tangled.sh/login](https://tangled.sh/login)! Have fun!
+[tangled.org/login](https://tangled.org/login)! Have fun!
 
 [pds]: https://atproto.com/guides/glossary#pds-personal-data-server
 [appview]: https://docs.bsky.app/docs/advanced-guides/federation-architecture#app-views
-[dogfood]: https://tangled.sh/@tangled.sh/core
+[dogfood]: https://tangled.org/core
diff --git a/blog/posts/stacking.md b/blog/posts/stacking.md
--- a/blog/posts/stacking.md
+++ b/blog/posts/stacking.md
@@ -8,7 +8,7 @@ date: 2025-06-02
 image: https://assets.tangled.network/blog/interdiff_difference.jpeg
 authors:
   - name: Akshay
-    email: akshay@tangled.sh
+    email: akshay@tangled.org
     handle: oppi.li
 draft: false
 ---
@@ -157,7 +157,7 @@
 ## interdiff code review on tangled
 
 To really explain how this works, let's start with a [new
-codebase](https://tangled.sh/@oppi.li/stacking-demo/):
+codebase](https://tangled.org/oppi.li/stacking-demo/):
 
 ```
 $ jj git init --colocate