diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50196fb4f..a6ab802fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -134,6 +134,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Change watermark width and margins to allow decimals
 - Move `Add To Collection` button to overflow menu on all media cards, and add `Show Media Info` to overflow menu
   - This allows showing media info for all media kinds
+- Unify on a multi-platform base docker tag (`latest` and `develop`)
+  - `amd64`, `arm64`, `arm/v7` platforms are now all supported in the base docker tag
+  - Other docker platform tags are deprecated and will receive no new updates after the next release
+  - A health check has been added to notify users (on `-arm` or `-arm64` tags) of this change
 
 ### Fixed
 - Fix QSV acceleration in docker with older Intel devices
diff --git a/ErsatzTV.Infrastructure/Health/Checks/UnifiedDockerHealthCheck.cs b/ErsatzTV.Infrastructure/Health/Checks/UnifiedDockerHealthCheck.cs
index 18f29a0f8..bf8cb7c7d 100644
--- a/ErsatzTV.Infrastructure/Health/Checks/UnifiedDockerHealthCheck.cs
+++ b/ErsatzTV.Infrastructure/Health/Checks/UnifiedDockerHealthCheck.cs
@@ -14,10 +14,10 @@ public class UnifiedDockerHealthCheck : BaseHealthCheck, IUnifiedDockerHealthChe
 
     public Task<HealthCheckResult> Check(CancellationToken cancellationToken)
     {
-        if (InfoVersion.Contains("docker-vaapi") || InfoVersion.Contains("docker-nvidia"))
+        if (InfoVersion.Contains("docker-vaapi") || InfoVersion.Contains("docker-nvidia") || InfoVersion.Contains("docker-arm"))
         {
             return WarningResult(
-                    "VAAPI and NVIDIA docker tag suffixes are deprecated; please remove `-vaapi` or `-nvidia` and pull the default image.",
+                    "VAAPI, NVIDIA, and ARM docker tag suffixes are deprecated; please remove `-vaapi`, `-nvidia`, `-arm64` or `-arm` and pull the default image.",
                     "docker tag is deprecated")
                 .AsTask();
         }