diff --git a/.github/workflows/release-container.yml b/.github/workflows/release-container.yml
index cb1637954..f14cdba29 100644
--- a/.github/workflows/release-container.yml
+++ b/.github/workflows/release-container.yml
@@ -25,6 +25,7 @@ jobs:
           latest=false
         tags: |
           type=ref,event=tag
+          type=raw,value=latest,enable=${{ github.ref != 'refs/tags/staging' }}
           type=match,pattern=\d.\d.\d,value=latest
     - name: Set up QEMU
       uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
@@ -47,3 +48,5 @@ jobs:
         push: true
         platforms: linux/amd64,linux/arm64/v8
         tags: ${{ steps.meta.outputs.tags }}
+        cache-from: type=gha
+        cache-to: type=gha,mode=max