diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
index 18e851e5..0c2ec0fd 100644
--- a/.github/workflows/pythonapp.yml
+++ b/.github/workflows/pythonapp.yml
@@ -192,13 +192,15 @@ jobs:
         images: |
           setsoft/kicad_auto
           ghcr.io/inti-cmnb/kicad_auto
+        tags: |
+          type=raw,dev
 
     - name: Build and push Docker image
       uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
       with:
         context: tools/dev_image
         push: true
-        tags: setsoft/kicad_auto:dev
+        tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
 
   push_to_registry_k6:
@@ -233,13 +235,15 @@ jobs:
         images: |
           setsoft/kicad_auto
           ghcr.io/inti-cmnb/kicad_auto
+        tags: |
+          type=raw,dev_k6
 
     - name: Build and push Docker image
       uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
       with:
         context: tools/dev_image_k6
         push: true
-        tags: setsoft/kicad_auto:dev_k6
+        tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
 
   coveralls: