diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 2ba42577c..8fadfd144 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,7 +10,7 @@ assignees: ''
 **Library version**
 Which version of the library that you use, eg: v0.7.35 or v2.0.0-alpha.3
 
-For the issue related with detection result, you can use the demo section in https://uaparser.js.org to confirm
+For the issue related with detection result, you can use the demo section in https://uaparser.dev to confirm
 
 **Describe the bug**
 A clear and concise description of what the bug is.
diff --git a/README.md b/README.md
index 72cb670b1..57e0473bf 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-    <a href="https://uaparser.js.org"><img src="https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/uap-header.png"></a>
+    <a href="https://uaparser.dev"><img src="https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/uap-header.png"></a>
 </p>
 
 <p align="center">
@@ -88,12 +88,12 @@ console.log(parser.getResult());
 // Phew! Thanks, UAParser.js!
 ```
 
-  * Live demo: https://uaparser.js.org/
+  * Live demo: https://uaparser.dev
 
 # Documentation
 
   * v1.0: https://github.com/faisalman/ua-parser-js/tree/1.0.38#documentation
-  * v2.0: https://docs.uaparser.js.org/v2 
+  * v2.0: https://docs.uaparser.dev
 
 Before upgrading from `v0.7` / `v1.0`, please read [CHANGELOG](CHANGELOG.md) to 
 see what's new & breaking.
diff --git a/package.json b/package.json
index 704d4dfed..618a794d8 100755
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "os-detection",
     "bot-detection"
   ],
-  "homepage": "https://github.com/faisalman/ua-parser-js",
+  "homepage": "https://uaparser.dev",
   "contributors": [
     "Aamir Poonawalla <aamir@urx.com>",
     "Admas <mollases@users.noreply.github.com>",
@@ -237,7 +237,7 @@
     "test": "test"
   },
   "bugs": "https://github.com/faisalman/ua-parser-js/issues",
-  "demo": "https://uaparser.js.org",
+  "demo": "https://uaparser.dev",
   "download": "https://raw.github.com/faisalman/ua-parser-js/master/dist/ua-parser.pack.js",
   "funding": [
     {
diff --git a/src/main/ua-parser.js b/src/main/ua-parser.js
index c80286666..c7034f6e5 100755
--- a/src/main/ua-parser.js
+++ b/src/main/ua-parser.js
@@ -4,7 +4,7 @@
    AGPLv3 License *//*
    Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data.
    Supports browser & node.js environment. 
-   Demo   : https://faisalman.github.io/ua-parser-js
+   Demo   : https://uaparser.dev
    Source : https://github.com/faisalman/ua-parser-js */
 /////////////////////////////////////////////////////////////////////////////////