diff --git a/README.md b/README.md
index 52cdf25f..6ca6be00 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ const shuffleInstance = new Shuffle(document.getElementById('grid'), {
 
 This project was inspired by [Isotope](http://isotope.metafizzy.co/) and [Packery](http://packery.metafizzy.co/).
 
-[homepage]: https://vestride.github.io/Shuffle/
+[homepage]: https://shuffle.js.org
 [actions-img]: https://github.com/Vestride/Shuffle/actions/workflows/build.yml/badge.svg?branch=main
 [npm-url]: https://www.npmjs.com/package/shufflejs
 [npm-img]: https://img.shields.io/npm/v/shufflejs.svg
diff --git a/apps/website/docusaurus.config.ts b/apps/website/docusaurus.config.ts
index 73ca477b..601b7ccf 100644
--- a/apps/website/docusaurus.config.ts
+++ b/apps/website/docusaurus.config.ts
@@ -7,8 +7,8 @@ const { github: lightCodeTheme, dracula: darkCodeTheme } = themes;
 export default {
   title: 'Shuffle.js',
   tagline: 'Categorize, sort, and filter a responsive grid of items',
-  url: 'https://vestride.github.io/',
-  baseUrl: '/Shuffle/',
+  url: 'https://shuffle.js.org/',
+  baseUrl: '/',
   onBrokenLinks: 'throw',
   onBrokenMarkdownLinks: 'warn',
   favicon: 'img/favicon.png',
diff --git a/apps/website/static/CNAME b/apps/website/static/CNAME
new file mode 100644
index 00000000..10ef7e1d
--- /dev/null
+++ b/apps/website/static/CNAME
@@ -0,0 +1 @@
+shuffle.js.org
diff --git a/packages/shuffle/README.md b/packages/shuffle/README.md
index 52cdf25f..6ca6be00 100644
--- a/packages/shuffle/README.md
+++ b/packages/shuffle/README.md
@@ -25,7 +25,7 @@ const shuffleInstance = new Shuffle(document.getElementById('grid'), {
 
 This project was inspired by [Isotope](http://isotope.metafizzy.co/) and [Packery](http://packery.metafizzy.co/).
 
-[homepage]: https://vestride.github.io/Shuffle/
+[homepage]: https://shuffle.js.org
 [actions-img]: https://github.com/Vestride/Shuffle/actions/workflows/build.yml/badge.svg?branch=main
 [npm-url]: https://www.npmjs.com/package/shufflejs
 [npm-img]: https://img.shields.io/npm/v/shufflejs.svg