diff --git a/asf-site-src/data/htaccess.yml b/asf-site-src/data/htaccess.yml
index a201335..8f6bd03 100644
--- a/asf-site-src/data/htaccess.yml
+++ b/asf-site-src/data/htaccess.yml
@@ -17,4 +17,4 @@
   /latest.tgz: >
     https://www.apache.org/dyn/closer.cgi?action=download&filename=yetus/0.12.0/apache-yetus-0.12.0-bin.tar.gz
   /latest.tgz.asc: >
-    https://www.apache.org/dist/yetus/0.12.0/apache-yetus-0.12.0-bin.tar.gz.asc
+    https://downloads.apache.org/yetus/0.12.0/apache-yetus-0.12.0-bin.tar.gz.asc
diff --git a/asf-site-src/source/contribute/releases.html.md b/asf-site-src/source/contribute/releases.html.md
index 0faebbc..675b206 100644
--- a/asf-site-src/source/contribute/releases.html.md
+++ b/asf-site-src/source/contribute/releases.html.md
@@ -78,7 +78,7 @@
 
 ### Ensure Your Public Key is in KEYS
 
-Like many ASF projects, we provide a single file that downstream folks can use to verify our release artifacts. It's located in the project's distribution area <https://www.apache.org/dist/yetus>. You can read about this file in the [ASF guide to release signing](https://www.apache.org/dev/release-signing) section. If your public key is not already included in [the KEYS file](https://www.apache.org/dist/yetus/KEYS), you will need to add it. You can either follow the instructions in the previously mentioned guide or those at the top of the actual KEYS file. In any case, you will need to use Subversion to update the KEYS file in the project's distribution area. Note that this area is writable only by the project PMC. If you are not yet on the PMC, your last step should be providing a patch rather than committing.
+Like many ASF projects, we provide a single file that downstream folks can use to verify our release artifacts. It's located in the project's distribution area <https://downloads.apache.org/yetus>. You can read about this file in the [ASF guide to release signing](https://www.apache.org/dev/release-signing) section. If your public key is not already included in [the KEYS file](https://downloads.apache.org/yetus/KEYS), you will need to add it. You can either follow the instructions in the previously mentioned guide or those at the top of the actual KEYS file. In any case, you will need to use Subversion to update the KEYS file in the project's distribution area. Note that this area is writable only by the project PMC. If you are not yet on the PMC, your last step should be providing a patch rather than committing.
 
 Example commands:
 
@@ -262,7 +262,7 @@
         Source repository commit: 1e8f4588906a51317207092bd97b35687f2e3fa3
         Maven staging repository: https://repository.apache.org/content/repositories/orgapacheyetus-1011
 
-        Our KEYS file is at: https://www.apache.org/dist/yetus/KEYS
+        Our KEYS file is at: https://downloads.apache.org/yetus/KEYS
         All artifacts are signed with my key (DEADBEEF)
 
         JIRA version: https://s.apache.org/yetus-0.7.0-jira
