diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 78ad179..c09c09f 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -215,7 +215,7 @@ jobs:
         id: checkbase
         with:
           base-image: code.nephatrine.net/nephnet/alpine-s6:internal
-          image: nephatrine/quake2-server:yamagi-latest
+          image: nephatrine/quake2-server:yamagi
           platforms: linux/amd64
       - name: Docker Login
         uses: https://github.com/docker/login-action@v3
@@ -229,13 +229,13 @@ jobs:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
       - name: Docker Manifest
-        run: docker buildx imagetools create -t code.nephatrine.net/nephnet/quake2-yamagi:latest -t nephatrine/quake2-server:latest -t nephatrine/quake2-server:yamagi-latest -t nephatrine/quake2-server:yamagi-8.30 -t nephatrine/quake2-server:yamagi-8 code.nephatrine.net/nephnet/quake2-yamagi:latest-amd64 code.nephatrine.net/nephnet/quake2-yamagi:latest-i386 code.nephatrine.net/nephnet/quake2-yamagi:latest-arm64 code.nephatrine.net/nephnet/quake2-yamagi:latest-armv7 code.nephatrine.net/nephnet/quake2-yamagi:latest-riscv64
+        run: docker buildx imagetools create -t code.nephatrine.net/nephnet/quake2-yamagi:latest -t nephatrine/quake2-server:latest -t nephatrine/quake2-server:yamagi -t nephatrine/quake2-server:yamagi-8.30 -t nephatrine/quake2-server:yamagi-8 code.nephatrine.net/nephnet/quake2-yamagi:latest-amd64 code.nephatrine.net/nephnet/quake2-yamagi:latest-i386 code.nephatrine.net/nephnet/quake2-yamagi:latest-arm64 code.nephatrine.net/nephnet/quake2-yamagi:latest-armv7 code.nephatrine.net/nephnet/quake2-yamagi:latest-riscv64
       - name: Notify Discord
         if: gitea.event_name != 'schedule' || steps.checkbase.outputs.needs-updating == 'true'
         uses: https://github.com/sarisia/actions-status-discord@v1
         with:
           title: "DockerHub: quake2-server"
-          description: "The container image was pushed to [DockerHub](https://hub.docker.com/repository/docker/nephatrine/quake2-server/general).\nPull `nephatrine/quake2-server:yamagi-latest` for the newest image."
+          description: "The container image was pushed to [DockerHub](https://hub.docker.com/repository/docker/nephatrine/quake2-server/general).\nPull `nephatrine/quake2-server:yamagi` for the newest image."
           nodetail: true
           webhook: ${{ secrets.DISCORD_WEBHOOK_PACKAGE }}
       - name: Checkout Repository
diff --git a/README.md b/README.md
index a49e0e2..b97521d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2020 - 2023 Daniel Wolf <nephatrine@gmail.com>
+SPDX-FileCopyrightText: 2020 - 2024 Daniel Wolf <nephatrine@gmail.com>
 
 SPDX-License-Identifier: ISC
 -->
@@ -12,7 +12,7 @@ SPDX-License-Identifier: ISC
 
 This docker container manages the Yamagi Quake II dedicated server.
 
-The `yamagi-latest` tag points to version `8.30` and this is the only image
+The `yamagi` tag points to version `8.30` and this is the only image
 actively being updated. There are tags for older versions, but these may no
 longer be using the latest Alpine version and packages.
 
@@ -27,7 +27,7 @@ This is just a simple Quake II server.
 ```yaml
 services:
   quake2-server:
-    image: nephatrine/quake2-server:yamagi-latest
+    image: nephatrine/quake2-server:yamagi
     container_name: quake2-server
     environment:
       TZ: America/New_York
@@ -54,7 +54,7 @@ the installed game data on the server.
 ```yaml
 services:
   quake2-server:
-    image: nephatrine/quake2-server:yamagi-latest
+    image: nephatrine/quake2-server:yamagi
     container_name: quake2-server
     environment:
       TZ: America/New_York
@@ -101,7 +101,7 @@ port each should run on and map those separate ports on both sides.
 ```yaml
 services:
   quake2-server-1:
-    image: nephatrine/quake2-server:yamagi-latest
+    image: nephatrine/quake2-server:yamagi
     container_name: quake2-server-1
     environment:
       TZ: America/New_York
@@ -115,7 +115,7 @@ services:
       - /mnt/containers/quake2-server-1:/mnt/config
       - /mnt/containers/quake2-data:/mnt/shared
   quake2-server-2:
-    image: nephatrine/quake2-server:yamagi-latest
+    image: nephatrine/quake2-server:yamagi
     container_name: quake2-server-2
     environment:
       TZ: America/New_York