diff --git a/appview/pages/templates/banner.html b/appview/pages/templates/banner.html
index d9bdda16..686eea79 100644
--- a/appview/pages/templates/banner.html
+++ b/appview/pages/templates/banner.html
@@ -30,7 +30,7 @@
     <div class="mx-6">
       These services may not be fully accessible until upgraded.
       <a class="underline text-red-800 dark:text-red-200"
-        href="https://tangled.sh/@tangled.sh/core/tree/master/docs/migrations.md">
+        href="https://tangled.org/@tangled.org/core/tree/master/docs/migrations.md">
         Click to read the upgrade guide</a>.
     </div>
   </details>
diff --git a/appview/pages/templates/knots/index.html b/appview/pages/templates/knots/index.html
index cfda1306..a14d1734 100644
--- a/appview/pages/templates/knots/index.html
+++ b/appview/pages/templates/knots/index.html
@@ -5,7 +5,7 @@
   <h1 class="text-xl font-bold dark:text-white">Knots</h1>
   <span class="flex items-center gap-1">
       {{ i "book" "w-3 h-3" }}
-      <a href="https://tangled.sh/@tangled.sh/core/blob/master/docs/knot-hosting.md">docs</a>
+      <a href="https://tangled.org/@tangled.org/core/blob/master/docs/knot-hosting.md">docs</a>
   </span>
 </div>
 
diff --git a/appview/pages/templates/layouts/fragments/footer.html b/appview/pages/templates/layouts/fragments/footer.html
index 4fc428ca..7fc94c13 100644
--- a/appview/pages/templates/layouts/fragments/footer.html
+++ b/appview/pages/templates/layouts/fragments/footer.html
@@ -20,22 +20,22 @@
 
         <div class="flex flex-col gap-1">
           <div class="{{ $headerStyle }}">resources</div>
-          <a href="https://blog.tangled.sh" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "book-open" $iconStyle }} blog</a>
-          <a href="https://tangled.sh/@tangled.sh/core/tree/master/docs" class="{{ $linkStyle }}">{{ i "book" $iconStyle }} docs</a>
-          <a href="https://tangled.sh/@tangled.sh/core" class="{{ $linkStyle }}">{{ i "code" $iconStyle }} source</a>
+          <a href="https://blog.tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "book-open" $iconStyle }} blog</a>
+          <a href="https://tangled.org/@tangled.org/core/tree/master/docs" class="{{ $linkStyle }}">{{ i "book" $iconStyle }} docs</a>
+          <a href="https://tangled.org/@tangled.org/core" class="{{ $linkStyle }}">{{ i "code" $iconStyle }} source</a>
         </div>
 
         <div class="flex flex-col gap-1">
           <div class="{{ $headerStyle }}">social</div>
-          <a href="https://chat.tangled.sh" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "message-circle" $iconStyle }} discord</a>
+          <a href="https://chat.tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "message-circle" $iconStyle }} discord</a>
           <a href="https://web.libera.chat/#tangled" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "hash" $iconStyle }} irc</a>
-          <a href="https://bsky.app/profile/tangled.sh" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ template "user/fragments/bluesky" $iconStyle }} bluesky</a>
+          <a href="https://bsky.app/profile/tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ template "user/fragments/bluesky" $iconStyle }} bluesky</a>
         </div>
 
         <div class="flex flex-col gap-1">
           <div class="{{ $headerStyle }}">contact</div>
-          <a href="mailto:team@tangled.sh" class="{{ $linkStyle }}">{{ i "mail" "w-4 h-4 flex-shrink-0" }} team@tangled.sh</a>
-          <a href="mailto:security@tangled.sh" class="{{ $linkStyle }}">{{ i "shield-check" "w-4 h-4 flex-shrink-0" }} security@tangled.sh</a>
+          <a href="mailto:team@tangled.org" class="{{ $linkStyle }}">{{ i "mail" "w-4 h-4 flex-shrink-0" }} team@tangled.org</a>
+          <a href="mailto:security@tangled.org" class="{{ $linkStyle }}">{{ i "shield-check" "w-4 h-4 flex-shrink-0" }} security@tangled.org</a>
         </div>
       </div>
 