@@ -319,7 +319,7 @@
 Lastly, if you haven't verified a release before, you'll need to download and import the public keys for the project's release managers. The public keys are located in the KEYS file that should have been mentioned in the [VOTE] thread announcement. The specific output of the following commands will vary depending on how many release managers there have been and which keys, if any, you have previously imported.
 
 ```bash
-$ curl --output KEYS.yetus --silent 'https://www.apache.org/dist/yetus/KEYS'
+$ curl --output KEYS.yetus --silent 'https://downloads.apache.org/yetus/KEYS'
 $ gpg --import KEYS.yetus
 gpg: key 0D80DB7C: "Sean Busbey (CODE SIGNING KEY) <busbey@apache.org>" not changed
 gpg: Total number processed: 1
@@ -622,19 +622,19 @@
 
         The relevant checksums files are available at:
 
-            https://www.apache.org/dist/yetus/0.7.0/apache-yetus-0.7.0-src.tar.gz.sha512
-            https://www.apache.org/dist/yetus/0.7.0/apache-yetus-0.7.0-src.tar.gz.mds
-            https://www.apache.org/dist/yetus/0.7.0/apache-yetus-0.7.0-bin.tar.gz.sha512
-            https://www.apache.org/dist/yetus/0.7.0/apache-yetus-0.7.0-bin.tar.gz.mds
+            https://downloads.apache.org/yetus/0.7.0/apache-yetus-0.7.0-src.tar.gz.sha512
+            https://downloads.apache.org/yetus/0.7.0/apache-yetus-0.7.0-src.tar.gz.mds
+            https://downloads.apache.org/yetus/0.7.0/apache-yetus-0.7.0-bin.tar.gz.sha512
+            https://downloads.apache.org/yetus/0.7.0/apache-yetus-0.7.0-bin.tar.gz.mds
 
         Project member signature keys can be found at
 
-           https://www.apache.org/dist/yetus/KEYS
+           https://downloads.apache.org/yetus/KEYS
 
         PGP signatures are available at:
 
-            https://www.apache.org/dist/yetus/0.7.0/apache-yetus-0.7.0-src.tar.gz.asc
-            https://www.apache.org/dist/yetus/0.7.0/apache-yetus-0.7.0-bin.tar.gz.asc
+            https://downloads.apache.org/yetus/0.7.0/apache-yetus-0.7.0-src.tar.gz.asc
+            https://downloads.apache.org/yetus/0.7.0/apache-yetus-0.7.0-bin.tar.gz.asc
 
         The list of changes included in this release and release notes can be browsed at:
 
diff --git a/asf-site-src/source/downloads.html.md.erb b/asf-site-src/source/downloads.html.md.erb
index d5b4380..02203ef 100644
--- a/asf-site-src/source/downloads.html.md.erb
+++ b/asf-site-src/source/downloads.html.md.erb
@@ -28,7 +28,7 @@
 The Apache Yetus project publishes a single source artifact per release for all of
 our components as well as a convenience artifact of binaries and documentation for immediate use. You
 should verify the integrity of these artifacts via [the ASF procedure](https://www.apache.org/info/verification.html)
-using the [KEYS file for our project](https://www.apache.org/dist/yetus/KEYS).
+using the [KEYS file for our project](https://downloads.apache.org/yetus/KEYS).
 
 In addition to the artifacts below, we publish convenience artifacts in some
 third-party repositories (e.g. Maven Central) and [Docker Hub](../yetus-docker-image).
@@ -40,11 +40,11 @@
     * [Release Notes](/documentation/<%= release %>/RELEASENOTES)
     * [CHANGELOG](/documentation/<%= release %>/CHANGELOG)
     <% if release =~ /^0\.[0-8]\./ %>
-      * Source : [yetus-<%= release %>-src.tar.gz](https://www.apache.org/dyn/closer.lua?path=/yetus/<%= release %>/yetus-<%= release %>-src.tar.gz) ([signature](https://www.apache.org/dist/yetus/<%= release %>/yetus-<%= release %>-src.tar.gz.asc), [hashes](https://www.apache.org/dist/yetus/<%= release %>/yetus-<%= release %>-src.tar.gz.mds))
-      * Binaries : [yetus-<%= release %>-bin.tar.gz](https://www.apache.org/dyn/closer.lua?path=/yetus/<%= release %>/yetus-<%= release %>-bin.tar.gz) ([signature](https://www.apache.org/dist/yetus/<%= release %>/yetus-<%= release %>-bin.tar.gz.asc), [hashes](https://www.apache.org/dist/yetus/<%= release %>/yetus-<%= release %>-bin.tar.gz.mds))
+      * Source : [yetus-<%= release %>-src.tar.gz](https://www.apache.org/dyn/closer.lua?path=/yetus/<%= release %>/yetus-<%= release %>-src.tar.gz) ([signature](https://downloads.apache.org/yetus/<%= release %>/yetus-<%= release %>-src.tar.gz.asc), [hashes](https://downloads.apache.org/yetus/<%= release %>/yetus-<%= release %>-src.tar.gz.mds))
+      * Binaries : [yetus-<%= release %>-bin.tar.gz](https://www.apache.org/dyn/closer.lua?path=/yetus/<%= release %>/yetus-<%= release %>-bin.tar.gz) ([signature](https://downloads.apache.org/yetus/<%= release %>/yetus-<%= release %>-bin.tar.gz.asc), [hashes](https://downloads.apache.org/yetus/<%= release %>/yetus-<%= release %>-bin.tar.gz.mds))
     <% else %>
-      * Source : [apache-yetus-<%= release %>-src.tar.gz](https://www.apache.org/dyn/closer.lua?path=/yetus/<%= release %>/apache-yetus-<%= release %>-src.tar.gz) ([signature](https://www.apache.org/dist/yetus/<%= release %>/apache-yetus-<%= release %>-src.tar.gz.asc), [hashes](https://www.apache.org/dist/yetus/<%= release %>/apache-yetus-<%= release %>-src.tar.gz.mds))
-      * Binaries : [apache-yetus-<%= release %>-bin.tar.gz](https://www.apache.org/dyn/closer.lua?path=/yetus/<%= release %>/apache-yetus-<%= release %>-bin.tar.gz) ([signature](https://www.apache.org/dist/yetus/<%= release %>/apache-yetus-<%= release %>-bin.tar.gz.asc), [hashes](https://www.apache.org/dist/yetus/<%= release %>/apache-yetus-<%= release %>-bin.tar.gz.mds))
+      * Source : [apache-yetus-<%= release %>-src.tar.gz](https://www.apache.org/dyn/closer.lua?path=/yetus/<%= release %>/apache-yetus-<%= release %>-src.tar.gz) ([signature](https://downloads.apache.org/yetus/<%= release %>/apache-yetus-<%= release %>-src.tar.gz.asc), [hashes](https://downloads.apache.org/yetus/<%= release %>/apache-yetus-<%= release %>-src.tar.gz.mds))
+      * Binaries : [apache-yetus-<%= release %>-bin.tar.gz](https://www.apache.org/dyn/closer.lua?path=/yetus/<%= release %>/apache-yetus-<%= release %>-bin.tar.gz) ([signature](https://downloads.apache.org/yetus/<%= release %>/apache-yetus-<%= release %>-bin.tar.gz.asc), [hashes](https://downloads.apache.org/yetus/<%= release %>/apache-yetus-<%= release %>-bin.tar.gz.mds))
     <% end %>
 <%   end
    end %>
diff --git a/yetus-dl.sh b/yetus-dl.sh
index 0da447d..ba36903 100755
--- a/yetus-dl.sh
+++ b/yetus-dl.sh
@@ -17,7 +17,7 @@
 
 EXTRACTDIR="${1:-/tmp/yetus}"
 VERSION=${2:-latest}
-KEYSURL="https://www.apache.org/dist/yetus"
+KEYSURL="https://downloads.apache.org/yetus"
 if [ "${VERSION}" != "latest" ]; then
   BASEURL="https://www.apache.org/dyn/closer.cgi?action=download&filename=yetus/${VERSION}"
   YETUSTGZ="apache-yetus-${VERSION}-bin.tar.gz"