diff --git a/README.md b/README.md
index aee728e..df6ccab 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Additionally, what makes Pocket ID special is that it only supports [passkey](ht
 
 Pocket ID can be set up in multiple ways. The easiest and recommended way is to use Docker.
 
-Visit the [documentation](https://stonith404.github.io/pocket-id) for the setup guide and more information.
+Visit the [documentation](https://docs.pocket-id.org) for the setup guide and more information.
 
 ## Contribute
 
diff --git a/docs/docs/configuration/ldap.md b/docs/docs/configuration/ldap.md
index a40a797..f6901f0 100644
--- a/docs/docs/configuration/ldap.md
+++ b/docs/docs/configuration/ldap.md
@@ -13,7 +13,7 @@ Pocket ID can sync users and groups from an LDAP Source (lldap, OpenLDAP, Active
 
 ### Generic LDAP Setup
 
-1. Follow the installation guide [here](/pocket-id/setup/installation).
+1. Follow the installation guide [here](/setup/installation).
 2. Once you have signed in with the initial admin account, navigate to the Application Configuration section at `https://pocket.id/settings/admin/application-configuration`.
 3. Client Configuration Setup
 
diff --git a/docs/docs/introduction.md b/docs/docs/introduction.md
index f6b06aa..d1d2592 100644
--- a/docs/docs/introduction.md
+++ b/docs/docs/introduction.md
@@ -14,11 +14,11 @@ Additionally, what makes Pocket ID special is that it only supports [passkey](ht
 
 ## Get to know Pocket ID
 
-→ [Try the Demo of Pocket ID](https://pocket-id.eliasschneider.com/)<br/>
+→ [Try the Demo of Pocket ID](https://demo.pocket-id.org)
 
 <img src="https://github.com/user-attachments/assets/96ac549d-b897-404a-8811-f42b16ea58e2" width="700"/>
 
 ## Useful Links
-- [Installation](/pocket-id/setup/installation)
-- [Proxy Services](/pocket-id/guides/proxy-services)
-- [Client Examples](/pocket-id/client-examples)
\ No newline at end of file
+- [Installation](/setup/installation)
+- [Proxy Services](/guides/proxy-services)
+- [Client Examples](/client-examples)
\ No newline at end of file
diff --git a/docs/docs/setup/installation.md b/docs/docs/setup/installation.md
index 57928e1..9974a1a 100644
--- a/docs/docs/setup/installation.md
+++ b/docs/docs/setup/installation.md
@@ -18,7 +18,7 @@ Pocket ID requires a [secure context](https://developer.mozilla.org/en-US/docs/W
     curl -o .env https://raw.githubusercontent.com/stonith404/pocket-id/main/.env.example
    ```
 
-2. Edit the `.env` file so that it fits your needs. See the [environment variables](/pocket-id/configuration/environment-variables) section for more information.
+2. Edit the `.env` file so that it fits your needs. See the [environment variables](/configuration/environment-variables) section for more information.
 3. Run `docker compose up -d`
 
 You can now sign in with the admin account on `http://localhost/login/setup`.
diff --git a/docs/docusaurus.config.ts b/docs/docusaurus.config.ts
index 11d774b..0545278 100644
--- a/docs/docusaurus.config.ts
+++ b/docs/docusaurus.config.ts
@@ -8,8 +8,8 @@ const config: Config = {
     "Pocket ID is a simple OIDC provider that allows users to authenticate with their passkeys to your services.",
   favicon: "img/pocket-id.png",
 
-  url: "https://stonith404.github.io",
-  baseUrl: "/pocket-id/",
+  url: "https://docs.pocket-id.org",
+  baseUrl: "/",
   organizationName: "stonith404",
   projectName: "pocket-id",
 
diff --git a/docs/sidebars.ts b/docs/sidebars.ts
index c5af1e5..806dfa1 100644
--- a/docs/sidebars.ts
+++ b/docs/sidebars.ts
@@ -100,7 +100,7 @@ const sidebars: SidebarsConfig = {
     {
       type: "link",
       label: "Demo",
-      href: "https://pocket-id.eliasschneider.com/",
+      href: "https://demo.pocket-id.org",
     },
   ],
 };
diff --git a/docs/src/pages/index.tsx b/docs/src/pages/index.tsx
index 430f9e3..7c6247a 100644
--- a/docs/src/pages/index.tsx
+++ b/docs/src/pages/index.tsx
@@ -1,5 +1,5 @@
 import { Redirect } from "react-router-dom";
 
 export default function Home() {
-  return <Redirect to="/pocket-id/introduction" />;
+  return <Redirect to="/introduction" />;
 }
diff --git a/docs/static/CNAME b/docs/static/CNAME
new file mode 100644
index 0000000..123d5bb
--- /dev/null
+++ b/docs/static/CNAME
@@ -0,0 +1 @@
+docs.pocket-id.org
\ No newline at end of file