diff --git a/appview/pages/templates/layouts/profilebase.html b/appview/pages/templates/layouts/profilebase.html
index 65f156ed..473dbc36 100644
--- a/appview/pages/templates/layouts/profilebase.html
+++ b/appview/pages/templates/layouts/profilebase.html
@@ -3,7 +3,7 @@
 {{ define "extrameta" }}
     <meta property="og:title" content="{{ or .Card.UserHandle .Card.UserDid }}" />
     <meta property="og:type" content="profile" />
-    <meta property="og:url" content="https://tangled.sh/{{ or .Card.UserHandle .Card.UserDid }}?tab={{ .Active }}" />
+    <meta property="og:url" content="https://tangled.org/{{ or .Card.UserHandle .Card.UserDid }}?tab={{ .Active }}" />
     <meta property="og:description" content="{{ or .Card.Profile.Description .Card.UserHandle .Card.UserDid }}" />
 {{ end }}
 
@@ -106,4 +106,3 @@
 {{ define "layouts/profilebase" }}
     {{ template "layouts/base" . }}
 {{ end }}
-
diff --git a/appview/pages/templates/repo/blob.html b/appview/pages/templates/repo/blob.html
index 33a2c52e..9c5368d4 100644
--- a/appview/pages/templates/repo/blob.html
+++ b/appview/pages/templates/repo/blob.html
@@ -4,7 +4,7 @@
     {{ template "repo/fragments/meta" . }}
 
     {{ $title := printf "%s at %s &middot; %s" .Path .Ref .RepoInfo.FullName }}
-    {{ $url := printf "https://tangled.sh/%s/blob/%s/%s" .RepoInfo.FullName .Ref .Path }}
+    {{ $url := printf "https://tangled.org/%s/blob/%s/%s" .RepoInfo.FullName .Ref .Path }}
 
     {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}
 
diff --git a/appview/pages/templates/repo/branches.html b/appview/pages/templates/repo/branches.html
index 261b7d82..adb85702 100644
--- a/appview/pages/templates/repo/branches.html
+++ b/appview/pages/templates/repo/branches.html
@@ -4,8 +4,8 @@
 
 {{ define "extrameta" }}
     {{ $title := printf "branches &middot; %s" .RepoInfo.FullName }}
-    {{ $url := printf "https://tangled.sh/%s/branches" .RepoInfo.FullName }}
-    
+    {{ $url := printf "https://tangled.org/%s/branches" .RepoInfo.FullName }}
+
     {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}
 {{ end }}
 
diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html
index 57817630..dc9ebba6 100644
--- a/appview/pages/templates/repo/commit.html
+++ b/appview/pages/templates/repo/commit.html
@@ -2,7 +2,7 @@
 
 {{ define "extrameta" }}
     {{ $title := printf "commit %s &middot; %s" .Diff.Commit.This .RepoInfo.FullName }}
-    {{ $url := printf "https://tangled.sh/%s/commit/%s" .RepoInfo.FullName .Diff.Commit.This }}
+    {{ $url := printf "https://tangled.org/%s/commit/%s" .RepoInfo.FullName .Diff.Commit.This }}
 
     {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}
 {{ end }}
diff --git a/appview/pages/templates/repo/fragments/meta.html b/appview/pages/templates/repo/fragments/meta.html
index a69498c1..8b4c9cfb 100644
--- a/appview/pages/templates/repo/fragments/meta.html
+++ b/appview/pages/templates/repo/fragments/meta.html
@@ -1,23 +1,23 @@
 {{ define "repo/fragments/meta" }}
     <meta
         name="vcs:clone"
-        content="https://tangled.sh/{{ .RepoInfo.FullName }}"
+        content="https://tangled.org/{{ .RepoInfo.FullName }}"
     />
     <meta
         name="forge:summary"
-        content="https://tangled.sh/{{ .RepoInfo.FullName }}"
+        content="https://tangled.org/{{ .RepoInfo.FullName }}"
     />
     <meta
         name="forge:dir"
