diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3810ab8d1..c8d73a6f9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,6 +31,10 @@ jobs:
         python setup.py sdist bdist_wheel
         twine upload dist/*
 
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
     - name: Login to DockerHub
       uses: docker/login-action@v3
       with:
@@ -42,6 +46,7 @@ jobs:
       with:
         context: .
         file: ./docker/Dockerfile
+        platforms: linux/amd64,linux/arm64
         push: true
         tags: |
           ${{ secrets.DOCKERHUB_USERNAME }}/aider:${{ github.ref_name }}
diff --git a/HISTORY.md b/HISTORY.md
index f6b750ec3..f993e82a4 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,11 +1,11 @@
 # Release history
 
-### Next release
+### main branch
 
 - Added support for `.aiderignore` file, which instructs aider to ignore parts of the git repo.
 - `/run` and `/git` now accept full shell commands, like: `/run (cd subdir; ls)`
 - New `--commit` cmd line arg, which just commits all pending changes with a sensible commit message geneated by gpt-3.5.
-- Added universal ctags to the [aider docker image](https://aider.chat/docs/docker.html)
+- Added universal ctags and multiple architectures to the [aider docker image](https://aider.chat/docs/docker.html)
 
 ### v0.14.2