diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43f9cdcb4f..1f769a5967 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - `addPeerToAddressBook` is now async.
+- API Docs moved to https://js.waku.org/
 
 ## [0.26.0] - 2022-09-08
 
diff --git a/README.md b/README.md
index 74c9a25a82..71204ea7c0 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ A JavaScript implementation of the [Waku v2 protocol](https://rfc.vac.dev/spec/1
 
 - [Quick start](https://docs.wakuconnect.dev/docs/quick_start/)
 - [Full documentation](https://docs.wakuconnect.dev/)
-- [API documentation (`master` branch)](https://js-waku.wakuconnect.dev/)
+- [API documentation (`master` branch)](https://js.waku.org/)
 - [Waku Connect](https://wakuconnect.dev/)
 - [Waku](https://wakunetwork.com/)
 - [Vac](https://vac.dev/)
diff --git a/ci/README.md b/ci/README.md
index 3a085eb572..0be7205fa7 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -5,7 +5,7 @@ Configuration of CI builds executed under a Jenkins instance at https://ci.statu
 # Website
 
 The `Jenkinsfile.gh-pages` file builds the documentation site with this job:
-https://ci.status.im/job/website/job/js-waku.wakuconnect.dev/
+https://ci.infra.status.im/job/website/job/js.waku.org/
 
 And deploys it via `gh-pages` branch and [GitHub Pages](https://pages.github.com/) to:
-https://js-waku.wakuconnect.dev/
+https://js.waku.org/
diff --git a/ci/deploy.js b/ci/deploy.js
index dc8c077c3b..e8672c0a15 100644
--- a/ci/deploy.js
+++ b/ci/deploy.js
@@ -1,15 +1,16 @@
-const { promisify } = require('util')
-const { publish } = require('gh-pages')
-const ghpublish = promisify(publish)
+import { promisify } from 'util'
+import { publish } from 'gh-pages'
 
 /* fix for "Unhandled promise rejections" */
 process.on('unhandledRejection', err => { throw err })
 
+const ghpublish = promisify(publish)
+
 const Args = process.argv.slice(2)
 const USE_HTTPS = Args[0] && Args[0].toUpperCase() === 'HTTPS'
 
 const branch = 'gh-pages'
-const org = 'status-im'
+const org = 'waku-org'
 const repo = 'js-waku'
 /* use SSH auth by default */
 let repoUrl = USE_HTTPS
diff --git a/package.json b/package.json
index 2fc3f7f4cf..34c8e3c03a 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "watch:test": "mocha --watch",
     "doc": "run-s doc:*",
     "doc:html": "typedoc --treatWarningsAsErrors",
-    "doc:cname": "echo 'js-waku.wakuconnect.dev' > build/docs/CNAME",
+    "doc:cname": "echo 'js.waku.org' > build/docs/CNAME",
     "prepublish": "npm run build",
     "deploy": "node ci/deploy.js",
     "reset-hard": "git clean -dfx -e .idea && git reset --hard && npm i && npm run build"