diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml
index 40968a6a..39586c76 100644
--- a/.github/workflows/docs-preview.yml
+++ b/.github/workflows/docs-preview.yml
@@ -32,7 +32,7 @@ jobs:
         working-directory: docs
         env:
           # Override base path for PR preview
-          DOCS_BASE_PATH: /craft/pr-preview/pr-${{ github.event.pull_request.number }}
+          DOCS_BASE_PATH: /pr-preview/pr-${{ github.event.pull_request.number }}
         run: |
           pnpm install --frozen-lockfile
           pnpm build
@@ -74,4 +74,5 @@ jobs:
           source-dir: docs/dist/
           preview-branch: gh-pages
           umbrella-dir: pr-preview
+          pages-base-url: craft.sentry.dev
           action: auto
diff --git a/docs/astro.config.mjs b/docs/astro.config.mjs
index 65a8a3e2..4febc51b 100644
--- a/docs/astro.config.mjs
+++ b/docs/astro.config.mjs
@@ -2,10 +2,10 @@ import { defineConfig } from 'astro/config';
 import starlight from '@astrojs/starlight';
 
 // Allow base path override via environment variable for PR previews
-const base = process.env.DOCS_BASE_PATH || '/craft';
+const base = process.env.DOCS_BASE_PATH || '/';
 
 export default defineConfig({
-  site: 'https://getsentry.github.io',
+  site: 'https://craft.sentry.dev',
   base: base,
   integrations: [
     starlight({