diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 454acff30..a8260fd08 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -178,7 +178,11 @@ jobs:
 
   # Separate from everything else because slow.
   build-and-deploy-docker:
-    if: github.repository == 'mitmproxy/mitmproxy' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dockertest')
+    if: github.repository == 'mitmproxy/mitmproxy' && (
+      github.ref == 'refs/heads/main' ||
+      github.ref == 'refs/heads/dockertest' ||
+      startsWith(github.ref, 'refs/tags/')
+      )
     environment: deploy-docker
     needs:
      - test