diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index dcedd320c..a6949512f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -9,7 +9,9 @@ jobs:
   push_to_registry:
     name: Push Image to GitHub Packages
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip')"
+    # Always run against a tag, even if the commit into the tag has [docker skip]
+    # within the commit message.
+    if: "!contains(github.ref, 'develop') || (!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip'))"
     steps:
       - uses: actions/checkout@v2
       - uses: docker/setup-qemu-action@v1