diff --git a/.gitea/workflows/docker-kubernetes.yaml b/.gitea/workflows/docker-kubernetes.yaml
index 93edb31..15197f0 100644
--- a/.gitea/workflows/docker-kubernetes.yaml
+++ b/.gitea/workflows/docker-kubernetes.yaml
@@ -64,11 +64,11 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           tags: |
-            type=edge
-            type=ref,event=branch
             type=semver,pattern=v{{version}}
             type=semver,pattern=v{{major}}.{{minor}}
             type=semver,pattern=v{{major}}
+            type=ref,event=branch
+            type=edge
 
       - name: Bake containers
         id: bake
@@ -77,6 +77,9 @@ jobs:
           files: |
             ./docker-bake.hcl
             cwd://${{ steps.meta.outputs.bake-file }}
+          set: |
+            *.cache-from=type=gha
+            *.cache-to=type=gha,mode=max
           push: true
           sbom: true
           provenance: mode=max
@@ -87,7 +90,7 @@ jobs:
 
       - name: Generate outputs
         run: |
-          echo ${{ steps.bake.outputs.metadata }} | jq 'map_values((."image.name" | split(",|:";"")).[] + "@" + ."containerimage.digest")' >> $GITHUB_OUTPUT
+          echo "images=$(${{ steps.bake.outputs.metadata }} | jq 'map_values((."image.name" | split(",|:";"")).[] + "@" + ."containerimage.digest")')" >> $GITHUB_OUTPUT
 
       # TODO: Move this into docker-bake.hcl
       - name: Generate CRDs