diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
index bff02f2351a..14bd3d990a8 100644
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@@ -75,12 +75,17 @@ jobs:
           # generate Docker tags based on the following events/attributes
           tags: |
             type=schedule
+            # semver and ref,tag automatically add a "latest" tag, but only on stable releases
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
+            type=ref,event=tag
             type=ref,event=branch
             type=ref,event=pr
             type=sha
+            # edge is the latest commit on the default branch.
+            # TODO: We only want edge builds for `us-docker.pkg.dev`, because DockerHub doesn't keep up with every `main` branch commit.
+            type=edge,enable={{is_default_branch}}
 
       # Setup Docker Buildx to allow use of docker cache layers from GH
       - name: Set up Docker Buildx