3 files changed, 5 insertions, 2 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 375a7f7b04..1ac48a71ba 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,7 @@ jobs:
           platforms: linux/amd64
       - docker_build:
           tag: -t matrixdotorg/synapse:${CIRCLE_TAG}
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/amd64,linux/arm64
 
   dockerhubuploadlatest:
     docker:
@@ -27,7 +27,7 @@ jobs:
       # until all of the platforms are built.
       - docker_build:
           tag: -t matrixdotorg/synapse:latest
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/amd64,linux/arm64
 
 workflows:
   build:
diff --git a/CHANGES.md b/CHANGES.md
index 309c34f90b..9837710d06 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,8 @@
 Synapse 1.xx.0 (2021-xx-xx)
 ===========================
 
+Note that this release drops support for ARMv7 in the official Docker images, due to repeated problems building for ARMv7 (and the associated maintenance burden this entails).
+
 Removal warning
 ---------------
 
diff --git a/changelog.d/9433.docker b/changelog.d/9433.docker
new file mode 100644
index 0000000000..cbe3a674d3
--- /dev/null
+++ b/changelog.d/9433.docker
@@ -0,0 +1 @@
+Drop support for ARMv7 in Docker images.