-        content="https://tangled.sh/{{ .RepoInfo.FullName }}/tree/{ref}/{path}"
+        content="https://tangled.org/{{ .RepoInfo.FullName }}/tree/{ref}/{path}"
     />
     <meta
         name="forge:file"
-        content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}"
+        content="https://tangled.org/{{ .RepoInfo.FullName }}/blob/{ref}/{path}"
     />
     <meta
         name="forge:line"
-        content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}#L{line}"
+        content="https://tangled.org/{{ .RepoInfo.FullName }}/blob/{ref}/{path}#L{line}"
     />
     <meta
         name="go-import"
diff --git a/appview/pages/templates/repo/fragments/og.html b/appview/pages/templates/repo/fragments/og.html
index 88131589..4bf3fd9d 100644
--- a/appview/pages/templates/repo/fragments/og.html
+++ b/appview/pages/templates/repo/fragments/og.html
@@ -1,7 +1,7 @@
 {{ define "repo/fragments/og" }}
     {{ $title := or .Title .RepoInfo.FullName }}
     {{ $description := or .Description .RepoInfo.Description }}
-    {{ $url := or .Url (printf "https://tangled.sh/%s" .RepoInfo.FullName) }}
+    {{ $url := or .Url (printf "https://tangled.org/%s" .RepoInfo.FullName) }}
 
 
     <meta property="og:title" content="{{ unescapeHtml $title }}" />
diff --git a/appview/pages/templates/repo/issues/issue.html b/appview/pages/templates/repo/issues/issue.html
index 02294274..84887d5b 100644
--- a/appview/pages/templates/repo/issues/issue.html
+++ b/appview/pages/templates/repo/issues/issue.html
@@ -3,7 +3,7 @@
 
 {{ define "extrameta" }}
     {{ $title := printf "%s &middot; issue #%d &middot; %s" .Issue.Title .Issue.IssueId .RepoInfo.FullName }}
-    {{ $url := printf "https://tangled.sh/%s/issues/%d" .RepoInfo.FullName .Issue.IssueId }}
+    {{ $url := printf "https://tangled.org/%s/issues/%d" .RepoInfo.FullName .Issue.IssueId }}
 
     {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}
 {{ end }}
@@ -115,4 +115,3 @@
   {{ template "repo/issues/fragments/newComment" . }}
   <div>
 {{ end }}
-
diff --git a/appview/pages/templates/repo/issues/issues.html b/appview/pages/templates/repo/issues/issues.html
index d76a64fd..a8ca02c4 100644
--- a/appview/pages/templates/repo/issues/issues.html
+++ b/appview/pages/templates/repo/issues/issues.html
@@ -2,7 +2,7 @@
 
 {{ define "extrameta" }}
     {{ $title := "issues"}}
-    {{ $url := printf "https://tangled.sh/%s/issues" .RepoInfo.FullName }}
+    {{ $url := printf "https://tangled.org/%s/issues" .RepoInfo.FullName }}
 
     {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}
 {{ end }}
diff --git a/appview/pages/templates/repo/log.html b/appview/pages/templates/repo/log.html
index ae9f9d76..4cbc439e 100644
--- a/appview/pages/templates/repo/log.html
+++ b/appview/pages/templates/repo/log.html
@@ -2,7 +2,7 @@
 
 {{ define "extrameta" }}
     {{ $title := printf "commits &middot; %s" .RepoInfo.FullName }}
-    {{ $url := printf "https://tangled.sh/%s/commits" .RepoInfo.FullName }}
+    {{ $url := printf "https://tangled.org/%s/commits" .RepoInfo.FullName }}
 
     {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}
 {{ end }}
diff --git a/appview/pages/templates/repo/pipelines/pipelines.html b/appview/pages/templates/repo/pipelines/pipelines.html
index 457c1897..fd115444 100644
--- a/appview/pages/templates/repo/pipelines/pipelines.html
+++ b/appview/pages/templates/repo/pipelines/pipelines.html
@@ -2,7 +2,7 @@
 
 {{ define "extrameta" }}
     {{ $title := "pipelines"}}
