diff --git a/website/blog/OneTable-is-now-Apache-XTable.md b/website/blog/OneTable-is-now-Apache-XTable.md
index cdf4c252..2ebedf77 100644
--- a/website/blog/OneTable-is-now-Apache-XTable.md
+++ b/website/blog/OneTable-is-now-Apache-XTable.md
@@ -54,7 +54,7 @@ the public good.
marginRight:'auto', marginTop:'18pt', marginBottom:'18pt'}} />
For those interested in exploring Apache XTable™, the official website is a good starting point. The documentation
-section hosts a great hands-on [quickstart](https://onetable.dev/docs/how-to) guide to getting acquainted with XTable,
+section hosts a great hands-on [quickstart](https://xtable.apache.org/docs/how-to) guide to getting acquainted with XTable,
providing a straightforward way to experience its interoperability capabilities firsthand. If you have specific ideas,
questions, or seek direct interaction, the [discussions](https://github.com/apache/incubator-xtable/discussions) section
is available for more in-depth exchanges. We invite you to contribute to the project by submitting pull requests or
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 8edfec1e..aa9cd2cf 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -8,12 +8,12 @@ const darkCodeTheme = require('prism-react-renderer/themes/dracula');
const config = {
title: 'Apache XTable™ (Incubating)',
favicon: 'images/xtable-favicon.png',
- url: 'https://onetable.dev',
+ url: 'https://xtable.apache.org',
baseUrl: '/',
// GitHub pages deployment config.
- organizationName: 'onetable-io',
- projectName: 'onetable',
+ organizationName: 'apache',
+ projectName: 'incubator-xtable',
onBrokenLinks: 'ignore',
onBrokenMarkdownLinks: 'warn',
diff --git a/website/static/CNAME b/website/static/CNAME
index d410b0d6..bc2832e6 100644
--- a/website/static/CNAME
+++ b/website/static/CNAME
@@ -1 +1 @@
-onetable.dev
\ No newline at end of file
+xtable.apache.org
\ No newline at end of file
diff --git a/website/static/index.html b/website/static/index.html
index cdf744f3..90f0820b 100644
--- a/website/static/index.html
+++ b/website/static/index.html
@@ -32,8 +32,8 @@