diff --git a/src/app/api/health/route.ts b/src/app/api/health/route.ts
index 21179c3..1558a8f 100644
--- a/src/app/api/health/route.ts
+++ b/src/app/api/health/route.ts
@@ -29,6 +29,8 @@ type VersionInfo = {
   commitHash: string | null;
   commitDate: string | null;
   commitSubject: string | null;
+  lastUpdated: string | null;
+  commitMessage: string | null;
   buildTime: string | null;
 };
 
diff --git a/src/app/api/version/route.ts b/src/app/api/version/route.ts
index 838c94a..6accd4d 100644
--- a/src/app/api/version/route.ts
+++ b/src/app/api/version/route.ts
@@ -14,6 +14,8 @@ const EMPTY: VersionInfo = {
   commitHash: null,
   commitDate: null,
   commitSubject: null,
+  lastUpdated: null,
+  commitMessage: null,
   buildTime: null,
 };
 
diff --git a/src/components/static/VersionOverlay.tsx b/src/components/static/VersionOverlay.tsx
index b0a2889..5f8fd26 100644
--- a/src/components/static/VersionOverlay.tsx
+++ b/src/components/static/VersionOverlay.tsx
@@ -10,6 +10,8 @@ const EMPTY: VersionInfo = {
   commitHash: null,
   commitDate: null,
   commitSubject: null,
+  lastUpdated: null,
+  commitMessage: null,
   buildTime: null,
 };
 
@@ -50,11 +52,14 @@ const VersionOverlay = ({ canSeeCommit }: { canSeeCommit: boolean }) => {
 
   const resolved = info ?? EMPTY;
   const versionLabel = resolveVersionLabel(resolved);
-  const lastUpdated = formatCommitDate(resolved.commitDate);
+  const lastUpdated = formatCommitDate(
+    resolved.lastUpdated ?? resolved.commitDate ?? resolved.buildTime,
+  );
+  const commitMessage = resolved.commitMessage ?? resolved.commitSubject;
   const commitInfo =
-    resolved.commitHash && resolved.commitSubject
-      ? `${resolved.commitHash} · ${resolved.commitSubject}`
-      : (resolved.commitHash ?? resolved.commitSubject ?? null);
+    resolved.commitHash && commitMessage
+      ? `${resolved.commitHash} · ${commitMessage}`
+      : (resolved.commitHash ?? commitMessage ?? null);
   const showSecondary = lastUpdated !== null || commitInfo !== null;
 
   return (