-    {{ $url := printf "https://tangled.sh/%s/pipelines" .RepoInfo.FullName }}
+    {{ $url := printf "https://tangled.org/%s/pipelines" .RepoInfo.FullName }}
     {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}
 {{ end }}
 
@@ -60,7 +60,7 @@
             <span class="inline-flex gap-2 items-center">
               <span class="font-bold">{{ $target }}</span>
               {{ i "arrow-left" "size-4" }}
-              {{ .Trigger.PRSourceBranch }} 
+              {{ .Trigger.PRSourceBranch }}
               <span class="text-sm font-mono">
                 @
                 <a href="/{{ $root.RepoInfo.FullName }}/commit/{{ $sha }}">{{ slice $sha 0 8 }}</a>
diff --git a/appview/pages/templates/repo/pipelines/workflow.html b/appview/pages/templates/repo/pipelines/workflow.html
index 0ec37983..7cf7cc90 100644
--- a/appview/pages/templates/repo/pipelines/workflow.html
+++ b/appview/pages/templates/repo/pipelines/workflow.html
@@ -2,7 +2,7 @@
 
 {{ define "extrameta" }}
     {{ $title := "pipelines"}}
-    {{ $url := printf "https://tangled.sh/%s/pipelines" .RepoInfo.FullName }}
+    {{ $url := printf "https://tangled.org/%s/pipelines" .RepoInfo.FullName }}
     {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}
 {{ end }}
 
diff --git a/appview/pages/templates/repo/pulls/interdiff.html b/appview/pages/templates/repo/pulls/interdiff.html
index c44204a9..d14e3ea7 100644
--- a/appview/pages/templates/repo/pulls/interdiff.html
+++ b/appview/pages/templates/repo/pulls/interdiff.html
@@ -5,8 +5,8 @@
 
 {{ define "extrameta" }}
     {{ $title := printf "interdiff of %d and %d &middot; %s &middot; pull #%d &middot; %s" .Round (sub .Round 1) .Pull.Title .Pull.PullId .RepoInfo.FullName }}
