diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
index cc73f6ab6..ad562f7af 100644
--- a/.github/workflows/docker-build-test.yml
+++ b/.github/workflows/docker-build-test.yml
@@ -8,14 +8,30 @@ on:
     branches:
       - main
 
+# copy most of these steps from release.yml, but push: false and no tags:
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Check out repository
+    - name: Checkout code
       uses: actions/checkout@v3
 
-    - name: Build Docker image
-      run: |
-        docker build -t myapp:latest . -f docker/Dockerfile
+    - 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:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: ./docker/Dockerfile
+        platforms: linux/amd64,linux/arm64
+        push: false
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d153df64c..0d1128b75 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
         TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
       run: |
         python setup.py sdist bdist_wheel
-        #twine upload dist/*
+        twine upload dist/*
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
@@ -46,8 +46,8 @@ jobs:
       with:
         context: .
         file: ./docker/Dockerfile
-        platforms: linux/arm64
-        push: false
+        platforms: linux/amd64,linux/arm64
+        push: true
         tags: |
           ${{ secrets.DOCKERHUB_USERNAME }}/aider:${{ github.ref_name }}
           ${{ secrets.DOCKERHUB_USERNAME }}/aider:latest