diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
index 5254f5be0..5ef32365b 100644
--- a/.github/workflows/docker-build-test.yml
+++ b/.github/workflows/docker-build-test.yml
@@ -33,7 +33,14 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
-    - name: Build Docker standard image
+    - name: Login to DockerHub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+    # First do test builds without pushing
+    - name: Test build Docker standard image
       uses: docker/build-push-action@v5
       with:
         context: .
@@ -42,7 +49,7 @@ jobs:
         push: false
         target: aider
 
-    - name: Build Docker full image
+    - name: Test build Docker full image
       uses: docker/build-push-action@v5
       with:
         context: .
@@ -50,3 +57,24 @@ jobs:
         platforms: linux/amd64,linux/arm64
         push: false
         target: aider-full
+
+    # Then build and push dev tagged images
+    - name: Build and push Docker standard dev image
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: ./docker/Dockerfile
+        platforms: linux/amd64,linux/arm64
+        push: true
+        tags: ${{ secrets.DOCKERHUB_USERNAME }}/aider:dev
+        target: aider
+
+    - name: Build and push Docker full dev image
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: ./docker/Dockerfile
+        platforms: linux/amd64,linux/arm64
+        push: true
+        tags: ${{ secrets.DOCKERHUB_USERNAME }}/aider-full:dev
+        target: aider-full