diff --git a/README.md b/README.md
index 73cf55bd..fcbfdd3b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <h1 align="center">Tech Interview Handbook</h1>
 
 <div align="center">
-  <a href="https://yangshun.github.io/tech-interview-handbook/">
+  <a href="https://techinterviewhandbook.org/">
     <img src="website/static/img/logo.svg" alt="Tech Interview Handbook" width="400">
   </a>
   <br>
@@ -13,7 +13,7 @@
     <em>Credits: <a href="https://dribbble.com/shots/3831443-Tech-Interview-Handbook">Illustration</a> by <a href="https://dribbble.com/leftaligned">@leftaligned</a></em>
   </p>
   <h3>
-    <a href="https://yangshun.github.io/tech-interview-handbook/">Read on the website</a>
+    <a href="https://techinterviewhandbook.org/">Read on the website</a>
   </h3>
 </div>
 
@@ -29,14 +29,14 @@
 
 Carefully curated content to help you ace your next technical interview, with a focus on algorithms. System design questions are in-progress. Besides the usual algorithm questions, other **awesome** stuff includes:
 
-- [How to prepare](https://yangshun.github.io/tech-interview-handbook/coding-round-overview) for coding interviews
-- [Interview Cheatsheet](https://yangshun.github.io/tech-interview-handbook/cheatsheet) - Straight-to-the-point Do's and Don'ts
-- [Algorithm tips and the best practice questions](https://yangshun.github.io/tech-interview-handbook/algorithms/algorithms-introduction) categorized by topic
+- [How to prepare](https://techinterviewhandbook.org/coding-round-overview) for coding interviews
+- [Interview Cheatsheet](https://techinterviewhandbook.org/cheatsheet) - Straight-to-the-point Do's and Don'ts
+- [Algorithm tips and the best practice questions](https://techinterviewhandbook.org/algorithms/algorithms-introduction) categorized by topic
 - ["Front-end Job Interview Questions" answers](https://github.com/yangshun/front-end-interview-handbook)
-- [Interview formats](https://yangshun.github.io/tech-interview-handbook/interview-formats) of the top tech companies
-- [Behavioral questions](https://yangshun.github.io/tech-interview-handbook/behavioral-questions) asked by the top tech companies
-- [Good questions to ask your interviewers](https://yangshun.github.io/tech-interview-handbook/questions-to-ask) at the end of the interviews
-- [Helpful resume tips](https://yangshun.github.io/tech-interview-handbook/resume) to get your resume noticed and the Do's and Don'ts
+- [Interview formats](https://techinterviewhandbook.org/interview-formats) of the top tech companies
+- [Behavioral questions](https://techinterviewhandbook.org/behavioral-questions) asked by the top tech companies
+- [Good questions to ask your interviewers](https://techinterviewhandbook.org/questions-to-ask) at the end of the interviews
+- [Helpful resume tips](https://techinterviewhandbook.org/resume) to get your resume noticed and the Do's and Don'ts
 
 Help from you in contributing content would be very much appreciated!
 
@@ -68,7 +68,7 @@ Front end-related content have been extracted out into a separate repository - [
 
 ## Contents
 
-A [Docusaurus](https://github.com/facebook/docusaurus) website has been created to provide a better reading experience. Check out the website [here](https://yangshun.github.io/tech-interview-handbook/)!
+A [Docusaurus](https://github.com/facebook/docusaurus) website has been created to provide a better reading experience. Check out the website [here](https://techinterviewhandbook.org/)!
 
 ## Related
 
diff --git a/algorithms/README.md b/algorithms/README.md
index 758ea24f..adf5c83f 100644
--- a/algorithms/README.md
+++ b/algorithms/README.md
@@ -1,5 +1,5 @@
 # Algorithms
 
-The contents have been moved to the [website](https://yangshun.github.io/tech-interview-handbook/algorithms/algorithms-introduction).
+The contents have been moved to the [website](https://techinterviewhandbook.org/algorithms/algorithms-introduction).
 
 <!-- TODO: Remove in future -->
diff --git a/preparing/README.md b/preparing/README.md
index 0e00ec22..ff2093fa 100644
--- a/preparing/README.md
+++ b/preparing/README.md
@@ -1,5 +1,5 @@
 # Preparing
 
-The contents have been moved to the [website](https://yangshun.github.io/tech-interview-handbook/coding-round-overview).
+The contents have been moved to the [website](https://techinterviewhandbook.org/coding-round-overview).
 
 <!-- TODO: Remove in future -->
diff --git a/preparing/cheatsheet.md b/preparing/cheatsheet.md
index a9d0d5e3..83747724 100644
--- a/preparing/cheatsheet.md
+++ b/preparing/cheatsheet.md
@@ -1,5 +1,5 @@
 # Cheatsheet
 
-The contents have been moved to the [website](https://yangshun.github.io/tech-interview-handbook/cheatsheet).
+The contents have been moved to the [website](https://techinterviewhandbook.org/cheatsheet).
 
 <!-- TODO: Remove in future -->
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 0e95fd7b..cc37d6dc 100755
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -2,8 +2,8 @@ module.exports = {
   title: 'Tech Interview Handbook',
   tagline:
     'Carefully curated content to help you ace your next technical interview',
-  url: 'https://yangshun.github.io',
-  baseUrl: '/tech-interview-handbook/',
+  url: 'https://techinterviewhandbook.org',
+  baseUrl: '/',
   favicon: 'img/favicon.png',
   organizationName: 'yangshun',
   projectName: 'tech-interview-handbook',
diff --git a/website/static/CNAME b/website/static/CNAME
new file mode 100644
index 00000000..feaeb520
--- /dev/null
+++ b/website/static/CNAME
@@ -0,0 +1 @@
+techinterviewhandbook.org
\ No newline at end of file