diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 57f101b..37c13d3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,7 +66,7 @@ jobs:
           context: .
           cache-from: type=gha,scope=base
           cache-to: type=gha,scope=base,mode=max
-          push: ${{ github.ref == 'refs/heads/main' }}
+          push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64
@@ -139,7 +139,7 @@ jobs:
           context: .
           cache-from: type=gha,scope=otel
           cache-to: type=gha,scope=otel,mode=max
-          push: ${{ github.ref == 'refs/heads/main' }}
+          push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64