diff --git a/README.md b/README.md
index bfba5284c4..d6e9289fd0 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Wagtail is an open source content management system built on Django, with a stro
 * Scales to millions of pages and thousands of editors
 * Fast out of the box, cache-friendly when you need it
 * Content API for 'headless' sites with de-coupled front-end
-* Runs on a Raspberry Pi or a multi-datacenter cloud platform 
+* Runs on a Raspberry Pi or a multi-datacenter cloud platform
 * StreamField encourages flexible content without compromising structure
 * Powerful, integrated search, using Elasticsearch or PostgreSQL
 * Excellent support for images and embedded content
@@ -70,7 +70,7 @@ There is an active community of Wagtail users and developers responding to quest
 
 For topics and discussions that do not fit Stack Overflow's question and answer format, we have a [Slack workspace](https://github.com/wagtail/wagtail/wiki/Slack) and a [Wagtail Support mailing list](https://groups.google.com/forum/#!forum/wagtail). Please respect the time and effort of volunteers by not asking the same question in multiple places.
 
-Our [Github discussion boards](https://github.com/wagtail/wagtail/discussions) are open for sharing ideas and plans for the Wagtail project. 
+Our [Github discussion boards](https://github.com/wagtail/wagtail/discussions) are open for sharing ideas and plans for the Wagtail project.
 
 We maintain a curated list of third party packages, articles and other resources at [Awesome Wagtail](https://github.com/springload/awesome-wagtail).
 
@@ -90,7 +90,7 @@ Feature releases of Wagtail are released every three months. Selected releases a
 
 #### Nightly releases
 
-To try out the latest features before a release, we also create builds from `main` every night. You can find instructions on how to install the latest nightly release at https://releases.wagtail.io/nightly/index.html
+To try out the latest features before a release, we also create builds from `main` every night. You can find instructions on how to install the latest nightly release at https://releases.wagtail.org/nightly/index.html
 
 ### Contributing
 
@@ -118,7 +118,7 @@ We thank the following organisations for their services used in Wagtail's develo
 
 [![Build Status](https://github.com/wagtail/wagtail/workflows/Wagtail%20CI/badge.svg)](https://github.com/wagtail/wagtail/actions)
 [![License](https://img.shields.io/badge/license-BSD-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
-[![Version](https://img.shields.io/pypi/v/wagtail.svg)](https://pypi.python.org/pypi/wagtail/) 
+[![Version](https://img.shields.io/pypi/v/wagtail.svg)](https://pypi.python.org/pypi/wagtail/)
 [![Total alerts](https://img.shields.io/lgtm/alerts/g/wagtail/wagtail.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/wagtail/wagtail/alerts/)
 [![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/wagtail/wagtail.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/wagtail/wagtail/context:python)
 [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/wagtail/wagtail.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/wagtail/wagtail/context:javascript)
diff --git a/client/src/components/UpgradeNotification/index.js b/client/src/components/UpgradeNotification/index.js
index 34f2d5f7e2..7b46371a58 100644
--- a/client/src/components/UpgradeNotification/index.js
+++ b/client/src/components/UpgradeNotification/index.js
@@ -14,7 +14,7 @@ const initUpgradeNotification = () => {
   *       "url" : "https://wagtail.io"  // Absolute URL to page/file containing release notes or actual package. It's up to you.
   *   }
   */
-  const releasesUrl = 'https://releases.wagtail.io/latest.txt';
+  const releasesUrl = 'https://releases.wagtail.org/latest.txt';
   const currentVersion = container.dataset.wagtailVersion;
 
   fetch(releasesUrl).then(response => {
diff --git a/scripts/latest.sh b/scripts/latest.sh
index 193775f1c6..fb210ea777 100755
--- a/scripts/latest.sh
+++ b/scripts/latest.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # vim:sw=4 ts=4 et:
 
-BUCKET=releases.wagtail.io
+BUCKET=releases.wagtail.org
 REGION=eu-west-1
 CF_DISTRIBUTION=E283SZ5CB4MDM0
 
@@ -107,7 +107,7 @@ elif [ "$1" = "edit" -o "$1" = "vi" ]; then
     if ! _get "${LTMP}"; then
         exit 1
     fi
-    
+
     cp "${LTMP}" "${LTMP2}"
 
     if [ ! -z "${VISUAL}" ]; then
diff --git a/scripts/nightly/upload.py b/scripts/nightly/upload.py
index 42c2c43318..cd59faa858 100644
--- a/scripts/nightly/upload.py
+++ b/scripts/nightly/upload.py
@@ -15,13 +15,13 @@ except StopIteration:
 
 print("Uploading", f.name)
 s3 = boto3.client('s3')
-s3.upload_file(str(f), 'releases.wagtail.io', 'nightly/dist/' + f.name, ExtraArgs={'ACL': 'public-read'})
+s3.upload_file(str(f), 'releases.wagtail.org', 'nightly/dist/' + f.name, ExtraArgs={'ACL': 'public-read'})
 
 print("Updating latest.json")
 
-boto3.resource('s3').Object('releases.wagtail.io', 'nightly/latest.json').put(
+boto3.resource('s3').Object('releases.wagtail.org', 'nightly/latest.json').put(
     ACL='public-read',
     Body=json.dumps({
-        "url": 'https://releases.wagtail.io/nightly/dist/' + f.name,
+        "url": 'https://releases.wagtail.org/nightly/dist/' + f.name,
     })
 )