-    {{ $url := printf "https://tangled.sh/%s/pulls/%d/round/%d" .RepoInfo.FullName .Pull.PullId .Round }}
-    
+    {{ $url := printf "https://tangled.org/%s/pulls/%d/round/%d" .RepoInfo.FullName .Pull.PullId .Round }}
+
     {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" (unescapeHtml $title) "Url" $url) }}
 {{ end }}
 
diff --git a/appview/pages/templates/repo/pulls/patch.html b/appview/pages/templates/repo/pulls/patch.html
index c02cc412..219fb02e 100644
--- a/appview/pages/templates/repo/pulls/patch.html
+++ b/appview/pages/templates/repo/pulls/patch.html
@@ -5,8 +5,8 @@
 
 {{ define "extrameta" }}
     {{ $title := printf "patch of %s &middot; pull #%d &middot; %s" .Pull.Title .Pull.PullId .RepoInfo.FullName }}
-    {{ $url := printf "https://tangled.sh/%s/pulls/%d/round/%d" .RepoInfo.FullName .Pull.PullId .Round }}
-    
+    {{ $url := printf "https://tangled.org/%s/pulls/%d/round/%d" .RepoInfo.FullName .Pull.PullId .Round }}
+
     {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}
 {{ end }}
 
diff --git a/appview/pages/templates/repo/pulls/pull.html b/appview/pages/templates/repo/pulls/pull.html
index 2ea4a9c3..087e0834 100644
--- a/appview/pages/templates/repo/pulls/pull.html
+++ b/appview/pages/templates/repo/pulls/pull.html
@@ -4,7 +4,7 @@
 
 {{ define "extrameta" }}
     {{ $title := printf "%s &middot; pull #%d &middot; %s" .Pull.Title .Pull.PullId .RepoInfo.FullName }}
-    {{ $url := printf "https://tangled.sh/%s/pulls/%d" .RepoInfo.FullName .Pull.PullId }}
+    {{ $url := printf "https://tangled.org/%s/pulls/%d" .RepoInfo.FullName .Pull.PullId }}
 
     {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}
 {{ end }}
diff --git a/appview/pages/templates/repo/pulls/pulls.html b/appview/pages/templates/repo/pulls/pulls.html
index 69445a24..bdc0b065 100644
--- a/appview/pages/templates/repo/pulls/pulls.html
+++ b/appview/pages/templates/repo/pulls/pulls.html
@@ -2,7 +2,7 @@
 
 {{ define "extrameta" }}
     {{ $title := "pulls"}}
-    {{ $url := printf "https://tangled.sh/%s/pulls" .RepoInfo.FullName }}
+    {{ $url := printf "https://tangled.org/%s/pulls" .RepoInfo.FullName }}
 
     {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}
 {{ end }}
diff --git a/appview/pages/templates/repo/settings/pipelines.html b/appview/pages/templates/repo/settings/pipelines.html
index afcfa2dc..4e1dc0d5 100644
--- a/appview/pages/templates/repo/settings/pipelines.html
+++ b/appview/pages/templates/repo/settings/pipelines.html
@@ -22,7 +22,7 @@
       <p class="text-gray-500 dark:text-gray-400">
         Choose a spindle to execute your workflows on. Only repository owners
         can configure spindles. Spindles can be selfhosted,
-        <a class="text-gray-500 dark:text-gray-400 underline" href="https://tangled.sh/@tangled.sh/core/blob/master/docs/spindle/hosting.md">
+        <a class="text-gray-500 dark:text-gray-400 underline" href="https://tangled.org/@tangled.org/core/blob/master/docs/spindle/hosting.md">
           click to learn more.
         </a>
       </p>
diff --git a/appview/pages/templates/repo/tags.html b/appview/pages/templates/repo/tags.html
index 8d1ab91a..2ac85119 100644
--- a/appview/pages/templates/repo/tags.html
+++ b/appview/pages/templates/repo/tags.html
@@ -4,8 +4,8 @@
 
 {{ define "extrameta" }}
     {{ $title := printf "tags &middot; %s" .RepoInfo.FullName }}
-    {{ $url := printf "https://tangled.sh/%s/tags" .RepoInfo.FullName }}
-    
+    {{ $url := printf "https://tangled.org/%s/tags" .RepoInfo.FullName }}
+
     {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}
 {{ end }}
 
@@ -26,7 +26,7 @@
 
           <div class="flex items-center gap-3 text-gray-500 dark:text-gray-400 text-sm">
             {{ if .Tag }}
-            <a href="/{{ $.RepoInfo.FullName }}/commit/{{ .Tag.Target.String }}" 
+            <a href="/{{ $.RepoInfo.FullName }}/commit/{{ .Tag.Target.String }}"
               class="no-underline hover:underline text-gray-500 dark:text-gray-400">
               {{  slice .Tag.Target.String 0 8  }}
             </a>
@@ -48,7 +48,7 @@
           </a>
           <div class="flex flex-grow flex-col text-gray-500 dark:text-gray-400 text-sm">
             {{ if .Tag }}
-            <a href="/{{ $.RepoInfo.FullName }}/commit/{{ .Tag.Target.String }}" 
+            <a href="/{{ $.RepoInfo.FullName }}/commit/{{ .Tag.Target.String }}"
               class="no-underline hover:underline text-gray-500 dark:text-gray-400 flex items-center gap-2">
               {{ i "git-commit-horizontal" "w-4 h-4" }}
               {{  slice .Tag.Target.String 0 8  }}
@@ -132,8 +132,8 @@
     hx-target="this"
     class="flex items-center gap-2 px-2">
     <div class="flex-grow">
-      <input type="file" 
-        name="artifact" 
+      <input type="file"
+        name="artifact"
         required
         class="block py-2 px-0 w-full border-none
         text-black dark:text-white
@@ -148,13 +148,13 @@
       </input>
     </div>
     <div class="flex justify-end">
-      <button 
-        type="submit" 
-        class="btn gap-2" 
+      <button
+        type="submit"
+        class="btn gap-2"
         id="upload-btn-{{$unique}}"
         title="Upload artifact">
         {{ i "upload" "w-4 h-4" }}
-        <span class="hidden md:inline">upload</span> 
+        <span class="hidden md:inline">upload</span>
       </button>
     </div>
   </form>
diff --git a/appview/pages/templates/repo/tree.html b/appview/pages/templates/repo/tree.html
index a6ff1d15..53d1487e 100644
--- a/appview/pages/templates/repo/tree.html
+++ b/appview/pages/templates/repo/tree.html
@@ -10,7 +10,7 @@
 
     {{ template "repo/fragments/meta" . }}
     {{ $title := printf "%s at %s &middot; %s" $path .Ref .RepoInfo.FullName }}
-    {{ $url := printf "https://tangled.sh/%s/tree/%s%s" .RepoInfo.FullName .Ref $path }}
+    {{ $url := printf "https://tangled.org/%s/tree/%s%s" .RepoInfo.FullName .Ref $path }}
 
     {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}
 {{ end }}
diff --git a/appview/pages/templates/spindles/index.html b/appview/pages/templates/spindles/index.html
index d7cffbb4..3f93676a 100644
--- a/appview/pages/templates/spindles/index.html
+++ b/appview/pages/templates/spindles/index.html
@@ -5,7 +5,7 @@
     <h1 class="text-xl font-bold dark:text-white">Spindles</h1>
     <span class="flex items-center gap-1">
         {{ i "book" "w-3 h-3" }}
-        <a href="https://tangled.sh/@tangled.sh/core/blob/master/docs/spindle/hosting.md">docs</a>
+        <a href="https://tangled.org/@tangled.org/core/blob/master/docs/spindle/hosting.md">docs</a>
     </span>
 </div>
 
diff --git a/appview/pages/templates/strings/dashboard.html b/appview/pages/templates/strings/dashboard.html
index e7ab5879..1fd219eb 100644
--- a/appview/pages/templates/strings/dashboard.html
+++ b/appview/pages/templates/strings/dashboard.html
@@ -3,7 +3,7 @@
 {{ define "extrameta" }}
     <meta property="og:title" content="{{ or .Card.UserHandle .Card.UserDid  }}" />
     <meta property="og:type" content="profile" />
-    <meta property="og:url" content="https://tangled.sh/{{ or .Card.UserHandle .Card.UserDid  }}" />
+    <meta property="og:url" content="https://tangled.org/{{ or .Card.UserHandle .Card.UserDid  }}" />
     <meta property="og:description" content="{{ or .Card.Profile.Description .Card.UserHandle .Card.UserDid }}" />
 {{ end }}
 
diff --git a/appview/pages/templates/strings/string.html b/appview/pages/templates/strings/string.html
index 09b93206..3cfcb28b 100644
--- a/appview/pages/templates/strings/string.html
+++ b/appview/pages/templates/strings/string.html
@@ -4,7 +4,7 @@
   {{ $ownerId := didOrHandle .Owner.DID.String .Owner.Handle.String }}
   <meta property="og:title" content="{{ .String.Filename }} · by {{ $ownerId }}" />
   <meta property="og:type" content="object" />
-  <meta property="og:url" content="https://tangled.sh/strings/{{ $ownerId }}/{{ .String.Rkey }}" />
+  <meta property="og:url" content="https://tangled.org/strings/{{ $ownerId }}/{{ .String.Rkey }}" />
   <meta property="og:description" content="{{ .String.Description }}" />
 {{ end }}
 
diff --git a/appview/pages/templates/timeline/fragments/hero.html b/appview/pages/templates/timeline/fragments/hero.html
index c128cb69..5523835b 100644
--- a/appview/pages/templates/timeline/fragments/hero.html
+++ b/appview/pages/templates/timeline/fragments/hero.html
@@ -22,7 +22,7 @@
         </div>
 
         <figure class="w-full hidden md:block md:w-auto">
-            <a href="https://tangled.sh/@tangled.sh/core" class="block">
+            <a href="https://tangled.org/@tangled.org/core" class="block">
                 <img src="https://assets.tangled.network/hero-repo.png" alt="Screenshot of the Tangled monorepo." class="max-w-md mx-auto md:max-w-none w-full md:w-[30vw] h-auto shadow-sm rounded" />
             </a>
             <figcaption class="text-sm text-gray-600 dark:text-gray-400 mt-2 text-center">
@@ -31,4 +31,3 @@
         </figure>
     </div>
 {{ end }}
-
diff --git a/appview/pages/templates/timeline/home.html b/appview/pages/templates/timeline/home.html
index 06367195..c9c3aba6 100644
--- a/appview/pages/templates/timeline/home.html
+++ b/appview/pages/templates/timeline/home.html
@@ -3,7 +3,7 @@
 {{ define "extrameta" }}
     <meta property="og:title" content="timeline · tangled" />
     <meta property="og:type" content="object" />
-    <meta property="og:url" content="https://tangled.sh" />
+    <meta property="og:url" content="https://tangled.org" />
     <meta property="og:description" content="tightly-knit social coding" />
 {{ end }}
 
@@ -87,4 +87,3 @@
     ) }}
   </div>
 {{ end }}
