diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 334f82c..834b95d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,6 +9,6 @@
 - First verify your changes by running `bundle exec jekyll serve -w`.
 - For most webpage changes, please submit pull requests to this repository based off the "src" branch.
 - For any documentation changes (in the "docs" folder), please submit pull requests to the [main Druid
-  repo](https://github.com/apache/incubator-druid-website-src). All Druid
+  repo](https://github.com/apache/druid-website-src). All Druid
   documentation is hosted under
-  [https://github.com/apache/incubator-druid/tree/master/docs/content](https://github.com/apache/incubator-druid/tree/master/docs/content).
+  [https://github.com/apache/druid/tree/master/docs/content](https://github.com/apache/druid/tree/master/docs/content).
diff --git a/README.md b/README.md
index d1cfba4..0c89b51 100644
--- a/README.md
+++ b/README.md
@@ -25,5 +25,5 @@
 
 ## Contributing
 
-See [CONTRIBUTING.md](https://github.com/apache/incubator-druid-website-src/blob/master/CONTRIBUTING.md).
+See [CONTRIBUTING.md](https://github.com/apache/druid-website-src/blob/master/CONTRIBUTING.md).
 
diff --git a/downloads.md b/downloads.md
index 7e83234..9e083cc 100644
--- a/downloads.md
+++ b/downloads.md
@@ -12,17 +12,17 @@
 The latest Apache Druid stable release is {{ release.version }}.
 
 <p>
-<a class="large-button download" href="https://www.apache.org/dyn/closer.cgi?path=/incubator/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz" download onclick="trackDownload('button', 'https://www.apache.org/dyn/closer.cgi?path=/incubator/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz');"><span class="fa fa-download"></span> Download {{release.version}} release</a><br>
+<a class="large-button download" href="https://www.apache.org/dyn/closer.cgi?path=/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz" download onclick="trackDownload('button', 'https://www.apache.org/dyn/closer.cgi?path=/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz');"><span class="fa fa-download"></span> Download {{release.version}} release</a><br>
 </p>
 
 * Release date: {{ release.date | date: "%b %e %Y" }}
-* Binary download: [apache-druid-{{ release.version }}-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/incubator/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz) ([sha512](https://www.apache.org/dist/incubator/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz.sha512), [pgp](https://www.apache.org/dist/incubator/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz.asc))
-* Source download: [apache-druid-{{ release.version }}-src.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/incubator/druid/{{ release.version }}/apache-druid-{{ release.version }}-src.tar.gz) ([sha512](https://www.apache.org/dist/incubator/druid/{{ release.version }}/apache-druid-{{ release.version }}-src.tar.gz.sha512), [pgp](https://www.apache.org/dist/incubator/druid/{{ release.version }}/apache-druid-{{ release.version }}-src.tar.gz.asc))
-* Release notes: [{{ release.version }}](https://github.com/apache/incubator-druid/releases/tag/druid-{{ release.version }})
+* Binary download: [apache-druid-{{ release.version }}-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz) ([sha512](https://www.apache.org/dist/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz.sha512), [pgp](https://www.apache.org/dist/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz.asc))
+* Source download: [apache-druid-{{ release.version }}-src.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/druid/{{ release.version }}/apache-druid-{{ release.version }}-src.tar.gz) ([sha512](https://www.apache.org/dist/druid/{{ release.version }}/apache-druid-{{ release.version }}-src.tar.gz.sha512), [pgp](https://www.apache.org/dist/druid/{{ release.version }}/apache-druid-{{ release.version }}-src.tar.gz.asc))
+* Release notes: [{{ release.version }}](https://github.com/apache/druid/releases/tag/druid-{{ release.version }})
 {% endfor %}
 {% endfor %}
 
-You should verify your download by following these [procedures](https://www.apache.org/info/verification.html) and using these [KEYS](https://www.apache.org/dist/incubator/druid/KEYS).
+You should verify your download by following these [procedures](https://www.apache.org/info/verification.html) and using these [KEYS](https://www.apache.org/dist/druid/KEYS).
 
 To learn more about releases, please visit the [versioning page](/docs/latest/development/versioning.html).
 
@@ -54,10 +54,13 @@
 ##### {{ release.version }}
 
 * Release date: {{ release.date | date: "%b %e %Y" }}
-* Binary download: [apache-druid-{{ release.version }}-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/incubator/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz) ([sha512](https://www.apache.org/dist/incubator/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz.sha512), [pgp](https://www.apache.org/dist/incubator/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz.asc))
-* Source download: [apache-druid-{{ release.version }}-src.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/incubator/druid/{{ release.version }}/apache-druid-{{ release.version }}-src.tar.gz) ([sha512](https://www.apache.org/dist/incubator/druid/{{ release.version }}/apache-druid-{{ release.version }}-src.tar.gz.sha512), [pgp](https://www.apache.org/dist/incubator/druid/{{ release.version }}/apache-druid-{{ release.version }}-src.tar.gz.asc))
-* Release notes: [{{ release.version }}](https://github.com/apache/incubator-druid/releases/tag/druid-{{ release.version }})
+* Binary download: [apache-druid-{{ release.version }}-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz) ([sha512](https://www.apache.org/dist/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz.sha512), [pgp](https://www.apache.org/dist/druid/{{ release.version }}/apache-druid-{{ release.version }}-bin.tar.gz.asc))
+* Source download: [apache-druid-{{ release.version }}-src.tar.gz](https://www.apache.org/dyn/closer.cgi?path=/druid/{{ release.version }}/apache-druid-{{ release.version }}-src.tar.gz) ([sha512](https://www.apache.org/dist/druid/{{ release.version }}/apache-druid-{{ release.version }}-src.tar.gz.sha512), [pgp](https://www.apache.org/dist/druid/{{ release.version }}/apache-druid-{{ release.version }}-src.tar.gz.asc))
+* Release notes: [{{ release.version }}](https://github.com/apache/druid/releases/tag/druid-{{ release.version }})
 {% endfor %}
 {% endfor %}
 
-All other releases of Apache Druid are available at the [Apache release archives](https://archive.apache.org/dist/incubator/druid/).
+All other releases of Apache Druid are available at the [Apache Druid release archives](https://archive.apache.org/dist/druid/).
+
+Archived versions of releases made while Druid was under the Apache Incubator are available at [Apache Druid (incubating) release archives](https://archive.apache.org/dist/incubator/druid/).
+
diff --git a/druid-powered.md b/druid-powered.md
index 65853ee..6ae8522 100644
--- a/druid-powered.md
+++ b/druid-powered.md
@@ -1,6 +1,6 @@
 ---
 title: Powered by Apache Druid
-subtitle: <a href="https://github.com/apache/incubator-druid-website-src/blob/master/druid-powered.md"><span class="fa fa-plus"></span> Add Your Company</a>
+subtitle: <a href="https://github.com/apache/druid-website-src/blob/master/druid-powered.md"><span class="fa fa-plus"></span> Add Your Company</a>
 layout: simple_page
 sectionid: powered-by
 canonical: 'https://druid.apache.org/druid-powered'
@@ -558,4 +558,4 @@
 
 [Zuoyebang](http://www.zuoyebang.com/) is the most used K12 education platform, 7 out of every 10 K12 users are using Zuoyebang. At Zuoyebang Data Platform Group, we use the Druid in the advertising scene,  mainly related to advertising display, click, billing, and other functions. The performance and timeliness of druid can meet our OLAP queries very well.
 
-[Add Your Company](https://github.com/apache/incubator-druid-website-src/blob/master/druid-powered.md)
+[Add Your Company](https://github.com/apache/druid-website-src/blob/master/druid-powered.md)
diff --git a/index.html b/index.html
index 3f48cbb..c54266d 100644
--- a/index.html
+++ b/index.html
@@ -14,7 +14,7 @@
     <div class="text-center">
     <p class="lead">Apache Druid is a high performance real-time analytics database.</p>
     <p><a class="button" href="/downloads.html"><span class="fa fa-download"></span> Download</a>
-    <a class="button" href="https://github.com/apache/incubator-druid/"><span class="fab fa-github"></span> GitHub</a></p>
+    <a class="button" href="https://github.com/apache/druid/"><span class="fab fa-github"></span> GitHub</a></p>
   </div>
   </div>
   </div>
diff --git a/libraries.md b/libraries.md
index db5c21a..3fc03ff 100644
--- a/libraries.md
+++ b/libraries.md
@@ -92,4 +92,4 @@
 -----------------
 
 If you've written software that uses Druid and want it included on this page,
-[edit it on GitHub](https://github.com/apache/incubator-druid-website-src/blob/master/libraries.md) to create a pull request!
+[edit it on GitHub](https://github.com/apache/druid-website-src/blob/master/libraries.md) to create a pull request!
diff --git a/licensing.md b/licensing.md
index 86ef571..0ba34a5 100644
--- a/licensing.md
+++ b/licensing.md
@@ -32,5 +32,5 @@
 - Joda Time
 - Ning Compress
 
-See the [NOTICE file](https://github.com/apache/incubator-druid/blob/master/NOTICE)
+See the [NOTICE file](https://github.com/apache/druid/blob/master/NOTICE)
 for other software included as part of Druid.
diff --git a/package.json b/package.json
index 0ae0182..b9304f5 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "start": "bundle exec jekyll serve --future --port 4001 --safe",
     "watch": "gulp watch",
     "compile": "gulp all; bundle exec jekyll build",
-    "build": "npm run compile && rm -r ../incubator-druid-website/* && cp -r ./_site/* ../incubator-druid-website/",
+    "build": "npm run compile && rm -r ../druid-website/* && cp -r ./_site/* ../druid-website/",
     "build-release": "./release.sh"
   },
   "dependencies": {
diff --git a/release.sh b/release.sh
index 01a97df..95fa7fe 100755
--- a/release.sh
+++ b/release.sh
@@ -30,8 +30,8 @@
 rm -rf _staging/
 mkdir -p _staging/
 cd _staging/
-git clone git@github.com:apache/incubator-druid.git
-cd incubator-druid/
+git clone git@github.com:apache/druid.git
+cd druid/
 
 if [ "$#" -gt 1 ]; then
   git checkout $2
@@ -48,6 +48,6 @@
 echo "Building Website..."
 npm run build
 pushd $(pwd)
-cd ../incubator-druid-website/
+cd ../druid-website/
 git add .
 popd