Uses proper links to nightlies
diff --git a/source/builds.md b/source/builds.md
index db63422..8225bd1 100644
--- a/source/builds.md
+++ b/source/builds.md
@@ -67,7 +67,7 @@
 ## NightlyBuilds
 
 As part of our continuous integration practice, we also make available each morning the
-[latest stable development build.](https://repository.apache.org/content/repositories/snapshots/org/apache/struts/struts2-assembly/)
+[latest stable development build.](https://nightlies.apache.org/x1/dist/struts/)
 
 *Again: Use at your own risk!*
 
@@ -80,14 +80,14 @@
 ## Test Builds
             
 As we prepare for a new release, the project group may create interim *test builds*. When test builds are available,
-we post them [here](http://people.apache.org/builds/struts/) in binary, source and library distributions.
+we post them [here](https://dist.apache.org/repos/dist/dev/struts/) in binary, source and library distributions.
 Library distributions include any external dependencies needed to use a product with your application.
 
 A test build is made available so that it can be reviewed for quality by the Apache Struts development group.
 When a build is judged "ready for prime time", it is promoted to "General Availability" status and may be
 made the "Best Available" release. If the group feels that a build requires more testing, then it may be marked
 as "Beta" release. When a test build is upgraded to "Beta" or "GA" by a vote of the project members,
-we make the distribution available as a formal [release.](releases.html)
+we make the distribution available as a formal [release](releases.html).
 
 ## Maven Snapshots
 
diff --git a/source/updating-website.md b/source/updating-website.md
index dc707b9..9823757 100644
--- a/source/updating-website.md
+++ b/source/updating-website.md
@@ -25,7 +25,7 @@
 The whole build of the website is orchestrated by [.asf.yaml](http://s.apache.org/asfyaml), please refer to the docs
 for more details. The main build of the website is performed by [a buildbot job](https://ci2.apache.org/#/builders/7),
 the staging site is build and deployed by 
-[a Jenkins job](https://ci-builds.apache.org/job/Struts/job/Struts-staged-site/) - buildbot doesn't support staging site deployment yet.  
+[a Jenkins job](https://builds.apache.org/job/Struts/job/Struts-staged-site/) - buildbot doesn't support staging site deployment yet.  
 
 ## Applying a change
 
@@ -36,7 +36,7 @@
 
 ## Deploying JavaDocs
 
-There is a dedicated [Jenkins job](https://ci-builds.apache.org/job/Struts/job/Struts-site-javadocs/) which is
+There is a dedicated [Jenkins job](https://builds.apache.org/job/Struts/job/Struts-site-javadocs/) which is
 used to update the JavaDocs based on the latest release. If you have a proper privileges you can start the job
 and provide a Git tag of the latest release, eg. `STRUTS_2_5_22`. Based on the tag, Jenkins will generate a proper
 JavaDocs and deploy them directly into the website. You can verify them by using this [link](https://struts.staged.apache.org/maven/struts2-core/apidocs/index.html).