diff --git a/README.md b/README.md
index 14b458a..8506314 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 Object Introspection is a memory profiling technology for C++ objects. It provides the ability to dynamically instrument applications to capture the precise memory occupancy of entire object hierarchies including all containers and dynamic allocations. All this with no code modification or recompilation!
 
-For more information on the technology and how to get started applying it  to your applications please check out the [Object Introspection](https://facebookexperimental.github.io/object-introspection/) website.
+For more information on the technology and how to get started applying it  to your applications please check out the [Object Introspection](https://objectintrospection.org/) website.
 
 ## Join the Object Introspection community
 See the [CONTRIBUTING](CONTRIBUTING.md) file for how to help out.
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 7201208..251bd70 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -13,8 +13,8 @@
 const config = {
   title: 'Object Introspection',
   tagline: 'Dynamic C++ Object Profiling',
-  url: 'https://facebookexperimental.github.io',
-  baseUrl: '/object-introspection',
+  url: 'https://objectintrospection.org',
+  baseUrl: '/',
   onBrokenLinks: 'throw',
   onBrokenMarkdownLinks: 'warn',
   favicon: '/img/favicon.ico',
@@ -24,7 +24,7 @@ const config = {
   // If you aren't using GitHub pages, you don't need these.
   organizationName: 'facebookexperimental', // Usually your GitHub org/user name.
   projectName: 'object-introspection', // Usually your repo name.
-	deploymentBranch: 'web',
+	deploymentBranch: 'gh-pages',
 
   presets: [
     [
diff --git a/website/static/CNAME b/website/static/CNAME
new file mode 100644
index 0000000..7cd4d50
--- /dev/null
+++ b/website/static/CNAME
@@ -0,0 +1 @@
+objectintrospection.org