diff --git a/.changeset/update-docker-build-tags.md b/.changeset/update-docker-build-tags.md
new file mode 100644
index 000000000..a6bedcf89
--- /dev/null
+++ b/.changeset/update-docker-build-tags.md
@@ -0,0 +1,5 @@
+---
+default: docs
+---
+
+Docker build tags have been updated: `latest` now tracks the latest versioned release and `dev` now tracks the dev branch.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 03a63ef99..cb87c2d14 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -70,11 +70,12 @@ jobs:
           flavor: |
             latest=false
           tags: |
-            # dev branch or manual dispatch without a tag: short commit SHA + latest
+            # dev branch or manual dispatch without a tag: short commit SHA + dev
             type=sha,prefix=,format=short,enable=${{ github.ref == 'refs/heads/dev' || (github.event_name == 'workflow_dispatch' && inputs.git_tag == '') }}
-            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/dev' || (github.event_name == 'workflow_dispatch' && inputs.git_tag == '') }}
+            type=raw,value=dev,enable=${{ github.ref == 'refs/heads/dev' || (github.event_name == 'workflow_dispatch' && inputs.git_tag == '') }}
 
-            # git tags (push or manual dispatch with a tag): semver breakdown
+            # git tags (push or manual dispatch with a tag): semver breakdown + latest
+            type=raw,value=latest,enable=${{ steps.release_tag.outputs.is_release == 'true' }}
             type=semver,pattern={{version}},value=${{ steps.release_tag.outputs.value }},enable=${{ steps.release_tag.outputs.is_release == 'true' }}
             type=semver,pattern={{major}}.{{minor}},value=${{ steps.release_tag.outputs.value }},enable=${{ steps.release_tag.outputs.is_release == 'true' }}
             type=semver,pattern={{major}},value=${{ steps.release_tag.outputs.value }},enable=${{ steps.release_tag.outputs.is_release == 'true' && !startsWith(steps.release_tag.outputs.value, 'v0.') }}