diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a845b05fd..1db5a6cfe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,6 +39,5 @@ jobs:
       with:
         publish_dir: ./docs/dist
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        cname: uiengine.uix.space
         user_name: 'github-actions[bot]'
         user_email: 'github-actions[bot]@users.noreply.github.com'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f39a8b21..66c4d06a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -263,7 +263,7 @@ For details see the
 ### Added
 
 - Set browser-sync `startPath` for custom UI base
-- New [documentation site](https://uiengine.uix.space/), generated with the UIengine itself
+- New [documentation site](https://dennisreimann.github.io/uiengine/), generated with the UIengine itself
 
 ### Changed
 
diff --git a/README.md b/README.md
index f80cf705e..bf66c45be 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ npx uiengine init --demo
 npx uiengine build --serve --watch
 ```
 
-See the [getting started guide](https://uiengine.uix.space/basics/getting-started/)
+See the [getting started guide](https://dennisreimann.github.io/uiengine/basics/getting-started/)
 for further details.
 There are also some [introduction videos](https://www.youtube.com/watch?v=YBm_ye9da-Q&list=PLBXz0hPvV2jNAFb9KxvV-2Op8cy3tA8E2):
 
@@ -40,13 +40,13 @@ There are also some [introduction videos](https://www.youtube.com/watch?v=YBm_ye
 
 To get an idea of what a real-world project looks like, see the React sample project:
 
-- [Tasty BBQ Design System](https://uiengine-sample-react.uix.space/design-system/): The UIengine output for this sample project
-- [Tasty BBQ Website](https://uiengine-sample-react.uix.space/): The corresponding website, built with React and Next.js.
+- [Tasty BBQ Design System](https://dennisreimann.github.io/uiengine-sample-react/design-system/): The UIengine output for this sample project
+- [Tasty BBQ Website](https://dennisreimann.github.io/uiengine-sample-react/): The corresponding website, built with React and Next.js.
 - [Tasty BBQ Source Code](https://github.com/dennisreimann/uiengine-sample-react).
 
 ## 📘 Documentation
 
-See the [documentation](https://uiengine.uix.space/) site, which is also generated with the UIengine.
+See the [documentation](https://dennisreimann.github.io/uiengine/) site, which is also generated with the UIengine.
 
 ## 🔩 Technical TL;DR
 
@@ -117,7 +117,7 @@ Here are some other projects that you might want to evaluate:
 ## 🛠 Development
 
 You like this project and are interested in participating?
-See the [development docs](https://uiengine.uix.space/development/contributing/) for an introduction and workflows when hacking on the UIengine.
+See the [development docs](https://dennisreimann.github.io/uiengine/development/contributing/) for an introduction and workflows when hacking on the UIengine.
 
 ## ✨ Contributors
 
diff --git a/docs/adapter/css.md b/docs/adapter/css.md
index 3402f12c9..12c7f7432 100644
--- a/docs/adapter/css.md
+++ b/docs/adapter/css.md
@@ -60,4 +60,4 @@ src
 
 See the [test project](https://github.com/dennisreimann/uiengine/tree/master/test/project/src) for an example of the file contents.
 
-For an example of the output have a look at the "Themes" tab of the [label component sample](https://uiengine.uix.space/test-project/patterns/atoms/label/).
+For an example of the output have a look at the "Themes" tab of the [label component sample](https://dennisreimann.github.io/uiengine/test-project/patterns/atoms/label/).
diff --git a/docs/uiengine.config.js b/docs/uiengine.config.js
index 2ef631272..5a1448791 100644
--- a/docs/uiengine.config.js
+++ b/docs/uiengine.config.js
@@ -15,7 +15,7 @@ const meta = (name, content) => ({
 
 module.exports = {
   name: 'UIengine Documentation',
-  logo: '/images/logo.svg',
+  logo: '/uiengine/images/logo.svg',
   version: pkg.version,
 
   source: {
@@ -26,6 +26,7 @@ module.exports = {
   target: 'dist',
 
   ui: {
+    base: '/uiengine/',
     customStylesFile: '/styles/docs.css',
     meta: [
       meta('description', 'The UIengine is a workbench for UI-driven development: A tool for developers and designers to build and document web sites and apps.'),
@@ -53,14 +54,14 @@ module.exports = {
 
       meta('og:type', 'website'),
       meta('og:title', 'UIengine'),
-      meta('og:url', 'https://uiengine.uix.space/'),
+      meta('og:url', 'https://dennisreimann.github.io/uiengine/'),
       meta('og:site_name', 'UIengine Documentation'),
       meta('og:description', 'The UIengine is a workbench for UI-driven development: A tool for developers and designers to build and document web sites and apps.'),
       meta('og:image:width', 1024),
       meta('og:image:height', 640),
-      meta('og:image', 'http://uiengine.uix.space/card.png'),
-      meta('og:image:secure_url', 'https://uiengine.uix.space/card.png'),
-      meta('twitter:image', 'https://uiengine.uix.space/card.png'),
+      meta('og:image', 'http://dennisreimann.github.io/uiengine/card.png'),
+      meta('og:image:secure_url', 'https://dennisreimann.github.io/uiengine/card.png'),
+      meta('twitter:image', 'https://dennisreimann.github.io/uiengine/card.png'),
       meta('twitter:card', 'summary_large_image'),
       meta('twitter:site', '@dennisreimann')
     ],
diff --git a/packages/cli/demo/pages/documentation/tokens/README.md b/packages/cli/demo/pages/documentation/tokens/README.md
index 13eee8ad4..77a38b7ae 100644
--- a/packages/cli/demo/pages/documentation/tokens/README.md
+++ b/packages/cli/demo/pages/documentation/tokens/README.md
@@ -1,3 +1,3 @@
 # Design Tokens
 
-See the [UIengine design token documentation](https://uiengine.uix.space/advanced/design-tokens/) for details.
+See the [UIengine design token documentation](https://dennisreimann.github.io/uiengine/advanced/design-tokens/) for details.
diff --git a/packages/cli/src/index.js b/packages/cli/src/index.js
index 49ddbe8cd..b077a94d4 100644
--- a/packages/cli/src/index.js
+++ b/packages/cli/src/index.js
@@ -27,5 +27,5 @@ module.exports = require('yargs')
   .alias('h', 'help')
   .version()
   .alias('v', 'version')
-  .epilogue('Documentation: https://uiengine.uix.space/')
+  .epilogue('Documentation: https://dennisreimann.github.io/uiengine/')
   .argv
diff --git a/packages/cli/src/templates/config.js b/packages/cli/src/templates/config.js
index 683d9f859..aef9c2443 100644
--- a/packages/cli/src/templates/config.js
+++ b/packages/cli/src/templates/config.js
@@ -3,7 +3,7 @@ module.exports = {
   // Project config: Defaults to name and version from package.json.
   // Here you can overwrite it and add more custom properties.
   // For a detailed documentation of all the options in here see
-  // https://uiengine.uix.space/basics/config/
+  // https://dennisreimann.github.io/uiengine/basics/config/
   name: '${values.name}',
 
   // Base directories for the input, your raw source files:
diff --git a/packages/cli/src/templates/initial_page_readme.js b/packages/cli/src/templates/initial_page_readme.js
index c7b543c3d..f7153497c 100644
--- a/packages/cli/src/templates/initial_page_readme.js
+++ b/packages/cli/src/templates/initial_page_readme.js
@@ -81,4 +81,4 @@ npx uiengine build --watch --serve
 \`\`\`
 
 Under the hood [BrowserSync](https://www.browsersync.io/) is used to provide serving and watching the files.
-For information on how to configure the server and pass additional options, see the [configuration documentation](https://uiengine.uix.space/basics/config/#BrowserSync).`
+For information on how to configure the server and pass additional options, see the [configuration documentation](https://dennisreimann.github.io/uiengine/basics/config/#BrowserSync).`