-
diff --git a/appview/pages/templates/timeline/timeline.html b/appview/pages/templates/timeline/timeline.html
index 65f3d84b..c957ba2a 100644
--- a/appview/pages/templates/timeline/timeline.html
+++ b/appview/pages/templates/timeline/timeline.html
@@ -3,7 +3,7 @@
 {{ define "extrameta" }}
     <meta property="og:title" content="timeline · tangled" />
     <meta property="og:type" content="object" />
-    <meta property="og:url" content="https://tangled.sh" />
+    <meta property="og:url" content="https://tangled.org" />
     <meta property="og:description" content="tightly-knit social coding" />
 {{ end }}
 
diff --git a/appview/pages/templates/user/completeSignup.html b/appview/pages/templates/user/completeSignup.html
index 823834e1..542731dc 100644
--- a/appview/pages/templates/user/completeSignup.html
+++ b/appview/pages/templates/user/completeSignup.html
@@ -13,7 +13,7 @@
             />
             <meta
                 property="og:url"
-                content="https://tangled.sh/complete-signup"
+                content="https://tangled.org/complete-signup"
             />
             <meta
                 property="og:description"
diff --git a/appview/pages/templates/user/login.html b/appview/pages/templates/user/login.html
index 6c0c4a81..be2bbe62 100644
--- a/appview/pages/templates/user/login.html
+++ b/appview/pages/templates/user/login.html
@@ -5,7 +5,7 @@
             <meta charset="UTF-8" />
             <meta name="viewport" content="width=device-width, initial-scale=1.0" />
             <meta property="og:title" content="login · tangled" />
-            <meta property="og:url" content="https://tangled.sh/login" />
+            <meta property="og:url" content="https://tangled.org/login" />
             <meta property="og:description" content="login to for tangled" />
             <script src="/static/htmx.min.js"></script>
             <link rel="stylesheet" href="/static/tw.css?{{ cssContentHash }}" type="text/css" />
diff --git a/appview/pages/templates/user/signup.html b/appview/pages/templates/user/signup.html
index 84818837..cde92862 100644
--- a/appview/pages/templates/user/signup.html
+++ b/appview/pages/templates/user/signup.html
@@ -5,7 +5,7 @@
             <meta charset="UTF-8" />
             <meta name="viewport" content="width=device-width, initial-scale=1.0" />
             <meta property="og:title" content="signup · tangled" />
-            <meta property="og:url" content="https://tangled.sh/signup" />
+            <meta property="og:url" content="https://tangled.org/signup" />
             <meta property="og:description" content="sign up for tangled" />
             <script src="/static/htmx.min.js"></script>
             <link rel="stylesheet" href="/static/tw.css?{{ cssContentHash }}" type="text/css" />
@@ -52,4 +52,3 @@
         </body>
     </html>
 {{ end }}
-