diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 833c6e1f86..75db2f726a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,7 +37,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ runner.temp }}/zitadel-make-cache
-          key: zitadel-make-cache
+          key: zitadel-make-cache-${{ github.ref == 'refs/heads/main' && 'latest' || fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+          restore-keys: zitadel-make-cache-latest
       - run: make login-quality
         env:
           # latest if branch is main, otherwise image version which is the pull request number