diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e1abc70f7..13e0fd7c2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -23,9 +23,9 @@ env:
   CARGO_NET_GIT_FETCH_WITH_CLI: "true"
   SCCACHE_GHA_ENABLED: "true"
   RUSTC_WRAPPER: "sccache"
-  IMAGE: ghcr.io/matrix-org/matrix-authentication-service
-  IMAGE_SYN2MAS: ghcr.io/matrix-org/matrix-authentication-service/syn2mas
-  BUILDCACHE: ghcr.io/matrix-org/matrix-authentication-service/buildcache
+  IMAGE: ghcr.io/element-hq/matrix-authentication-service
+  IMAGE_SYN2MAS: ghcr.io/element-hq/matrix-authentication-service/syn2mas
+  BUILDCACHE: ghcr.io/element-hq/matrix-authentication-service/buildcache
   DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
 
 jobs:
diff --git a/docs/setup/general.md b/docs/setup/general.md
index cb9d1f8c6..26e563c81 100644
--- a/docs/setup/general.md
+++ b/docs/setup/general.md
@@ -18,7 +18,7 @@ mas-cli config generate > config.yaml
 If you're using the docker container, the command `mas-cli` can be invoked with `docker run`:
 
 ```sh
-docker run ghcr.io/matrix-org/matrix-authentication-service config generate > config.yaml
+docker run ghcr.io/element-hq/matrix-authentication-service config generate > config.yaml
 ```
 
 This applies to all of the `mas-cli` commands in this document.
diff --git a/docs/setup/installation.md b/docs/setup/installation.md
index 298f834cc..19bf26225 100644
--- a/docs/setup/installation.md
+++ b/docs/setup/installation.md
@@ -42,7 +42,7 @@ curl -sL "$URL" | tar xzC /path/to/mas
 
 ## Using the Docker image
 
-A pre-built Docker image is available here: [`ghcr.io/matrix-org/matrix-authentication-service:latest`](https://ghcr.io/matrix-org/matrix-authentication-service:latest)
+A pre-built Docker image is available here: [`ghcr.io/element-hq/matrix-authentication-service:latest`](https://ghcr.io/element-hq/matrix-authentication-service:latest)
 
 The `latest` tag is built using the latest release.
 The `main` tag is built from the `main` branch, and each commit on the `main` branch is also tagged with a stable `sha-<commit sha>` tag.