diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index b7965b881266e..84a0874ed1e0e 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - name: Get current date
         id: date
-        run: echo "::set-output name=date::$(date --rfc-3339=date)"
+        run: echo "date=$(date --rfc-3339=date)" >> $GITHUB_OUTPUT
 
       - name: Checkout branch "master"
         uses: actions/checkout@v4
@@ -51,7 +51,7 @@ jobs:
           context: .
           push: true
           platforms: linux/amd64,linux/arm64
-          tags: shieldsio/shields:server-${{ steps.date.outputs.date }}
+          tags: shieldsio/shields:server-${{ steps.date.outputs.date }},shieldsio/shields:latest
           build-args: |
             version=server-${{ steps.date.outputs.date }}
 
@@ -68,6 +68,6 @@ jobs:
           context: .
           push: true
           platforms: linux/amd64,linux/arm64
-          tags: ghcr.io/badges/shields:server-${{ steps.date.outputs.date }}
+          tags: ghcr.io/badges/shields:server-${{ steps.date.outputs.date }},ghcr.io/badges/shields:latest
           build-args: |
             version=server-${{ steps.date.outputs.date }}
diff --git a/doc/self-hosting.md b/doc/self-hosting.md
index f7b56f66b13d6..258d74ac5b8d5 100644
--- a/doc/self-hosting.md
+++ b/doc/self-hosting.md
@@ -75,10 +75,14 @@ vercel
 
 We publish images to:
 
-- DockerHub at https://registry.hub.docker.com/r/shieldsio/shields and
-- GitHub Container Registry at https://github.com/badges/shields/pkgs/container/shields
+- DockerHub: https://registry.hub.docker.com/r/shieldsio/shields
+- GitHub Container Registry: https://github.com/badges/shields/pkgs/container/shields
 
-The `next` tag is the latest build from `master`. These are only available for linux/amd64
+| Tag           | Architecture            | Description                                |
+| ------------- | ----------------------- | ------------------------------------------ |
+| `next`        | linux/amd64             | Published on every commit to master.       |
+| `latest`      | linux/amd64,linux/arm64 | Published on every tagged release.         |
+| `server-xxxx` | linux/amd64,linux/arm64 | Tagged releases to pin a specific version. |
 
 ```sh
 # DockerHub
@@ -89,7 +93,7 @@ $ docker run shieldsio/shields:next
 ```sh
 # GHCR
 $ docker pull ghcr.io/badges/shields:next
-$ docker pull ghcr.io/badges/shields:next
+$ docker run ghcr.io/badges/shields:next
 ```
 
 Tagged snapshot releases are also available:
@@ -97,7 +101,9 @@ Tagged snapshot releases are also available:
 - https://registry.hub.docker.com/r/shieldsio/shields/tags
 - https://github.com/badges/shields/pkgs/container/shields/versions?filters%5Bversion_type%5D=tagged
 
-We push both linux/amd64 and linux/arm64 snapshot images. We use the linux/amd64 image ourselves to host shields.io. We push a linux/arm64 image, but we don't consume it ourselves and it receives no testing beyond ensuring the docker image builds without error.
+We push both linux/amd64 and linux/arm64 snapshot images as of `server-2024-09-02`. We use the linux/amd64 image
+ourselves to host shields.io. We push a linux/arm64 image, but we don't consume it ourselves and it receives no testing
+beyond ensuring the docker image builds without error.
 
 ### Building Docker Image Locally