diff --git a/.changeset/brown-owls-bake.md b/.changeset/brown-owls-bake.md
new file mode 100644
index 00000000..17be0c30
--- /dev/null
+++ b/.changeset/brown-owls-bake.md
@@ -0,0 +1,10 @@
+---
+'@proofkit/cli': patch
+'@proofkit/better-auth': patch
+'@proofkit/fmdapi': patch
+'@proofkit/typegen': patch
+'@proofkit/webviewer': patch
+'create-proofkit': patch
+---
+
+swap docs domain to proofkit.proof.sh
diff --git a/Auto Run Docs/Initiation/2026-03-19-ProofKit-Release-Readiness/RELEASE-READINESS-01.md b/Auto Run Docs/Initiation/2026-03-19-ProofKit-Release-Readiness/RELEASE-READINESS-01.md
index 7faa8e71..8f0fe0ff 100644
--- a/Auto Run Docs/Initiation/2026-03-19-ProofKit-Release-Readiness/RELEASE-READINESS-01.md	
+++ b/Auto Run Docs/Initiation/2026-03-19-ProofKit-Release-Readiness/RELEASE-READINESS-01.md	
@@ -5,10 +5,10 @@ This phase makes the ProofKit documentation site discoverable and consumable by
 ## Tasks
 
 - [x] Add SEO fundamentals to the Fumadocs site (`apps/docs/`):
-  - Create `apps/docs/src/app/sitemap.ts` using Next.js App Router's built-in sitemap generation. Import `source` from `@/lib/source` and iterate `source.getPages()` to produce URLs rooted at `https://proofkit.dev/docs/`. Include the llms.txt routes as well.
+  - Create `apps/docs/src/app/sitemap.ts` using Next.js App Router's built-in sitemap generation. Import `source` from `@/lib/source` and iterate `source.getPages()` to produce URLs rooted at `https://proofkit.proof.sh/docs/`. Include the llms.txt routes as well.
   - Create `apps/docs/src/app/robots.ts` using Next.js App Router's built-in robots generation. Allow all crawlers, point to the sitemap URL, and explicitly allow `/llms.txt`, `/llms-full.txt`, and `/llms/` paths.
   - Update `generateMetadata` in `apps/docs/src/app/docs/(docs)/[[...slug]]/page.tsx` to include OpenGraph metadata (`og:title`, `og:description`, `og:type: article`, `og:url`) using the page's title, description, and constructed URL. Use Next.js `Metadata` type's built-in `openGraph` field.
-  - Add a root-level `metadata` export in `apps/docs/src/app/layout.tsx` with `metadataBase` set to `https://proofkit.dev` so all relative OG URLs resolve correctly.
+  - Add a root-level `metadata` export in `apps/docs/src/app/layout.tsx` with `metadataBase` set to `https://proofkit.proof.sh` so all relative OG URLs resolve correctly.
 
 - [ ] Improve the llms.txt endpoints for better agent consumption:
   - In `apps/docs/src/app/llms.txt/route.ts`: fix the `"package"` field in `notify-intent.yml` — it still says `"with-changesets"` (template placeholder) instead of identifying the actual package. Note: this is in `.github/workflows/notify-intent.yml` line 59. Update the payload to dynamically determine the package name from the changed files, or use a static value like `"proofkit"`.
diff --git a/Auto Run Docs/Initiation/2026-03-19-ProofKit-Release-Readiness/RELEASE-READINESS-02.md b/Auto Run Docs/Initiation/2026-03-19-ProofKit-Release-Readiness/RELEASE-READINESS-02.md
index 9b214ea5..0e56e9b6 100644
--- a/Auto Run Docs/Initiation/2026-03-19-ProofKit-Release-Readiness/RELEASE-READINESS-02.md	
+++ b/Auto Run Docs/Initiation/2026-03-19-ProofKit-Release-Readiness/RELEASE-READINESS-02.md	
@@ -29,8 +29,8 @@ This phase builds the automated doc-staleness detection system that runs during
 
 - [ ] Improve cross-linking between docs, skills, and CLI output:
   - In each package's main doc page (`apps/docs/content/docs/{package}/index.mdx`), add a "For AI Agents" callout or section at the bottom that points to the package's SKILL.md file location and the llms.txt per-package endpoint. Use a Fumadocs `Callout` component if available, or a simple blockquote.
-  - In each SKILL.md file's `sources` frontmatter field, verify the doc URLs point to the correct pages on proofkit.dev. Update any that are wrong or missing.
-  - In the CLI's help output (check `packages/cli/src/` for the main command definitions), ensure the `--help` text mentions `https://proofkit.dev/docs/cli` for full documentation.
+  - In each SKILL.md file's `sources` frontmatter field, verify the doc URLs point to the correct pages on proofkit.proof.sh. Update any that are wrong or missing.
+  - In the CLI's help output (check `packages/cli/src/` for the main command definitions), ensure the `--help` text mentions `https://proofkit.proof.sh/docs/cli` for full documentation.
 
 - [ ] Write tests for the doc-staleness script:
   - Create `scripts/__tests__/check-doc-staleness.test.ts` (or co-locate with the script).
diff --git a/Auto Run Docs/Initiation/2026-03-19-ProofKit-Release-Readiness/RELEASE-READINESS-03.md b/Auto Run Docs/Initiation/2026-03-19-ProofKit-Release-Readiness/RELEASE-READINESS-03.md
index 1b648c8c..44b33ba1 100644
--- a/Auto Run Docs/Initiation/2026-03-19-ProofKit-Release-Readiness/RELEASE-READINESS-03.md	
+++ b/Auto Run Docs/Initiation/2026-03-19-ProofKit-Release-Readiness/RELEASE-READINESS-03.md	
@@ -26,9 +26,9 @@ This phase speeds up the `proofkit init` test suite, prepares the test infrastru
   - Refactor existing template tests to use this helper where it reduces duplication. Don't force it if the existing tests are already clean.
 
 - [ ] Make CLI output more AI-agent-friendly:
-  - In the post-init success message (find in `packages/cli/src/` — likely in the init command handler or executor), add a line pointing to docs: "Full documentation: https://proofkit.dev/docs"
+  - In the post-init success message (find in `packages/cli/src/` — likely in the init command handler or executor), add a line pointing to docs: "Full documentation: https://proofkit.proof.sh/docs"
   - If there's a `--help` flag handler for the main `proofkit` command, ensure it includes the docs URL.
-  - In error messages from the CLI, ensure they include enough context for an AI agent to diagnose the issue (e.g., "Missing required field X. See https://proofkit.dev/docs/cli/reference for options.").
+  - In error messages from the CLI, ensure they include enough context for an AI agent to diagnose the issue (e.g., "Missing required field X. See https://proofkit.proof.sh/docs/cli/reference for options.").
   - Review the AGENTS.md at the repo root — ensure it mentions the CLI and how to use it for project scaffolding.
 
 - [ ] Run all tests and verify improvements:
diff --git a/README.md b/README.md
index 70f216eb..b0f0e97e 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ProofKit is a collection of TypeScript tools and libraries for building modern web applications, with a focus on seamless integration with Claris FileMaker. It includes CLI utilities, API clients, type generators, and other resources to help scaffold and develop TypeScript projects. ProofKit aims to make web development easier for beginners and more efficient for experienced developers by providing an opinionated project structure, code-mod scripts, and a suite of libraries to help you build, extend, and maintain your apps over time. This monorepo is where the ProofKit tools are developed and maintained.
 
