diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index bcbc3463be..e96513dfd5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -15,8 +15,8 @@ jobs:
           images: |
             clockworklabs/spacetimedb
           tags: |
-            type=ref,event=branch
-            type=sha
+            type=ref,event=branch,prefix=branch-
+            type=sha,prefix=commit-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Cache Docker layers