diff --git a/src/TaxBaik.Web/Program.cs b/src/TaxBaik.Web/Program.cs
index 566e597..57efeac 100644
--- a/src/TaxBaik.Web/Program.cs
+++ b/src/TaxBaik.Web/Program.cs
@@ -262,6 +262,14 @@ builder.Services.AddScoped<TaxBaik.Web.Services.SitemapValidationService>();
 
 // Register version info
 var versionInfo = new VersionInfo();
+var assembly = typeof(Program).Assembly;
+var assemblyVersion = assembly.GetName().Version?.ToString() ?? "unknown";
+var informationalVersion = assembly.GetCustomAttributes(typeof(System.Reflection.AssemblyInformationalVersionAttribute), false)
+    .OfType<System.Reflection.AssemblyInformationalVersionAttribute>()
+    .FirstOrDefault()?.InformationalVersion;
+
+versionInfo.Version = informationalVersion ?? assemblyVersion;
+versionInfo.Built = DateTimeOffset.UtcNow.ToString("yyyy-MM-dd HH:mm:ss 'UTC'");
 var versionJsonPath = Path.Combine(AppContext.BaseDirectory, "wwwroot", "version.json");
 if (File.Exists(versionJsonPath))
 {