diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index ffd35f543..1052e7798 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -3,11 +3,11 @@ name: Docker Build
 on:
   push:
     branches: [ main ]
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+*'
+  pull_request:
+    branches: [ main ]
   workflow_dispatch:
-  # Version tag publishing — disabled for now
-  # push:
-  #   tags:
-  #     - 'v[0-9]+.[0-9]+.[0-9]+*'
 
 permissions:
   packages: write
@@ -49,7 +49,7 @@ jobs:
           file: docker/Dockerfile
           build-args: |
             GIT_SHA=${{ github.sha }}
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ startsWith(github.ref, 'refs/tags/v') }}
           cache-from: type=registry,ref=ghcr.io/projectasap/asap-arroyo:buildcache
           cache-to: type=registry,ref=ghcr.io/projectasap/asap-arroyo:buildcache,mode=max
           target: arroyo-full