-- **Documentation:** [proofkit.dev](https://proofkit.dev)
+- **Documentation:** [proofkit.proof.sh](https://proofkit.proof.sh)
 - **Community Forum:** [Ottomatic Community – ProofKit Category](https://community.ottomatic.cloud/c/proofkit/13)
 
 ---
@@ -12,14 +12,14 @@ ProofKit is a collection of TypeScript tools and libraries for building modern w
 This monorepo includes the following core packages:
 
 - [`@proofkit/cli`](./packages/cli): Interactive CLI to scaffold and manage TypeScript projects that connect with FileMaker.
-- [`@proofkit/fmdapi`](./packages/fmdapi): TypeScript client for the FileMaker Data API. [Docs](https://proofkit.dev/docs/fmdapi)
-- [`@proofkit/webviewer`](./packages/webviewer): Utility for interacting with the FileMaker WebViewer. [Docs](https://proofkit.dev/docs/webviewer)
+- [`@proofkit/fmdapi`](./packages/fmdapi): TypeScript client for the FileMaker Data API. [Docs](https://proofkit.proof.sh/docs/fmdapi)
+- [`@proofkit/webviewer`](./packages/webviewer): Utility for interacting with the FileMaker WebViewer. [Docs](https://proofkit.proof.sh/docs/webviewer)
 - [`@proofkit/typegen`](./packages/typegen): Generate TypeScript types and validation schemas from FileMaker layouts.
 - [`@proofkit/create-proofkit`](./packages/create-proofkit): Alias package for quickly starting new ProofKit projects.
 
 ## Documentation & Community
 
-For all setup, usage, and advanced guides, please visit the [official documentation site](https://proofkit.dev).
+For all setup, usage, and advanced guides, please visit the [official documentation site](https://proofkit.proof.sh).
 
 For questions, support, and discussion, join the [Ottomatic Community](https://community.ottomatic.cloud/c/proofkit/13) in the **ProofKit** category.
 
diff --git a/apps/docs/content/docs/fmdapi/quick-start.mdx b/apps/docs/content/docs/fmdapi/quick-start.mdx
index 9aca62bb..cf44c0d2 100644
--- a/apps/docs/content/docs/fmdapi/quick-start.mdx
+++ b/apps/docs/content/docs/fmdapi/quick-start.mdx
@@ -38,7 +38,7 @@ The typegen tool is the best way to interact with this library, as it will autom
   Add the layouts you want to generate clients for to the `layouts` array in the config file.
   ```jsonc title='proofkit-typegen.config.jsonc'
   {
-    "$schema": "https://proofkit.dev/typegen-config-schema.json",
+    "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
     "config": {
       "clientSuffix": "Layout",
       "layouts": [
diff --git a/apps/docs/content/docs/typegen/config-odata.mdx b/apps/docs/content/docs/typegen/config-odata.mdx
index 45cb4659..9d18cf90 100644
--- a/apps/docs/content/docs/typegen/config-odata.mdx
+++ b/apps/docs/content/docs/typegen/config-odata.mdx
@@ -15,7 +15,7 @@ The config key can also be an array of configs, which is useful if you need to c
 
 ```jsonc title="proofkit-typegen-config.jsonc" tab="Single OData config"
 {
-  "$schema": "https://proofkit.dev/typegen-config-schema.json",
+  "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
   "config": {
     "type": "fmodata",
     // ... your OData config here
@@ -25,7 +25,7 @@ The config key can also be an array of configs, which is useful if you need to c
 
 ```jsonc title="proofkit-typegen-config.jsonc" tab="Multiple configs"
 {
-  "$schema": "https://proofkit.dev/typegen-config-schema.json",
+  "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
   "config": [
     {
       "type": "fmodata",
@@ -247,7 +247,7 @@ Here's a complete example of an OData configuration:
 
 ```jsonc title="proofkit-typegen-config.jsonc"
 {
-  "$schema": "https://proofkit.dev/typegen-config-schema.json",
+  "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
   "config": {
     "type": "fmodata",
     "configName": "Production OData",
diff --git a/apps/docs/content/docs/typegen/config.mdx b/apps/docs/content/docs/typegen/config.mdx
index 962cb198..706f71f2 100644
--- a/apps/docs/content/docs/typegen/config.mdx
+++ b/apps/docs/content/docs/typegen/config.mdx
@@ -18,7 +18,7 @@ The typegen tool is configured using the `proofkit-typegen-config.jsonc` file at
 
 ```jsonc title="proofkit-typegen-config.jsonc" tab="Single config"
 {
-  "$schema": "https://proofkit.dev/typegen-config-schema.json",
+  "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
   "config": {
     // ... your config here
   },
@@ -27,7 +27,7 @@ The typegen tool is configured using the `proofkit-typegen-config.jsonc` file at
 
 ```jsonc title="proofkit-typegen-config.jsonc" tab="Multiple configs"
 {
-  "$schema": "https://proofkit.dev/typegen-config-schema.json",
+  "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
   "config": [
     {
       // ... your config here
diff --git a/apps/docs/src/app/docs/(docs)/[[...slug]]/page.tsx b/apps/docs/src/app/docs/(docs)/[[...slug]]/page.tsx
index 4d0338eb..faab6599 100644
--- a/apps/docs/src/app/docs/(docs)/[[...slug]]/page.tsx
+++ b/apps/docs/src/app/docs/(docs)/[[...slug]]/page.tsx
@@ -50,7 +50,7 @@ export async function generateMetadata(props: { params: Promise<{ slug?: string[
     notFound();
   }
 
-  const url = `https://proofkit.dev${page.url}`;
+  const url = `https://proofkit.proof.sh${page.url}`;
 
   return {
     title: page.data.title,
diff --git a/apps/docs/src/app/layout.tsx b/apps/docs/src/app/layout.tsx
index 6126d729..f6cf7a90 100644
--- a/apps/docs/src/app/layout.tsx
+++ b/apps/docs/src/app/layout.tsx
@@ -9,7 +9,7 @@ const inter = Inter({
 });
 
 export const metadata: Metadata = {
-  metadataBase: new URL("https://proofkit.dev"),
+  metadataBase: new URL("https://proofkit.proof.sh"),
 };
 
 export default function Layout({ children }: { children: ReactNode }) {
diff --git a/apps/docs/src/app/llms.txt/route.ts b/apps/docs/src/app/llms.txt/route.ts
index bbe636f1..31ea2646 100644
--- a/apps/docs/src/app/llms.txt/route.ts
+++ b/apps/docs/src/app/llms.txt/route.ts
@@ -20,18 +20,18 @@ export function GET() {
   ];
 
   for (const pkg of PACKAGES) {
-    lines.push(`- [${pkg.name}](https://proofkit.dev/llms/${pkg.name}): ${pkg.desc}`);
+    lines.push(`- [${pkg.name}](https://proofkit.proof.sh/llms/${pkg.name}): ${pkg.desc}`);
   }
 
   lines.push("");
   lines.push("## Full Documentation");
   lines.push("");
-  lines.push("- [/llms-full.txt](https://proofkit.dev/llms-full.txt): Complete documentation (all packages)");
+  lines.push("- [/llms-full.txt](https://proofkit.proof.sh/llms-full.txt): Complete documentation (all packages)");
   lines.push("");
   lines.push("## Per-Package Documentation");
   lines.push("");
   for (const pkg of PACKAGES) {
-    lines.push(`- [/llms/${pkg.name}](https://proofkit.dev/llms/${pkg.name})`);
+    lines.push(`- [/llms/${pkg.name}](https://proofkit.proof.sh/llms/${pkg.name})`);
   }
 
   return new Response(lines.join("\n"), {
diff --git a/apps/docs/src/app/robots.ts b/apps/docs/src/app/robots.ts
index 31d1e10e..2df0329d 100644
--- a/apps/docs/src/app/robots.ts
+++ b/apps/docs/src/app/robots.ts
@@ -6,6 +6,6 @@ export default function robots(): MetadataRoute.Robots {
       userAgent: "*",
       allow: ["/", "/llms.txt", "/llms-full.txt", "/llms/"],
     },
-    sitemap: "https://proofkit.dev/sitemap.xml",
+    sitemap: "https://proofkit.proof.sh/sitemap.xml",
   };
 }
diff --git a/apps/docs/src/app/sitemap.ts b/apps/docs/src/app/sitemap.ts
index defce281..c1bae8bd 100644
--- a/apps/docs/src/app/sitemap.ts
+++ b/apps/docs/src/app/sitemap.ts
@@ -1,7 +1,7 @@
 import type { MetadataRoute } from "next";
 import { source } from "@/lib/source";
 
-const BASE_URL = "https://proofkit.dev";
+const BASE_URL = "https://proofkit.proof.sh";
 
 export default function sitemap(): MetadataRoute.Sitemap {
   const pages = source.getPages().map((page) => ({
diff --git a/apps/docs/src/lib/get-llm-text.ts b/apps/docs/src/lib/get-llm-text.ts
index de887563..07e915b9 100644
--- a/apps/docs/src/lib/get-llm-text.ts
+++ b/apps/docs/src/lib/get-llm-text.ts
@@ -29,7 +29,7 @@ export async function getLLMText(page: InferPageType<typeof source>): Promise<st
   }
 
   return `# ${page.data.title}
-URL: https://proofkit.dev${page.url}
+URL: https://proofkit.proof.sh${page.url}
 
 ${page.data.description ?? ""}
 
diff --git a/packages/better-auth/README.md b/packages/better-auth/README.md
index 84972018..cd6d0e54 100644
--- a/packages/better-auth/README.md
+++ b/packages/better-auth/README.md
@@ -8,4 +8,4 @@ Run the tool directly from the command line:
 npx @proofkit/better-auth@latest
 ```
 
-Check out the full documentation at [proofkit.dev](https://proofkit.dev/docs/better-auth).
+Check out the full documentation at [proofkit.proof.sh](https://proofkit.proof.sh/docs/better-auth).
diff --git a/packages/better-auth/package.json b/packages/better-auth/package.json
index 47f0613f..1d150b5e 100644
--- a/packages/better-auth/package.json
+++ b/packages/better-auth/package.json
@@ -48,7 +48,7 @@
   ],
   "author": "",
   "license": "ISC",
-  "homepage": "https://proofkit.dev",
+  "homepage": "https://proofkit.proof.sh",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/proofsh/proofkit.git"
diff --git a/packages/cli-old/README.md b/packages/cli-old/README.md
index e2281090..f8e1efec 100644
--- a/packages/cli-old/README.md
+++ b/packages/cli-old/README.md
@@ -16,4 +16,4 @@
   Get started with a new ProofKit project by running <code>pnpm create proofkit</code>
 </p>
 
-View full documentation at [proofkit.dev](https://proofkit.dev)
+View full documentation at [proofkit.proof.sh](https://proofkit.proof.sh)
diff --git a/packages/cli-old/src/cli/add/data-source/deploy-demo-file.ts b/packages/cli-old/src/cli/add/data-source/deploy-demo-file.ts
index 61bcebe4..7d460058 100644
--- a/packages/cli-old/src/cli/add/data-source/deploy-demo-file.ts
+++ b/packages/cli-old/src/cli/add/data-source/deploy-demo-file.ts
@@ -20,7 +20,7 @@ export async function deployDemoFile({
         name: "Install ProofKit Demo",
         source: {
           type: "url",
-          url: "https://proofkit.dev/proofkit-demo/manifest.json",
+          url: "https://proofkit.proof.sh/proofkit-demo/manifest.json",
         },
         fileOperations: [
           {
diff --git a/packages/cli-old/src/consts.ts b/packages/cli-old/src/consts.ts
index d9c413e0..45a00383 100644
--- a/packages/cli-old/src/consts.ts
+++ b/packages/cli-old/src/consts.ts
@@ -9,7 +9,7 @@ const distPath = path.dirname(__filename);
 export const PKG_ROOT = path.join(distPath, "../");
 export const cliName = "proofkit";
 export const npmName = "@proofkit/cli";
-export const DOCS_URL = "https://proofkit.dev";
+export const DOCS_URL = "https://proofkit.proof.sh";
 
 const version = getVersion();
 const versionCharLength = version.length;
@@ -32,4 +32,4 @@ declare const __REGISTRY_URL__: string;
 // Provide a safe fallback when running from source (not built)
 export const DEFAULT_REGISTRY_URL =
   // typeof check avoids ReferenceError if not defined at runtime
-  typeof __REGISTRY_URL__ !== "undefined" && __REGISTRY_URL__ ? __REGISTRY_URL__ : "https://proofkit.dev";
+  typeof __REGISTRY_URL__ !== "undefined" && __REGISTRY_URL__ ? __REGISTRY_URL__ : "https://proofkit.proof.sh";
diff --git a/packages/cli-old/src/generators/fmdapi.ts b/packages/cli-old/src/generators/fmdapi.ts
index 48ca0be7..27e54ab0 100644
--- a/packages/cli-old/src/generators/fmdapi.ts
+++ b/packages/cli-old/src/generators/fmdapi.ts
@@ -72,7 +72,7 @@ async function readJsonConfigFile(configPath: string): Promise<FullProofkitTypeg
     console.error(`Error reading or parsing JSONC config at ${configPath}:`, error);
     // Return a default structure for the *file* if parsing fails but file exists
     return {
-      $schema: "https://proofkit.dev/typegen-config-schema.json",
+      $schema: "https://proofkit.proof.sh/typegen-config-schema.json",
       config: [],
     };
   }
@@ -114,7 +114,7 @@ export async function addLayout({
 
   if (!fileContent) {
     fileContent = {
-      $schema: "https://proofkit.dev/typegen-config-schema.json",
+      $schema: "https://proofkit.proof.sh/typegen-config-schema.json",
       config: [],
     };
   }
@@ -189,7 +189,7 @@ export async function addConfig({
     }
   } else {
     fileContent = {
-      $schema: "https://proofkit.dev/typegen-config-schema.json",
+      $schema: "https://proofkit.proof.sh/typegen-config-schema.json",
       config: configsToAdd,
     };
   }
@@ -232,7 +232,7 @@ export async function ensureWebviewerFmMcpConfig({
 
   if (!fileContent) {
     fileContent = {
-      $schema: "https://proofkit.dev/typegen-config-schema.json",
+      $schema: "https://proofkit.proof.sh/typegen-config-schema.json",
       config: [newConfig],
     };
     await writeJsonConfigFile(jsonConfigPath, fileContent);
@@ -402,7 +402,7 @@ export async function addToFmschemaConfig({
     }
   } else {
     fileContent = {
-      $schema: "https://proofkit.dev/typegen-config-schema.json",
+      $schema: "https://proofkit.proof.sh/typegen-config-schema.json",
       config: [newDataSource],
     };
   }
diff --git a/packages/cli-old/src/installers/install-fm-addon.ts b/packages/cli-old/src/installers/install-fm-addon.ts
index 384c3e16..78342d73 100644
--- a/packages/cli-old/src/installers/install-fm-addon.ts
+++ b/packages/cli-old/src/installers/install-fm-addon.ts
@@ -33,13 +33,13 @@ export async function installFmAddon({ addonName }: { addonName: "auth" | "wv" }
     console.log(
       `${chalk.yellowBright(
         "You must install the FM Auth addon in your FileMaker file to continue.",
-      )} ${chalk.dim("(Learn more: https://proofkit.dev/auth/fm-addon)")}`,
+      )} ${chalk.dim("(Learn more: https://proofkit.proof.sh/auth/fm-addon)")}`,
     );
   } else {
     console.log(
       `${chalk.yellowBright(
         "You must install the ProofKit WebViewer addon in your FileMaker file to continue.",
-      )} ${chalk.dim("(Learn more: https://proofkit.dev/webviewer)")}`,
+      )} ${chalk.dim("(Learn more: https://proofkit.proof.sh/webviewer)")}`,
     );
   }
   const steps = [
diff --git a/packages/cli-old/src/installers/nextAuth.ts b/packages/cli-old/src/installers/nextAuth.ts
index 793f6d80..163df0f9 100644
--- a/packages/cli-old/src/installers/nextAuth.ts
+++ b/packages/cli-old/src/installers/nextAuth.ts
@@ -184,6 +184,6 @@ async function checkForNextAuthLayouts(projectDir: string) {
   console.log(chalk.bgYellow(" ACTION REQUIRED: "));
   console.log(
     `${chalk.yellowBright("You must now install the NextAuth addon in your FileMaker file.")}
-Learn more: https://proofkit.dev/auth/next-auth\n`,
+Learn more: https://proofkit.proof.sh/auth/next-auth\n`,
   );
 }
diff --git a/packages/cli-old/template/extras/emailProviders/none/email.tsx b/packages/cli-old/template/extras/emailProviders/none/email.tsx
index 21106a19..b8ed06e6 100644
--- a/packages/cli-old/template/extras/emailProviders/none/email.tsx
+++ b/packages/cli-old/template/extras/emailProviders/none/email.tsx
@@ -18,7 +18,7 @@ export async function sendEmail({
     type === "verification" ? "Verify Your Email" : "Reset Your Password";
 
   // TODO: Customize this function to actually send the email to your users
-  // Learn more: https://proofkit.dev/auth/fm-addon
+  // Learn more: https://proofkit.proof.sh/auth/fm-addon
   console.warn("TODO: Customize this function to actually send to your users");
   console.log(`To ${to}: Your ${type} code is ${code}`);
 }
diff --git a/packages/cli-old/template/extras/emailTemplates/auth-code.tsx b/packages/cli-old/template/extras/emailTemplates/auth-code.tsx
index e09789c5..3661a457 100644
--- a/packages/cli-old/template/extras/emailTemplates/auth-code.tsx
+++ b/packages/cli-old/template/extras/emailTemplates/auth-code.tsx
@@ -14,7 +14,7 @@ export const AuthCodeEmail = ({ validationCode, type }: AuthCodeEmailProps) => (
           // TODO: Replace with your logo
           alt="ProofKit"
           height="175"
-          src="https://proofkit.dev/_astro/proofkit.DNcFg0_B_1JN3Dz.webp"
+          src="https://proofkit.proof.sh/proofkit.png"
           style={logo}
           width="238"
         />
diff --git a/packages/cli-old/template/extras/emailTemplates/generic.tsx b/packages/cli-old/template/extras/emailTemplates/generic.tsx
index 5c4046aa..f4b34ba2 100644
--- a/packages/cli-old/template/extras/emailTemplates/generic.tsx
+++ b/packages/cli-old/template/extras/emailTemplates/generic.tsx
@@ -16,7 +16,7 @@ export const GenericEmail = ({ title, description, ctaText, ctaHref, footer }: G
         <Img
           alt="ProofKit"
           height="175"
-          src="https://proofkit.dev/_astro/proofkit.DNcFg0_B_1JN3Dz.webp"
+          src="https://proofkit.proof.sh/proofkit.png"
           style={styles.logo}
           width="238"
         />
@@ -45,7 +45,7 @@ GenericEmail.PreviewProps = {
   title: "Welcome to ProofKit",
   description: "Thanks for trying ProofKit. This is a sample email template you can customize.",
   ctaText: "Get Started",
-  ctaHref: "https://proofkit.dev",
+  ctaHref: "https://proofkit.proof.sh",
   footer: "You received this email because you signed up for updates.",
 } as GenericEmailProps;
 
diff --git a/packages/cli-old/template/extras/fmaddon-auth/app/auth/forgot-password/forgot-form.tsx b/packages/cli-old/template/extras/fmaddon-auth/app/auth/forgot-password/forgot-form.tsx
index 5ff49868..695d7f2c 100644
--- a/packages/cli-old/template/extras/fmaddon-auth/app/auth/forgot-password/forgot-form.tsx
+++ b/packages/cli-old/template/extras/fmaddon-auth/app/auth/forgot-password/forgot-form.tsx
@@ -21,7 +21,7 @@ export default function ForgotForm() {
           <TextInput
             autoFocus
             label="Email"
-            placeholder="you@proofkit.dev"
+            placeholder="you@proofkit.proof.sh"
             required
             withAsterisk={false}
             {...form.register("email")}
diff --git a/packages/cli-old/template/extras/fmaddon-auth/app/auth/login/login-form.tsx b/packages/cli-old/template/extras/fmaddon-auth/app/auth/login/login-form.tsx
index fa13fbb5..c9967827 100644
--- a/packages/cli-old/template/extras/fmaddon-auth/app/auth/login/login-form.tsx
+++ b/packages/cli-old/template/extras/fmaddon-auth/app/auth/login/login-form.tsx
@@ -30,7 +30,7 @@ export default function LoginForm() {
           <TextInput
             autoFocus
             label="Email"
-            placeholder="you@proofkit.dev"
+            placeholder="you@proofkit.proof.sh"
             required
             withAsterisk={false}
             {...form.register("email")}
diff --git a/packages/cli-old/template/extras/fmaddon-auth/app/auth/signup/signup-form.tsx b/packages/cli-old/template/extras/fmaddon-auth/app/auth/signup/signup-form.tsx
index f41454ae..75c0e4fd 100644
--- a/packages/cli-old/template/extras/fmaddon-auth/app/auth/signup/signup-form.tsx
+++ b/packages/cli-old/template/extras/fmaddon-auth/app/auth/signup/signup-form.tsx
@@ -29,7 +29,7 @@ export default function SignupForm() {
         <Stack>
           <TextInput
             label="Email"
-            placeholder="you@proofkit.dev"
+            placeholder="you@proofkit.proof.sh"
             required
             withAsterisk={false}
             {...form.register("email")}
diff --git a/packages/cli-old/template/extras/fmaddon-auth/emails/auth-code.tsx b/packages/cli-old/template/extras/fmaddon-auth/emails/auth-code.tsx
index e09789c5..3661a457 100644
--- a/packages/cli-old/template/extras/fmaddon-auth/emails/auth-code.tsx
+++ b/packages/cli-old/template/extras/fmaddon-auth/emails/auth-code.tsx
@@ -14,7 +14,7 @@ export const AuthCodeEmail = ({ validationCode, type }: AuthCodeEmailProps) => (
           // TODO: Replace with your logo
           alt="ProofKit"
           height="175"
-          src="https://proofkit.dev/_astro/proofkit.DNcFg0_B_1JN3Dz.webp"
+          src="https://proofkit.proof.sh/proofkit.png"
           style={logo}
           width="238"
         />
diff --git a/packages/cli-old/template/fm-addon/ProofKitAuth/de.xml b/packages/cli-old/template/fm-addon/ProofKitAuth/de.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli-old/template/fm-addon/ProofKitAuth/de.xml
+++ b/packages/cli-old/template/fm-addon/ProofKitAuth/de.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli-old/template/fm-addon/ProofKitAuth/en.xml b/packages/cli-old/template/fm-addon/ProofKitAuth/en.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli-old/template/fm-addon/ProofKitAuth/en.xml
+++ b/packages/cli-old/template/fm-addon/ProofKitAuth/en.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli-old/template/fm-addon/ProofKitAuth/es.xml b/packages/cli-old/template/fm-addon/ProofKitAuth/es.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli-old/template/fm-addon/ProofKitAuth/es.xml
+++ b/packages/cli-old/template/fm-addon/ProofKitAuth/es.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli-old/template/fm-addon/ProofKitAuth/fr.xml b/packages/cli-old/template/fm-addon/ProofKitAuth/fr.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli-old/template/fm-addon/ProofKitAuth/fr.xml
+++ b/packages/cli-old/template/fm-addon/ProofKitAuth/fr.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli-old/template/fm-addon/ProofKitAuth/info.json b/packages/cli-old/template/fm-addon/ProofKitAuth/info.json
index 810766f6..df57cc5d 100644
--- a/packages/cli-old/template/fm-addon/ProofKitAuth/info.json
+++ b/packages/cli-old/template/fm-addon/ProofKitAuth/info.json
@@ -2,7 +2,7 @@
   "GUID": "77BDB4D6-5CF8-4740-AB5F-19837A831C21",
   "Clients": ["ProofKit"],
   "Attribution": "Proof",
-  "URL": "https://proofkit.dev/auth/fm-addon",
+  "URL": "https://proofkit.proof.sh/auth/fm-addon",
   "Icon_Color": "#7F7F7F",
   "Version": "1.0"
 }
diff --git a/packages/cli-old/template/fm-addon/ProofKitAuth/it.xml b/packages/cli-old/template/fm-addon/ProofKitAuth/it.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli-old/template/fm-addon/ProofKitAuth/it.xml
+++ b/packages/cli-old/template/fm-addon/ProofKitAuth/it.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli-old/template/fm-addon/ProofKitAuth/ja.xml b/packages/cli-old/template/fm-addon/ProofKitAuth/ja.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli-old/template/fm-addon/ProofKitAuth/ja.xml
+++ b/packages/cli-old/template/fm-addon/ProofKitAuth/ja.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli-old/template/fm-addon/ProofKitAuth/ko.xml b/packages/cli-old/template/fm-addon/ProofKitAuth/ko.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli-old/template/fm-addon/ProofKitAuth/ko.xml
+++ b/packages/cli-old/template/fm-addon/ProofKitAuth/ko.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli-old/template/fm-addon/ProofKitAuth/nl.xml b/packages/cli-old/template/fm-addon/ProofKitAuth/nl.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli-old/template/fm-addon/ProofKitAuth/nl.xml
+++ b/packages/cli-old/template/fm-addon/ProofKitAuth/nl.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli-old/template/fm-addon/ProofKitAuth/pt.xml b/packages/cli-old/template/fm-addon/ProofKitAuth/pt.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli-old/template/fm-addon/ProofKitAuth/pt.xml
+++ b/packages/cli-old/template/fm-addon/ProofKitAuth/pt.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli-old/template/fm-addon/ProofKitAuth/sv.xml b/packages/cli-old/template/fm-addon/ProofKitAuth/sv.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli-old/template/fm-addon/ProofKitAuth/sv.xml
+++ b/packages/cli-old/template/fm-addon/ProofKitAuth/sv.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli-old/template/fm-addon/ProofKitAuth/template.xml b/packages/cli-old/template/fm-addon/ProofKitAuth/template.xml
index 0acd5b1a..31b02158 100644
Binary files a/packages/cli-old/template/fm-addon/ProofKitAuth/template.xml and b/packages/cli-old/template/fm-addon/ProofKitAuth/template.xml differ
diff --git a/packages/cli-old/template/fm-addon/ProofKitAuth/zh.xml b/packages/cli-old/template/fm-addon/ProofKitAuth/zh.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli-old/template/fm-addon/ProofKitAuth/zh.xml
+++ b/packages/cli-old/template/fm-addon/ProofKitAuth/zh.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli-old/template/fm-addon/ProofKitWV/info.json b/packages/cli-old/template/fm-addon/ProofKitWV/info.json
index 92d9b24e..73fc2cae 100644
--- a/packages/cli-old/template/fm-addon/ProofKitWV/info.json
+++ b/packages/cli-old/template/fm-addon/ProofKitWV/info.json
@@ -2,7 +2,7 @@
   "GUID": "7CCFAF65-7C87-46B1-9FDC-D636B3B9C0AD",
   "Clients": ["Pro"],
   "Attribution": "Proof",
-  "URL": "https://proofkit.dev",
+  "URL": "https://proofkit.proof.sh",
   "Icon_Color": "#7F7F7F",
   "Version": "1.0"
 }
diff --git a/packages/cli-old/template/nextjs-mantine/README.md b/packages/cli-old/template/nextjs-mantine/README.md
index 4f416a4a..15794a3d 100644
--- a/packages/cli-old/template/nextjs-mantine/README.md
+++ b/packages/cli-old/template/nextjs-mantine/README.md
@@ -1,6 +1,6 @@
 # ProofKit NextJS Template
 
-This is a [NextJS](https://nextjs.org/) project bootstrapped with `@proofkit/cli`. Learn more at [proofkit.dev](https://proofkit.dev)
+This is a [NextJS](https://nextjs.org/) project bootstrapped with `@proofkit/cli`. Learn more at [proofkit.proof.sh](https://proofkit.proof.sh)
 
 ## What's next? How do I make an app with this?
 
@@ -10,7 +10,7 @@ To add new things to your project, simply run the `proofkit` script from the pro
 
 e.g. `npm run proofkit` or `pnpm proofkit` etc.
 
-For more information, see the full [ProofKit documentation](https://proofkit.dev).
+For more information, see the full [ProofKit documentation](https://proofkit.proof.sh).
 
 ## Project Structure
 
diff --git a/packages/cli-old/template/nextjs-mantine/src/app/(main)/page.tsx b/packages/cli-old/template/nextjs-mantine/src/app/(main)/page.tsx
index 948c28f5..3bc6752b 100644
--- a/packages/cli-old/template/nextjs-mantine/src/app/(main)/page.tsx
+++ b/packages/cli-old/template/nextjs-mantine/src/app/(main)/page.tsx
@@ -42,7 +42,7 @@ export default function Home() {
           </Text>
           <Box>
             <Anchor
-              href="https://proofkit.dev"
+              href="https://proofkit.proof.sh"
               target="_blank"
               rel="proofkit-app"
               style={{ display: "inline-flex", alignItems: "center", gap: 4 }}
diff --git a/packages/cli-old/template/nextjs-shadcn/README.md b/packages/cli-old/template/nextjs-shadcn/README.md
index 4f416a4a..15794a3d 100644
--- a/packages/cli-old/template/nextjs-shadcn/README.md
+++ b/packages/cli-old/template/nextjs-shadcn/README.md
@@ -1,6 +1,6 @@
 # ProofKit NextJS Template
 
-This is a [NextJS](https://nextjs.org/) project bootstrapped with `@proofkit/cli`. Learn more at [proofkit.dev](https://proofkit.dev)
+This is a [NextJS](https://nextjs.org/) project bootstrapped with `@proofkit/cli`. Learn more at [proofkit.proof.sh](https://proofkit.proof.sh)
 
 ## What's next? How do I make an app with this?
 
@@ -10,7 +10,7 @@ To add new things to your project, simply run the `proofkit` script from the pro
 
 e.g. `npm run proofkit` or `pnpm proofkit` etc.
 
-For more information, see the full [ProofKit documentation](https://proofkit.dev).
+For more information, see the full [ProofKit documentation](https://proofkit.proof.sh).
 
 ## Project Structure
 
diff --git a/packages/cli-old/template/nextjs-shadcn/src/app/(main)/page.tsx b/packages/cli-old/template/nextjs-shadcn/src/app/(main)/page.tsx
index a57dbaf6..6c9d5cd9 100644
--- a/packages/cli-old/template/nextjs-shadcn/src/app/(main)/page.tsx
+++ b/packages/cli-old/template/nextjs-shadcn/src/app/(main)/page.tsx
@@ -78,7 +78,7 @@ export default function Home() {
           </p>
           <div>
             <Button asChild variant="outline">
-              <a href="https://proofkit.dev" rel="noreferrer" target="_blank">
+              <a href="https://proofkit.proof.sh" rel="noreferrer" target="_blank">
                 ProofKit Docs <ExternalLinkIcon size={16} />
               </a>
             </Button>
diff --git a/packages/cli-old/template/vite-wv/proofkit-typegen.config.jsonc b/packages/cli-old/template/vite-wv/proofkit-typegen.config.jsonc
index 0e8a96d1..09274c97 100644
--- a/packages/cli-old/template/vite-wv/proofkit-typegen.config.jsonc
+++ b/packages/cli-old/template/vite-wv/proofkit-typegen.config.jsonc
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://proofkit.dev/typegen-config-schema.json",
+  "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
   "config": {
     "type": "fmdapi",
     "path": "./src/config/schemas/filemaker",
diff --git a/packages/cli-old/tsdown.config.ts b/packages/cli-old/tsdown.config.ts
index c9df787c..e0f13fb9 100644
--- a/packages/cli-old/tsdown.config.ts
+++ b/packages/cli-old/tsdown.config.ts
@@ -46,7 +46,7 @@ export default defineConfig({
         __BETTER_AUTH_VERSION__: JSON.stringify(BETTER_AUTH_VERSION),
         __WEBVIEWER_VERSION__: JSON.stringify(WEBVIEWER_VERSION),
         __TYPEGEN_VERSION__: JSON.stringify(TYPEGEN_VERSION),
-        __REGISTRY_URL__: JSON.stringify(isDev ? "http://localhost:3005" : "https://proofkit.dev"),
+        __REGISTRY_URL__: JSON.stringify(isDev ? "http://localhost:3005" : "https://proofkit.proof.sh"),
       },
     }),
   ],
diff --git a/packages/cli/CLI_FLOW_AUDIT.md b/packages/cli/CLI_FLOW_AUDIT.md
new file mode 100644
index 00000000..82e4bc31
--- /dev/null
+++ b/packages/cli/CLI_FLOW_AUDIT.md
@@ -0,0 +1,111 @@
+# ProofKit CLI Flow Audit
+
+## Actual runtime flow
+
+```mermaid
+flowchart TD
+  A[proofkit] --> B{explicit subcommand?}
+
+  B -->|no| C{proofkit.json in cwd?}
+  C -->|yes| D[print project guidance<br/>doctor / prompt / init]
+  C -->|no + interactive| E[run init]
+  C -->|no + non-interactive| F[fail: explicit command required]
+
+  B -->|init| G[Effect init flow]
+  G --> G1[resolve request]
+  G1 --> G2[plan init]
+  G2 --> G3[execute init plan]
+
+  B -->|doctor| H[doctor audit]
+  B -->|prompt| I[placeholder note only]
+
+  B -->|add| J{arg `name` present?}
+  J -->|addon| J1[add addon target]
+  J -->|tanstack-query| J2[run tanstack-query installer]
+  J -->|any other name| J3[installFromRegistry(name)]
+  J -->|no| J4{proofkit.json readable?}
+  J4 -->|no| J5[preflight add]
+  J5 --> J6[registry-driven add flow]
+  J4 -->|yes + ui=shadcn| J6
+  J4 -->|yes + ui!=shadcn| J7[legacy interactive add menu]
+  J7 -->|page| J8[runAddPageAction]
+  J7 -->|schema| J9[runAddSchemaAction]
+  J7 -->|data| J10[runAddDataSourceCommand]
+  J7 -->|react-email| J11[runAddReactEmailCommand]
+  J7 -->|auth| J12[runAddAuthAction]
+
+  B -->|remove| K[legacy interactive remove menu]
+  K -->|page| K1[runRemovePageAction]
+  K -->|schema| K2[runRemoveSchemaAction]
+  K -->|data| K3[runRemoveDataSourceCommand]
+
+  B -->|typegen| L[legacy alias -> runCodegenCommand]
+  B -->|deploy| M[legacy deploy flow]
+  B -->|upgrade| N[legacy upgrade flow]
+```
+
+## Stranded legacy branches
+
+These paths still exist in legacy Commander modules, but new root routing does not expose them as subcommands:
+
+```mermaid
+flowchart TD
+  A[legacy add Command] --> A1[add auth]
+  A --> A2[add addon]
+  A --> A3[add page]
+  A --> A4[add layout/schema]
+  A --> A5[add data]
+
+  B[legacy remove Command] --> B1[remove page]
+  B --> B2[remove layout/schema]
+  B --> B3[remove data]
+
+  C[legacy typegen Command]
+  D[legacy upgrade Command]
+```
+
+The new root CLI only exposes flat `add [name] [target]` and `remove [name]`, so those nested branches are currently implementation-only.
+
+## Gaps / dead ends
+
+1. `add` positional names misroute.
+   `runAdd()` special-cases only `addon` and `tanstack-query`, then sends every other provided `name` to `installFromRegistry(name)`. That means `proofkit add auth`, `proofkit add page`, `proofkit add schema`, `proofkit add layout`, `proofkit add data`, and `proofkit add react-email` do not hit their legacy handlers. They go to registry install instead.
+
+2. `remove [name]` is dead input.
+   `runRemove()` ignores `_name` entirely and always opens the interactive picker. So `proofkit remove page` does not remove a page directly. In non-interactive mode, this path has no direct branch and is likely unusable.
+
+3. Legacy subcommands still defined, but unreachable from root parser.
+   The root Effect CLI exposes `add` and `remove` as flat commands only. The nested Commander subcommands still exist under legacy `makeAddCommand()` and `makeRemoveCommand()`, but root help and parsing never surface `add auth`, `add page`, `remove page`, etc as true subcommands.
+
+4. `prompt` is a deliberate stub.
+   `proofkit prompt` exits successfully, but only prints a "coming soon" note. It is a real command but still a product dead end.
+
+5. Docs and runtime surface diverge.
+   Docs describe ProofKit as mainly `init`, `doctor`, and `prompt`, with package-native CLIs for ongoing work. Runtime still advertises `add`, `remove`, `typegen`, `deploy`, and `upgrade`.
+
+6. Naming drift: `schema` vs `layout`.
+   Legacy schema add/remove commands are actually named `layout` with alias `schema`. Interactive menus say "Schema". If nested subcommands come back, this naming split will still be confusing.
+
+## Tight fix list
+
+1. Pick one surface: flat verbs or nested subcommands.
+2. If flat:
+   Make `runAdd(name)` dispatch explicit names to real handlers before registry fallback.
+3. If flat:
+   Make `runRemove(name)` honor `page|schema|data`.
+4. If nested:
+   Rebuild `add` and `remove` as Effect subcommand trees instead of flat arg parsers.
+5. Hide or remove legacy commands still meant to be package-native only.
+6. Either implement `prompt` or mark it hidden until ready.
+
+## Source refs
+
+- Root command surface: [packages/cli/src/index.ts](/Users/ericluce/Documents/Code/work/proofkit/packages/cli/src/index.ts:206)
+- Root subcommand list: [packages/cli/src/index.ts](/Users/ericluce/Documents/Code/work/proofkit/packages/cli/src/index.ts:402)
+- `add` dispatch: [packages/cli/src/cli/add/index.ts](/Users/ericluce/Documents/Code/work/proofkit/packages/cli/src/cli/add/index.ts:102)
+- Stranded legacy `add` subcommands: [packages/cli/src/cli/add/index.ts](/Users/ericluce/Documents/Code/work/proofkit/packages/cli/src/cli/add/index.ts:166)
+- `remove` ignoring arg: [packages/cli/src/cli/remove/index.ts](/Users/ericluce/Documents/Code/work/proofkit/packages/cli/src/cli/remove/index.ts:12)
+- Stranded legacy `remove` subcommands: [packages/cli/src/cli/remove/index.ts](/Users/ericluce/Documents/Code/work/proofkit/packages/cli/src/cli/remove/index.ts:47)
+- `layout` alias naming: [packages/cli/src/cli/add/fmschema.ts](/Users/ericluce/Documents/Code/work/proofkit/packages/cli/src/cli/add/fmschema.ts:193)
+- `prompt` stub: [packages/cli/src/core/prompt.ts](/Users/ericluce/Documents/Code/work/proofkit/packages/cli/src/core/prompt.ts:5)
+- Docs surface: [apps/docs/content/docs/cli/reference/cli-commands.mdx](/Users/ericluce/Documents/Code/work/proofkit/apps/docs/content/docs/cli/reference/cli-commands.mdx:12)
diff --git a/packages/cli/README.md b/packages/cli/README.md
index e2281090..f8e1efec 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -16,4 +16,4 @@
   Get started with a new ProofKit project by running <code>pnpm create proofkit</code>
 </p>
 
-View full documentation at [proofkit.dev](https://proofkit.dev)
+View full documentation at [proofkit.proof.sh](https://proofkit.proof.sh)
diff --git a/packages/cli/src/cli/add/data-source/deploy-demo-file.ts b/packages/cli/src/cli/add/data-source/deploy-demo-file.ts
index 61bcebe4..7d460058 100644
--- a/packages/cli/src/cli/add/data-source/deploy-demo-file.ts
+++ b/packages/cli/src/cli/add/data-source/deploy-demo-file.ts
@@ -20,7 +20,7 @@ export async function deployDemoFile({
         name: "Install ProofKit Demo",
         source: {
           type: "url",
-          url: "https://proofkit.dev/proofkit-demo/manifest.json",
+          url: "https://proofkit.proof.sh/proofkit-demo/manifest.json",
         },
         fileOperations: [
           {
diff --git a/packages/cli/src/consts.ts b/packages/cli/src/consts.ts
index 6dfe55c9..508d6046 100644
--- a/packages/cli/src/consts.ts
+++ b/packages/cli/src/consts.ts
@@ -9,12 +9,17 @@ export const PKG_ROOT = path.join(distPath, "../");
 export const DEFAULT_APP_NAME = "my-proofkit-app";
 export const cliName = "proofkit";
 export const npmName = "@proofkit/cli";
-export const DOCS_URL = "https://proofkit.dev";
+export const DOCS_URL = "https://proofkit.proof.sh";
 
 export const AGENT_INSTRUCTIONS = [
-  "Use the ProofKit docs as the primary reference for this project: https://proofkit.dev/docs",
+  "Use the ProofKit docs as the primary reference for this project: https://proofkit.proof.sh/docs",
   "Before doing any AI-assisted development here, run `npx @tanstack/intent@latest install` in the project root to load skills relevant to this project",
 ].join("\n");
+
+// Registry URL is injected at build time via tsdown define.
+declare const __REGISTRY_URL__: string;
+export const DEFAULT_REGISTRY_URL =
+  typeof __REGISTRY_URL__ !== "undefined" && __REGISTRY_URL__ ? __REGISTRY_URL__ : "https://proofkit.proof.sh";
 const TITLE_ASCII = `
  _______                             ___  ___  ____    _   _
 |_   __ \\                          .' ..]|_  ||_  _|  (_) / |_
diff --git a/packages/cli/src/generators/fmdapi.ts b/packages/cli/src/generators/fmdapi.ts
index 48ca0be7..27e54ab0 100644
--- a/packages/cli/src/generators/fmdapi.ts
+++ b/packages/cli/src/generators/fmdapi.ts
@@ -72,7 +72,7 @@ async function readJsonConfigFile(configPath: string): Promise<FullProofkitTypeg
     console.error(`Error reading or parsing JSONC config at ${configPath}:`, error);
     // Return a default structure for the *file* if parsing fails but file exists
     return {
-      $schema: "https://proofkit.dev/typegen-config-schema.json",
+      $schema: "https://proofkit.proof.sh/typegen-config-schema.json",
       config: [],
     };
   }
@@ -114,7 +114,7 @@ export async function addLayout({
 
   if (!fileContent) {
     fileContent = {
-      $schema: "https://proofkit.dev/typegen-config-schema.json",
+      $schema: "https://proofkit.proof.sh/typegen-config-schema.json",
       config: [],
     };
   }
@@ -189,7 +189,7 @@ export async function addConfig({
     }
   } else {
     fileContent = {
-      $schema: "https://proofkit.dev/typegen-config-schema.json",
+      $schema: "https://proofkit.proof.sh/typegen-config-schema.json",
       config: configsToAdd,
     };
   }
@@ -232,7 +232,7 @@ export async function ensureWebviewerFmMcpConfig({
 
   if (!fileContent) {
     fileContent = {
-      $schema: "https://proofkit.dev/typegen-config-schema.json",
+      $schema: "https://proofkit.proof.sh/typegen-config-schema.json",
       config: [newConfig],
     };
     await writeJsonConfigFile(jsonConfigPath, fileContent);
@@ -402,7 +402,7 @@ export async function addToFmschemaConfig({
     }
   } else {
     fileContent = {
-      $schema: "https://proofkit.dev/typegen-config-schema.json",
+      $schema: "https://proofkit.proof.sh/typegen-config-schema.json",
       config: [newDataSource],
     };
   }
diff --git a/packages/cli/src/installers/install-fm-addon.ts b/packages/cli/src/installers/install-fm-addon.ts
index bb6ed264..5ec591ef 100644
--- a/packages/cli/src/installers/install-fm-addon.ts
+++ b/packages/cli/src/installers/install-fm-addon.ts
@@ -216,7 +216,7 @@ export function getFmAddonInstallInstructions(addonName: FmAddonName) {
   return {
     addonDisplayName,
     installCommand,
-    docsUrl: addonName === "auth" ? "https://proofkit.dev/auth/fm-addon" : "https://proofkit.dev/webviewer",
+    docsUrl: addonName === "auth" ? "https://proofkit.proof.sh/auth/fm-addon" : "https://proofkit.proof.sh/webviewer",
     steps: [
       `Run \`${installCommand}\` to install or update the local add-on files`,
       "Restart FileMaker Pro so the new local add-on files appear",
@@ -248,13 +248,13 @@ export async function installFmAddonExplicitly({ addonName }: { addonName: FmAdd
     console.log(
       `${chalk.yellowBright(
         "You must install the FM Auth addon in your FileMaker file to continue.",
-      )} ${chalk.dim("(Learn more: https://proofkit.dev/auth/fm-addon)")}`,
+      )} ${chalk.dim("(Learn more: https://proofkit.proof.sh/auth/fm-addon)")}`,
     );
   } else {
     console.log(
       `${chalk.yellowBright(
         "You must install the ProofKit WebViewer addon in your FileMaker file to continue.",
-      )} ${chalk.dim("(Learn more: https://proofkit.dev/webviewer)")}`,
+      )} ${chalk.dim("(Learn more: https://proofkit.proof.sh/webviewer)")}`,
     );
   }
   const steps = [
diff --git a/packages/cli/src/installers/nextAuth.ts b/packages/cli/src/installers/nextAuth.ts
index 793f6d80..163df0f9 100644
--- a/packages/cli/src/installers/nextAuth.ts
+++ b/packages/cli/src/installers/nextAuth.ts
@@ -184,6 +184,6 @@ async function checkForNextAuthLayouts(projectDir: string) {
   console.log(chalk.bgYellow(" ACTION REQUIRED: "));
   console.log(
     `${chalk.yellowBright("You must now install the NextAuth addon in your FileMaker file.")}
-Learn more: https://proofkit.dev/auth/next-auth\n`,
+Learn more: https://proofkit.proof.sh/auth/next-auth\n`,
   );
 }
diff --git a/packages/cli/src/services/live.ts b/packages/cli/src/services/live.ts
index d63807ea..b6744675 100644
--- a/packages/cli/src/services/live.ts
+++ b/packages/cli/src/services/live.ts
@@ -562,7 +562,7 @@ const fileMakerService = {
             name: "Install ProofKit Demo",
             source: {
               type: "url",
-              url: "https://proofkit.dev/proofkit-demo/manifest.json",
+              url: "https://proofkit.proof.sh/proofkit-demo/manifest.json",
             },
             fileOperations: [
               {
diff --git a/packages/cli/src/utils/projectFiles.ts b/packages/cli/src/utils/projectFiles.ts
index f94691e6..557bc717 100644
--- a/packages/cli/src/utils/projectFiles.ts
+++ b/packages/cli/src/utils/projectFiles.ts
@@ -217,7 +217,7 @@ export async function updateTypegenConfig(
 
   if (!(await fs.exists(configPath))) {
     const nextContent: TypegenFileContent = {
-      $schema: "https://proofkit.dev/typegen-config-schema.json",
+      $schema: "https://proofkit.proof.sh/typegen-config-schema.json",
       config: [nextDataSource],
     };
     await fs.writeFile(configPath, `${JSON.stringify(nextContent, null, 2)}\n`);
diff --git a/packages/cli/template/extras/emailProviders/none/email.tsx b/packages/cli/template/extras/emailProviders/none/email.tsx
index 21106a19..b8ed06e6 100644
--- a/packages/cli/template/extras/emailProviders/none/email.tsx
+++ b/packages/cli/template/extras/emailProviders/none/email.tsx
@@ -18,7 +18,7 @@ export async function sendEmail({
     type === "verification" ? "Verify Your Email" : "Reset Your Password";
 
   // TODO: Customize this function to actually send the email to your users
-  // Learn more: https://proofkit.dev/auth/fm-addon
+  // Learn more: https://proofkit.proof.sh/auth/fm-addon
   console.warn("TODO: Customize this function to actually send to your users");
   console.log(`To ${to}: Your ${type} code is ${code}`);
 }
diff --git a/packages/cli/template/extras/emailTemplates/auth-code.tsx b/packages/cli/template/extras/emailTemplates/auth-code.tsx
index e09789c5..3661a457 100644
--- a/packages/cli/template/extras/emailTemplates/auth-code.tsx
+++ b/packages/cli/template/extras/emailTemplates/auth-code.tsx
@@ -14,7 +14,7 @@ export const AuthCodeEmail = ({ validationCode, type }: AuthCodeEmailProps) => (
           // TODO: Replace with your logo
           alt="ProofKit"
           height="175"
-          src="https://proofkit.dev/_astro/proofkit.DNcFg0_B_1JN3Dz.webp"
+          src="https://proofkit.proof.sh/proofkit.png"
           style={logo}
           width="238"
         />
diff --git a/packages/cli/template/extras/emailTemplates/generic.tsx b/packages/cli/template/extras/emailTemplates/generic.tsx
index 5c4046aa..f4b34ba2 100644
--- a/packages/cli/template/extras/emailTemplates/generic.tsx
+++ b/packages/cli/template/extras/emailTemplates/generic.tsx
@@ -16,7 +16,7 @@ export const GenericEmail = ({ title, description, ctaText, ctaHref, footer }: G
         <Img
           alt="ProofKit"
           height="175"
-          src="https://proofkit.dev/_astro/proofkit.DNcFg0_B_1JN3Dz.webp"
+          src="https://proofkit.proof.sh/proofkit.png"
           style={styles.logo}
           width="238"
         />
@@ -45,7 +45,7 @@ GenericEmail.PreviewProps = {
   title: "Welcome to ProofKit",
   description: "Thanks for trying ProofKit. This is a sample email template you can customize.",
   ctaText: "Get Started",
-  ctaHref: "https://proofkit.dev",
+  ctaHref: "https://proofkit.proof.sh",
   footer: "You received this email because you signed up for updates.",
 } as GenericEmailProps;
 
diff --git a/packages/cli/template/extras/fmaddon-auth/app/auth/forgot-password/forgot-form.tsx b/packages/cli/template/extras/fmaddon-auth/app/auth/forgot-password/forgot-form.tsx
index 5ff49868..695d7f2c 100644
--- a/packages/cli/template/extras/fmaddon-auth/app/auth/forgot-password/forgot-form.tsx
+++ b/packages/cli/template/extras/fmaddon-auth/app/auth/forgot-password/forgot-form.tsx
@@ -21,7 +21,7 @@ export default function ForgotForm() {
           <TextInput
             autoFocus
             label="Email"
-            placeholder="you@proofkit.dev"
+            placeholder="you@proofkit.proof.sh"
             required
             withAsterisk={false}
             {...form.register("email")}
diff --git a/packages/cli/template/extras/fmaddon-auth/app/auth/login/login-form.tsx b/packages/cli/template/extras/fmaddon-auth/app/auth/login/login-form.tsx
index fa13fbb5..c9967827 100644
--- a/packages/cli/template/extras/fmaddon-auth/app/auth/login/login-form.tsx
+++ b/packages/cli/template/extras/fmaddon-auth/app/auth/login/login-form.tsx
@@ -30,7 +30,7 @@ export default function LoginForm() {
           <TextInput
             autoFocus
             label="Email"
-            placeholder="you@proofkit.dev"
+            placeholder="you@proofkit.proof.sh"
             required
             withAsterisk={false}
             {...form.register("email")}
diff --git a/packages/cli/template/extras/fmaddon-auth/app/auth/signup/signup-form.tsx b/packages/cli/template/extras/fmaddon-auth/app/auth/signup/signup-form.tsx
index f41454ae..75c0e4fd 100644
--- a/packages/cli/template/extras/fmaddon-auth/app/auth/signup/signup-form.tsx
+++ b/packages/cli/template/extras/fmaddon-auth/app/auth/signup/signup-form.tsx
@@ -29,7 +29,7 @@ export default function SignupForm() {
         <Stack>
           <TextInput
             label="Email"
-            placeholder="you@proofkit.dev"
+            placeholder="you@proofkit.proof.sh"
             required
             withAsterisk={false}
             {...form.register("email")}
diff --git a/packages/cli/template/extras/fmaddon-auth/emails/auth-code.tsx b/packages/cli/template/extras/fmaddon-auth/emails/auth-code.tsx
index e09789c5..3661a457 100644
--- a/packages/cli/template/extras/fmaddon-auth/emails/auth-code.tsx
+++ b/packages/cli/template/extras/fmaddon-auth/emails/auth-code.tsx
@@ -14,7 +14,7 @@ export const AuthCodeEmail = ({ validationCode, type }: AuthCodeEmailProps) => (
           // TODO: Replace with your logo
           alt="ProofKit"
           height="175"
-          src="https://proofkit.dev/_astro/proofkit.DNcFg0_B_1JN3Dz.webp"
+          src="https://proofkit.proof.sh/proofkit.png"
           style={logo}
           width="238"
         />
diff --git a/packages/cli/template/fm-addon/ProofKitAuth/de.xml b/packages/cli/template/fm-addon/ProofKitAuth/de.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli/template/fm-addon/ProofKitAuth/de.xml
+++ b/packages/cli/template/fm-addon/ProofKitAuth/de.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli/template/fm-addon/ProofKitAuth/en.xml b/packages/cli/template/fm-addon/ProofKitAuth/en.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli/template/fm-addon/ProofKitAuth/en.xml
+++ b/packages/cli/template/fm-addon/ProofKitAuth/en.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli/template/fm-addon/ProofKitAuth/es.xml b/packages/cli/template/fm-addon/ProofKitAuth/es.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli/template/fm-addon/ProofKitAuth/es.xml
+++ b/packages/cli/template/fm-addon/ProofKitAuth/es.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli/template/fm-addon/ProofKitAuth/fr.xml b/packages/cli/template/fm-addon/ProofKitAuth/fr.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli/template/fm-addon/ProofKitAuth/fr.xml
+++ b/packages/cli/template/fm-addon/ProofKitAuth/fr.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli/template/fm-addon/ProofKitAuth/info.json b/packages/cli/template/fm-addon/ProofKitAuth/info.json
index 810766f6..df57cc5d 100644
--- a/packages/cli/template/fm-addon/ProofKitAuth/info.json
+++ b/packages/cli/template/fm-addon/ProofKitAuth/info.json
@@ -2,7 +2,7 @@
   "GUID": "77BDB4D6-5CF8-4740-AB5F-19837A831C21",
   "Clients": ["ProofKit"],
   "Attribution": "Proof",
-  "URL": "https://proofkit.dev/auth/fm-addon",
+  "URL": "https://proofkit.proof.sh/auth/fm-addon",
   "Icon_Color": "#7F7F7F",
   "Version": "1.0"
 }
diff --git a/packages/cli/template/fm-addon/ProofKitAuth/it.xml b/packages/cli/template/fm-addon/ProofKitAuth/it.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli/template/fm-addon/ProofKitAuth/it.xml
+++ b/packages/cli/template/fm-addon/ProofKitAuth/it.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli/template/fm-addon/ProofKitAuth/ja.xml b/packages/cli/template/fm-addon/ProofKitAuth/ja.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli/template/fm-addon/ProofKitAuth/ja.xml
+++ b/packages/cli/template/fm-addon/ProofKitAuth/ja.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli/template/fm-addon/ProofKitAuth/ko.xml b/packages/cli/template/fm-addon/ProofKitAuth/ko.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli/template/fm-addon/ProofKitAuth/ko.xml
+++ b/packages/cli/template/fm-addon/ProofKitAuth/ko.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli/template/fm-addon/ProofKitAuth/nl.xml b/packages/cli/template/fm-addon/ProofKitAuth/nl.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli/template/fm-addon/ProofKitAuth/nl.xml
+++ b/packages/cli/template/fm-addon/ProofKitAuth/nl.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli/template/fm-addon/ProofKitAuth/pt.xml b/packages/cli/template/fm-addon/ProofKitAuth/pt.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli/template/fm-addon/ProofKitAuth/pt.xml
+++ b/packages/cli/template/fm-addon/ProofKitAuth/pt.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli/template/fm-addon/ProofKitAuth/sv.xml b/packages/cli/template/fm-addon/ProofKitAuth/sv.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli/template/fm-addon/ProofKitAuth/sv.xml
+++ b/packages/cli/template/fm-addon/ProofKitAuth/sv.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli/template/fm-addon/ProofKitAuth/template.xml b/packages/cli/template/fm-addon/ProofKitAuth/template.xml
index 0acd5b1a..31b02158 100644
Binary files a/packages/cli/template/fm-addon/ProofKitAuth/template.xml and b/packages/cli/template/fm-addon/ProofKitAuth/template.xml differ
diff --git a/packages/cli/template/fm-addon/ProofKitAuth/zh.xml b/packages/cli/template/fm-addon/ProofKitAuth/zh.xml
index 5df205c4..b12f6805 100644
--- a/packages/cli/template/fm-addon/ProofKitAuth/zh.xml
+++ b/packages/cli/template/fm-addon/ProofKitAuth/zh.xml
@@ -162,16 +162,16 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.1F27E3E6452F6E3D407EC45CDFF933C3</StringID>
-	<SourceText>https://proofkit.dev/auth/fm-addon/</SourceText>
-	<TargetText>https://proofkit.dev/auth/fm-addon/</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev/auth/fm-addon/</Comment>
+	<SourceText>https://proofkit.proof.sh/auth/fm-addon/</SourceText>
+	<TargetText>https://proofkit.proof.sh/auth/fm-addon/</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh/auth/fm-addon/</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
 	<StringID>com.fmi.calculation.text.59AFA301111C185DBC5DD64F78DB356F</StringID>
-	<SourceText>https://proofkit.dev</SourceText>
-	<TargetText>https://proofkit.dev</TargetText>
-	<Comment>com.fmi.calculation.text.https://proofkit.dev</Comment>
+	<SourceText>https://proofkit.proof.sh</SourceText>
+	<TargetText>https://proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.calculation.text.https://proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
@@ -351,9 +351,9 @@
 
 <DynamicTemplateString>
 	<StringID>com.fmi.layoutobject.text.F8C144711470F2FE602C612E30803932</StringID>
-	<SourceText>Learn more at proofkit.dev</SourceText>
-	<TargetText>Learn more at proofkit.dev</TargetText>
-	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.dev</Comment>
+	<SourceText>Learn more at proofkit.proof.sh</SourceText>
+	<TargetText>Learn more at proofkit.proof.sh</TargetText>
+	<Comment>com.fmi.layoutobject.text.Learn more at proofkit.proof.sh</Comment>
 </DynamicTemplateString>
 
 <DynamicTemplateString>
diff --git a/packages/cli/template/fm-addon/ProofKitWV/info.json b/packages/cli/template/fm-addon/ProofKitWV/info.json
index 7cca0183..0fae4194 100644
--- a/packages/cli/template/fm-addon/ProofKitWV/info.json
+++ b/packages/cli/template/fm-addon/ProofKitWV/info.json
@@ -5,7 +5,7 @@
 			"Pro"
 		],
 	"Attribution" : "Proof",
-	"URL" : "https://proofkit.dev",
+	"URL" : "https://proofkit.proof.sh",
 	"Icon_Color" : "",
 	"Version" : "0"
 }
diff --git a/packages/cli/template/fm-addon/ProofKitWV/records_de.xml b/packages/cli/template/fm-addon/ProofKitWV/records_de.xml
index 2663c3d7..c58bb4a3 100644
Binary files a/packages/cli/template/fm-addon/ProofKitWV/records_de.xml and b/packages/cli/template/fm-addon/ProofKitWV/records_de.xml differ
diff --git a/packages/cli/template/fm-addon/ProofKitWV/records_en.xml b/packages/cli/template/fm-addon/ProofKitWV/records_en.xml
index 2663c3d7..c58bb4a3 100644
Binary files a/packages/cli/template/fm-addon/ProofKitWV/records_en.xml and b/packages/cli/template/fm-addon/ProofKitWV/records_en.xml differ
diff --git a/packages/cli/template/fm-addon/ProofKitWV/records_es.xml b/packages/cli/template/fm-addon/ProofKitWV/records_es.xml
index 2663c3d7..c58bb4a3 100644
Binary files a/packages/cli/template/fm-addon/ProofKitWV/records_es.xml and b/packages/cli/template/fm-addon/ProofKitWV/records_es.xml differ
diff --git a/packages/cli/template/fm-addon/ProofKitWV/records_fr.xml b/packages/cli/template/fm-addon/ProofKitWV/records_fr.xml
index 2663c3d7..c58bb4a3 100644
Binary files a/packages/cli/template/fm-addon/ProofKitWV/records_fr.xml and b/packages/cli/template/fm-addon/ProofKitWV/records_fr.xml differ
diff --git a/packages/cli/template/fm-addon/ProofKitWV/records_it.xml b/packages/cli/template/fm-addon/ProofKitWV/records_it.xml
index 2663c3d7..c58bb4a3 100644
Binary files a/packages/cli/template/fm-addon/ProofKitWV/records_it.xml and b/packages/cli/template/fm-addon/ProofKitWV/records_it.xml differ
diff --git a/packages/cli/template/fm-addon/ProofKitWV/records_ja.xml b/packages/cli/template/fm-addon/ProofKitWV/records_ja.xml
index 2663c3d7..c58bb4a3 100644
Binary files a/packages/cli/template/fm-addon/ProofKitWV/records_ja.xml and b/packages/cli/template/fm-addon/ProofKitWV/records_ja.xml differ
diff --git a/packages/cli/template/fm-addon/ProofKitWV/records_ko.xml b/packages/cli/template/fm-addon/ProofKitWV/records_ko.xml
index 2663c3d7..c58bb4a3 100644
Binary files a/packages/cli/template/fm-addon/ProofKitWV/records_ko.xml and b/packages/cli/template/fm-addon/ProofKitWV/records_ko.xml differ
diff --git a/packages/cli/template/fm-addon/ProofKitWV/records_nl.xml b/packages/cli/template/fm-addon/ProofKitWV/records_nl.xml
index 2663c3d7..c58bb4a3 100644
Binary files a/packages/cli/template/fm-addon/ProofKitWV/records_nl.xml and b/packages/cli/template/fm-addon/ProofKitWV/records_nl.xml differ
diff --git a/packages/cli/template/fm-addon/ProofKitWV/records_pt.xml b/packages/cli/template/fm-addon/ProofKitWV/records_pt.xml
index 2663c3d7..c58bb4a3 100644
Binary files a/packages/cli/template/fm-addon/ProofKitWV/records_pt.xml and b/packages/cli/template/fm-addon/ProofKitWV/records_pt.xml differ
diff --git a/packages/cli/template/fm-addon/ProofKitWV/records_sv.xml b/packages/cli/template/fm-addon/ProofKitWV/records_sv.xml
index 2663c3d7..c58bb4a3 100644
Binary files a/packages/cli/template/fm-addon/ProofKitWV/records_sv.xml and b/packages/cli/template/fm-addon/ProofKitWV/records_sv.xml differ
diff --git a/packages/cli/template/fm-addon/ProofKitWV/records_zh.xml b/packages/cli/template/fm-addon/ProofKitWV/records_zh.xml
index 2663c3d7..c58bb4a3 100644
Binary files a/packages/cli/template/fm-addon/ProofKitWV/records_zh.xml and b/packages/cli/template/fm-addon/ProofKitWV/records_zh.xml differ
diff --git a/packages/cli/template/nextjs-shadcn/README.md b/packages/cli/template/nextjs-shadcn/README.md
index 4f416a4a..15794a3d 100644
--- a/packages/cli/template/nextjs-shadcn/README.md
+++ b/packages/cli/template/nextjs-shadcn/README.md
@@ -1,6 +1,6 @@
 # ProofKit NextJS Template
 
-This is a [NextJS](https://nextjs.org/) project bootstrapped with `@proofkit/cli`. Learn more at [proofkit.dev](https://proofkit.dev)
+This is a [NextJS](https://nextjs.org/) project bootstrapped with `@proofkit/cli`. Learn more at [proofkit.proof.sh](https://proofkit.proof.sh)
 
 ## What's next? How do I make an app with this?
 
@@ -10,7 +10,7 @@ To add new things to your project, simply run the `proofkit` script from the pro
 
 e.g. `npm run proofkit` or `pnpm proofkit` etc.
 
-For more information, see the full [ProofKit documentation](https://proofkit.dev).
+For more information, see the full [ProofKit documentation](https://proofkit.proof.sh).
 
 ## Project Structure
 
diff --git a/packages/cli/template/nextjs-shadcn/src/app/(main)/page.tsx b/packages/cli/template/nextjs-shadcn/src/app/(main)/page.tsx
index a57dbaf6..6c9d5cd9 100644
--- a/packages/cli/template/nextjs-shadcn/src/app/(main)/page.tsx
+++ b/packages/cli/template/nextjs-shadcn/src/app/(main)/page.tsx
@@ -78,7 +78,7 @@ export default function Home() {
           </p>
           <div>
             <Button asChild variant="outline">
-              <a href="https://proofkit.dev" rel="noreferrer" target="_blank">
+              <a href="https://proofkit.proof.sh" rel="noreferrer" target="_blank">
                 ProofKit Docs <ExternalLinkIcon size={16} />
               </a>
             </Button>
diff --git a/packages/cli/template/vite-wv/proofkit-typegen.config.jsonc b/packages/cli/template/vite-wv/proofkit-typegen.config.jsonc
index 0e8a96d1..09274c97 100644
--- a/packages/cli/template/vite-wv/proofkit-typegen.config.jsonc
+++ b/packages/cli/template/vite-wv/proofkit-typegen.config.jsonc
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://proofkit.dev/typegen-config-schema.json",
+  "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
   "config": {
     "type": "fmdapi",
     "path": "./src/config/schemas/filemaker",
diff --git a/packages/create-proofkit/README.md b/packages/create-proofkit/README.md
index 52367f82..02a7bded 100644
--- a/packages/create-proofkit/README.md
+++ b/packages/create-proofkit/README.md
@@ -4,4 +4,4 @@
 npx create proofkit
 ```
 
-This is a simple alias package for the ProofKit CLI. For full documentation, see the [ProofKit Docs](https://proofkit.dev).
+This is a simple alias package for the ProofKit CLI. For full documentation, see the [ProofKit Docs](https://proofkit.proof.sh).
diff --git a/packages/fmdapi/README.md b/packages/fmdapi/README.md
index afee663b..d57cbae9 100644
--- a/packages/fmdapi/README.md
+++ b/packages/fmdapi/README.md
@@ -5,4 +5,4 @@
 
 # Claris FileMaker Data API Client for TypeScript
 
-For full documentation, see [proofkit.dev/docs/fmdapi](https://proofkit.dev/docs/fmdapi).
+For full documentation, see [proofkit.proof.sh/docs/fmdapi](https://proofkit.proof.sh/docs/fmdapi).
diff --git a/packages/fmdapi/skills/typegen-fmdapi/SKILL.md b/packages/fmdapi/skills/typegen-fmdapi/SKILL.md
index 8b3f0c50..843641ca 100644
--- a/packages/fmdapi/skills/typegen-fmdapi/SKILL.md
+++ b/packages/fmdapi/skills/typegen-fmdapi/SKILL.md
@@ -62,7 +62,7 @@ This creates `proofkit-typegen-config.jsonc` at your project root. Configure you
 
 ```jsonc
 {
-  "$schema": "https://proofkit.dev/typegen-config-schema.json",
+  "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
   "config": {
     "type": "fmdapi",
     "path": "schema",
@@ -199,7 +199,7 @@ FM MCP mode lets typegen fetch layout metadata from a locally running FileMaker
 
 ```jsonc
 {
-  "$schema": "https://proofkit.dev/typegen-config-schema.json",
+  "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
   "config": {
     "type": "fmdapi",
     "fmMcp": { "enabled": true },
@@ -302,7 +302,7 @@ Correct:
 ```jsonc
 // proofkit-typegen-config.jsonc
 {
-  "$schema": "https://proofkit.dev/typegen-config-schema.json",
+  "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
   "config": {
     "type": "fmdapi",
     "layouts": [
diff --git a/packages/fmodata/README.md b/packages/fmodata/README.md
index 6c5ecd1d..af405636 100644
--- a/packages/fmodata/README.md
+++ b/packages/fmodata/README.md
@@ -10,7 +10,7 @@ Roadmap:
 - [x] Batch operations
   - [ ] Automatically chunk requests into smaller batches (e.g. max 512 inserts per batch)
 - [x] Schema updates (add/update tables and fields)
-- [x] Proper docs at proofkit.dev
+- [x] Proper docs at proofkit.proof.sh
 - [x] @proofkit/typegen integration
 
 ## Installation
diff --git a/packages/fmodata/skills/typegen-fmodata/SKILL.md b/packages/fmodata/skills/typegen-fmodata/SKILL.md
index e4506ccf..48dcf41d 100644
--- a/packages/fmodata/skills/typegen-fmodata/SKILL.md
+++ b/packages/fmodata/skills/typegen-fmodata/SKILL.md
@@ -64,7 +64,7 @@ This creates `proofkit-typegen-config.jsonc`. Configure for OData mode:
 
 ```jsonc
 {
-  "$schema": "https://proofkit.dev/typegen-config-schema.json",
+  "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
   "config": {
     "type": "fmodata",
     "path": "schema/odata",
diff --git a/packages/registry/templates/better-auth/auth.hbs b/packages/registry/templates/better-auth/auth.hbs
index 4c722dff..5521b93d 100644
--- a/packages/registry/templates/better-auth/auth.hbs
+++ b/packages/registry/templates/better-auth/auth.hbs
@@ -41,7 +41,7 @@ export const auth = betterAuth({
       const subject = "Reset Your Password";
       
       // TODO: Customize this function to actually send the email to your users
-      // Learn more: https://proofkit.dev/auth/better-auth
+      // Learn more: https://proofkit.proof.sh/auth/better-auth
       console.warn(
         "TODO: Customize this function to actually send to your users",
       );
diff --git a/packages/registry/templates/email/auth-code/auth-code.tsx b/packages/registry/templates/email/auth-code/auth-code.tsx
index 38233b67..395f735f 100644
--- a/packages/registry/templates/email/auth-code/auth-code.tsx
+++ b/packages/registry/templates/email/auth-code/auth-code.tsx
@@ -14,7 +14,7 @@ export const AuthCodeEmail = ({ validationCode, type }: AuthCodeEmailProps) => (
           // TODO: Replace with your logo
           alt="ProofKit"
           height="175"
-          src="https://proofkit.dev/proofkit.png"
+          src="https://proofkit.proof.sh/proofkit.png"
           style={logo}
           width="238"
         />
diff --git a/packages/registry/templates/email/generic/generic.tsx b/packages/registry/templates/email/generic/generic.tsx
index ea00437f..77f79299 100644
--- a/packages/registry/templates/email/generic/generic.tsx
+++ b/packages/registry/templates/email/generic/generic.tsx
@@ -13,7 +13,7 @@ export const GenericEmail = ({ title, description, ctaText, ctaHref, footer }: G
     <Head />
     <Body style={styles.main}>
       <Container style={styles.container}>
-        <Img alt="ProofKit" height="175" src="https://proofkit.dev/proofkit.png" style={styles.logo} width="238" />
+        <Img alt="ProofKit" height="175" src="https://proofkit.proof.sh/proofkit.png" style={styles.logo} width="238" />
 
         {title ? <Heading style={styles.title}>{title}</Heading> : null}
 
@@ -39,7 +39,7 @@ GenericEmail.PreviewProps = {
   title: "Welcome to ProofKit",
   description: "Thanks for trying ProofKit. This is a sample email template you can customize.",
   ctaText: "Get Started",
-  ctaHref: "https://proofkit.dev",
+  ctaHref: "https://proofkit.proof.sh",
   footer: "You received this email because you signed up for updates.",
 } as GenericEmailProps;
 
diff --git a/packages/registry/templates/fmdapi/proofkit-typegen.config.jsonc b/packages/registry/templates/fmdapi/proofkit-typegen.config.jsonc
index 665eac8c..7674b9e4 100644
--- a/packages/registry/templates/fmdapi/proofkit-typegen.config.jsonc
+++ b/packages/registry/templates/fmdapi/proofkit-typegen.config.jsonc
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://proofkit.dev/typegen-config-schema.json",
+  "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
   "config": [
     {
       "layouts": [],
diff --git a/packages/registry/templates/table/basic/README.hbs b/packages/registry/templates/table/basic/README.hbs
index f09260de..0a5fdebb 100644
--- a/packages/registry/templates/table/basic/README.hbs
+++ b/packages/registry/templates/table/basic/README.hbs
@@ -191,7 +191,7 @@ try {
 - [Next.js App Router](https://nextjs.org/docs/app)
 - [TanStack Table](https://tanstack.com/table/latest)
 - [nuqs Documentation](https://nuqs.47ng.com/)
-- [ProofKit FileMaker Integration](https://proofkit.dev/docs)
+- [ProofKit FileMaker Integration](https://proofkit.proof.sh/docs)
 
 ## 🎨 Styling
 
diff --git a/packages/typegen/README.md b/packages/typegen/README.md
index f066dca3..13c32b56 100644
--- a/packages/typegen/README.md
+++ b/packages/typegen/README.md
@@ -40,4 +40,4 @@ buildSchema(file, args);
 
 For `fmodata` configs targeting FileMaker Cloud, `envNames.auth` also supports `clarisIdUsername` and `clarisIdPassword`. These map to Claris ID credentials used for OData auth. MFA-backed Claris ID accounts are not supported yet.
 
-Check out the full documentation at [proofkit.dev](https://proofkit.dev/docs/typegen).
+Check out the full documentation at [proofkit.proof.sh](https://proofkit.proof.sh/docs/typegen).
diff --git a/packages/typegen/live-fm-mcp-output/client/contacts.ts b/packages/typegen/live-fm-mcp-output/client/contacts.ts
index ee29c212..dcef8536 100644
--- a/packages/typegen/live-fm-mcp-output/client/contacts.ts
+++ b/packages/typegen/live-fm-mcp-output/client/contacts.ts
@@ -1,6 +1,6 @@
 /**
  * Generated by @proofkit/typegen package
- * https://proofkit.dev/docs/typegen
+ * https://proofkit.proof.sh/docs/typegen
  * DO NOT EDIT THIS FILE DIRECTLY. Changes may be overwritten
  */
 import { DataApi } from "@proofkit/fmdapi";
diff --git a/packages/typegen/package.json b/packages/typegen/package.json
index cd8caacd..9a1223bd 100644
--- a/packages/typegen/package.json
+++ b/packages/typegen/package.json
@@ -62,7 +62,7 @@
   ],
   "author": "",
   "license": "ISC",
-  "homepage": "https://proofkit.dev",
+  "homepage": "https://proofkit.proof.sh",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/proofsh/proofkit.git"
diff --git a/packages/typegen/proofkit-typegen.config.jsonc b/packages/typegen/proofkit-typegen.config.jsonc
index 25ca610a..c549ae68 100644
--- a/packages/typegen/proofkit-typegen.config.jsonc
+++ b/packages/typegen/proofkit-typegen.config.jsonc
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://proofkit.dev/typegen-config-schema.json",
+  "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
   "config": [
     {
       "type": "fmodata",
diff --git a/packages/typegen/proofkit-typegen.fm-mcp.local.jsonc b/packages/typegen/proofkit-typegen.fm-mcp.local.jsonc
index 2f98ce3a..dfd89deb 100644
--- a/packages/typegen/proofkit-typegen.fm-mcp.local.jsonc
+++ b/packages/typegen/proofkit-typegen.fm-mcp.local.jsonc
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://proofkit.dev/typegen-config-schema.json",
+  "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
   "config": {
     "type": "fmdapi",
     "webviewerScriptName": "execute_data_api",
diff --git a/packages/typegen/src/constants.ts b/packages/typegen/src/constants.ts
index f92f8b02..95eff295 100644
--- a/packages/typegen/src/constants.ts
+++ b/packages/typegen/src/constants.ts
@@ -1,6 +1,6 @@
 export const commentHeader = `/**
  * Generated by @proofkit/typegen package
- * https://proofkit.dev/docs/typegen
+ * https://proofkit.proof.sh/docs/typegen
  * DO NOT EDIT THIS FILE DIRECTLY. Changes may be overwritten
  */
 
diff --git a/packages/typegen/src/server/api.ts b/packages/typegen/src/server/api.ts
index 8e65f802..0430ac08 100644
--- a/packages/typegen/src/server/api.ts
+++ b/packages/typegen/src/server/api.ts
@@ -112,7 +112,7 @@ async function handlePostConfig(req: IncomingMessage, context: ApiContext): Prom
     const configData = validation.data as Record<string, unknown>;
     const { $schema: _, ...rest } = configData;
     const configWithSchema = {
-      $schema: "https://proofkit.dev/typegen-config-schema.json",
+      $schema: "https://proofkit.proof.sh/typegen-config-schema.json",
       ...rest,
     };
     const jsonContent = `${JSON.stringify(configWithSchema, null, 2)}\n`;
diff --git a/packages/typegen/src/server/app.ts b/packages/typegen/src/server/app.ts
index fc48f62d..92bbe11e 100644
--- a/packages/typegen/src/server/app.ts
+++ b/packages/typegen/src/server/app.ts
@@ -177,7 +177,7 @@ export function createApiApp(context: ApiContext) {
           console.log("[Server POST /config] Validation data to write:", JSON.stringify(configData, null, 2));
           const { $schema: _, ...rest } = configData;
           const configWithSchema = {
-            $schema: "https://proofkit.dev/typegen-config-schema.json",
+            $schema: "https://proofkit.proof.sh/typegen-config-schema.json",
             ...rest,
           };
           const jsonContent = `${JSON.stringify(configWithSchema, null, 2)}\n`;
diff --git a/packages/typegen/stubs/proofkit-typegen.config.jsonc b/packages/typegen/stubs/proofkit-typegen.config.jsonc
index fafac71f..7a63f655 100644
--- a/packages/typegen/stubs/proofkit-typegen.config.jsonc
+++ b/packages/typegen/stubs/proofkit-typegen.config.jsonc
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://proofkit.dev/typegen-config-schema.json",
+  "$schema": "https://proofkit.proof.sh/typegen-config-schema.json",
   "config": {
     "clientSuffix": "Layout",
     "layouts": [
diff --git a/packages/typegen/tests/__snapshots__/strict-numbers.snap.ts b/packages/typegen/tests/__snapshots__/strict-numbers.snap.ts
index 02761941..952d7543 100644
--- a/packages/typegen/tests/__snapshots__/strict-numbers.snap.ts
+++ b/packages/typegen/tests/__snapshots__/strict-numbers.snap.ts
@@ -1,6 +1,6 @@
 /**
  * Generated by @proofkit/typegen package
- * https://proofkit.dev/docs/typegen
+ * https://proofkit.proof.sh/docs/typegen
  * DO NOT EDIT THIS FILE DIRECTLY. Changes may be overwritten
  */
 import type { InferZodPortals } from "@proofkit/fmdapi";
diff --git a/packages/typegen/tests/__snapshots__/zod-layout-client.snap.ts b/packages/typegen/tests/__snapshots__/zod-layout-client.snap.ts
index 546809dc..71d7d9a0 100644
--- a/packages/typegen/tests/__snapshots__/zod-layout-client.snap.ts
+++ b/packages/typegen/tests/__snapshots__/zod-layout-client.snap.ts
@@ -1,6 +1,6 @@
 /**
  * Generated by @proofkit/typegen package
- * https://proofkit.dev/docs/typegen
+ * https://proofkit.proof.sh/docs/typegen
  * DO NOT EDIT THIS FILE DIRECTLY. Changes may be overwritten
  */
 import type { InferZodPortals } from "@proofkit/fmdapi";
diff --git a/packages/webviewer/README.md b/packages/webviewer/README.md
index a4e55085..6495dd77 100644
--- a/packages/webviewer/README.md
+++ b/packages/webviewer/README.md
@@ -4,7 +4,7 @@
 
 This is a fetch replacement for calling a FileMaker script and getting a promise back in return. Or you can use callback if you want instead.
 
-**[Documentation Website](https://proofkit.dev/docs/webviewer)**
+**[Documentation Website](https://proofkit.proof.sh/docs/webviewer)**
 
 Install via your package manager of choice:
 
diff --git a/packages/webviewer/package.json b/packages/webviewer/package.json
index 1e685d63..0cfb4989 100644
--- a/packages/webviewer/package.json
+++ b/packages/webviewer/package.json
@@ -85,7 +85,7 @@
   "bugs": {
     "url": "https://github.com/proofsh/proofkit/issues"
   },
-  "homepage": "https://proofkit.dev/docs/webviewer",
+  "homepage": "https://proofkit.proof.sh/docs/webviewer",
   "keywords": [
     "filemaker",
     "proofgeist",