diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 47f6f9f58..7736846b9 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -25,7 +25,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set Docker tag
-      if: github.event_name == 'workflow_call' || github.event_name == 'workflow_dispatch'
+      if: github.event_name != 'push' && ${{ inputs.tag }}
       run: echo "DOCKER_TAG=${{ inputs.tag }}" >> $GITHUB_ENV
     - name: Use default Docker tag
       if: github.event_name == 'push'