diff --git a/.forgejo/workflows/test_and_build.yaml b/.forgejo/workflows/test_and_build.yaml
index bd98561..5232c2e 100644
--- a/.forgejo/workflows/test_and_build.yaml
+++ b/.forgejo/workflows/test_and_build.yaml
@@ -94,27 +94,19 @@ jobs:
           image: treetrail-backend
           oci: true
           labels: treetrail-backend
-          tags: ${{ steps.version.outputs.version }}
+          tags: latest ${{ steps.version.outputs.version }}
           containerfiles: |
             ./Containerfile
           build-args: |
             APP_VERSION=${{ steps.version.outputs.version }}
 
-      - name: Push the image to the registry (version tag)
+      - name: Push the image to the registry
         if: fromJSON(steps.builder.outputs.run)
         uses: actions/push-to-registry@v2
         with:
           registry: "docker://${{ vars.REGISTRY }}/${{ vars.ORGANISATION }}"
           image: treetrail-backend
-          tags: ${{ steps.version.outputs.version }}
-
-      - name: Push the image to the registry (latest tag)
-        if: fromJSON(steps.builder.outputs.run)
-        uses: actions/push-to-registry@v2
-        with:
-          registry: "docker://${{ vars.REGISTRY }}/${{ vars.ORGANISATION }}"
-          image: treetrail-backend
-          tags: latest
+          tags: latest ${{ steps.version.outputs.version }}
 
       - name: Install uv
         uses: astral-sh/setup-uv@v4