diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index db25ff1..cfe2379 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -35,6 +35,21 @@ jobs:
           cp -r db/migrations ./publish/web/migrations || true
           cp -r db/migrations ./publish/admin/migrations || true
 
+      - name: Generate build info
+        run: |
+          COMMIT_HASH=$(git rev-parse --short HEAD)
+          BUILD_TIME=$(date -u +'%Y-%m-%d %H:%M:%S UTC')
+          echo "COMMIT_HASH=$COMMIT_HASH" >> $GITHUB_ENV
+          echo "BUILD_TIME=$BUILD_TIME" >> $GITHUB_ENV
+          cat > ./publish/web/wwwroot/version.txt <<EOF
+          Version: $COMMIT_HASH
+          Built: $BUILD_TIME
+          EOF
+          cat > ./publish/admin/wwwroot/version.txt <<EOF
+          Version: $COMMIT_HASH
+          Built: $BUILD_TIME
+          EOF
+
       - name: Setup SSH key
         uses: webfactory/ssh-agent@v0.9.0
         with:
@@ -53,7 +68,13 @@ jobs:
           tar -xzf /tmp/web_publish.tar.gz -C "$WEB_DEPLOY_DIR"
           ln -sfn "$WEB_DEPLOY_DIR/web" ~/taxbaik_active
           pkill -f "TaxBaik.Web" || true
-          sleep 2
+          # Wait for port 5001 to be released
+          for i in {1..30}; do
+            if ! lsof -Pi :5001 -sTCP:LISTEN -t >/dev/null 2>&1; then
+              break
+            fi
+            sleep 1
+          done
           cd ~/taxbaik_active
           export ConnectionStrings__Default="Host=localhost;Database=taxbaikdb;Username=taxbaik;Password=taxbaik123"
           export ASPNETCORE_ENVIRONMENT=Production
@@ -73,7 +94,13 @@ jobs:
           tar -xzf /tmp/admin_publish.tar.gz -C "$ADMIN_DEPLOY_DIR"
           ln -sfn "$ADMIN_DEPLOY_DIR/admin" ~/taxbaik_admin_active
           pkill -f "TaxBaik.Admin" || true
-          sleep 2
+          # Wait for port 5002 to be released
+          for i in {1..30}; do
+            if ! lsof -Pi :5002 -sTCP:LISTEN -t >/dev/null 2>&1; then
+              break
+            fi
+            sleep 1
+          done
           cd ~/taxbaik_admin_active
           export ConnectionStrings__Default="Host=localhost;Database=taxbaikdb;Username=taxbaik;Password=taxbaik123"
           export ASPNETCORE_ENVIRONMENT=Production
diff --git a/TaxBaik.Admin/Program.cs b/TaxBaik.Admin/Program.cs
index 93b7bb1..45ce4c4 100644
--- a/TaxBaik.Admin/Program.cs
+++ b/TaxBaik.Admin/Program.cs
@@ -20,6 +20,22 @@ builder.Services.AddMemoryCache();
 builder.Services.AddInfrastructure();
 builder.Services.AddApplication();
 
+// Register version info
+var versionInfo = new VersionInfo();
+var versionFilePath = Path.Combine(AppContext.BaseDirectory, "wwwroot", "version.txt");
+if (File.Exists(versionFilePath))
+{
+    var lines = File.ReadAllLines(versionFilePath);
+    foreach (var line in lines)
+    {
+        if (line.StartsWith("Version:"))
+            versionInfo.Version = line.Substring("Version:".Length).Trim();
+        else if (line.StartsWith("Built:"))
+            versionInfo.Built = line.Substring("Built:".Length).Trim();
+    }
+}
+builder.Services.AddSingleton(versionInfo);
+
 var app = builder.Build();
 
 // Run migrations on startup
diff --git a/TaxBaik.Admin/VersionInfo.cs b/TaxBaik.Admin/VersionInfo.cs
new file mode 100644
index 0000000..0fb1715
--- /dev/null
+++ b/TaxBaik.Admin/VersionInfo.cs
@@ -0,0 +1,7 @@
+namespace TaxBaik.Admin;
+
+public class VersionInfo
+{
+    public string Version { get; set; } = "unknown";
+    public string Built { get; set; } = "unknown";
+}
diff --git a/TaxBaik.Web/Pages/Shared/_Footer.cshtml b/TaxBaik.Web/Pages/Shared/_Footer.cshtml
index 0d3c4dc..76ee8ca 100644
--- a/TaxBaik.Web/Pages/Shared/_Footer.cshtml
+++ b/TaxBaik.Web/Pages/Shared/_Footer.cshtml
@@ -1,3 +1,5 @@
+@inject VersionInfo VersionInfo
+
 <footer class="bg-light border-top mt-5 py-4">
     <div class="container">
         <div class="row g-4">
@@ -28,6 +30,9 @@
             <p>© 2026 백원숙 세무회계. All rights reserved.</p>
             <a href="/taxbaik/privacy" class="text-decoration-none text-muted me-2">개인정보처리방침</a>
             <a href="/taxbaik/terms" class="text-decoration-none text-muted">이용약관</a>
+            <div class="mt-2" style="font-size: 0.75rem; opacity: 0.7;">
+                🔄 버전: @VersionInfo.Version | 배포: @VersionInfo.Built
+            </div>
         </div>
     </div>
 </footer>
diff --git a/TaxBaik.Web/Program.cs b/TaxBaik.Web/Program.cs
index 3a392c9..0fed1b9 100644
--- a/TaxBaik.Web/Program.cs
+++ b/TaxBaik.Web/Program.cs
@@ -13,6 +13,22 @@ builder.Services.AddResponseCompression(opts => {
 builder.Services.AddInfrastructure();
 builder.Services.AddApplication();
 
+// Register version info
+var versionInfo = new VersionInfo();
+var versionFilePath = Path.Combine(AppContext.BaseDirectory, "wwwroot", "version.txt");
+if (File.Exists(versionFilePath))
+{
+    var lines = File.ReadAllLines(versionFilePath);
+    foreach (var line in lines)
+    {
+        if (line.StartsWith("Version:"))
+            versionInfo.Version = line.Substring("Version:".Length).Trim();
+        else if (line.StartsWith("Built:"))
+            versionInfo.Built = line.Substring("Built:".Length).Trim();
+    }
+}
+builder.Services.AddSingleton(versionInfo);
+
 var app = builder.Build();
 
 // Run migrations on startup
diff --git a/TaxBaik.Web/VersionInfo.cs b/TaxBaik.Web/VersionInfo.cs
new file mode 100644
index 0000000..f1525fa
--- /dev/null
+++ b/TaxBaik.Web/VersionInfo.cs
@@ -0,0 +1,7 @@
+namespace TaxBaik.Web;
+
+public class VersionInfo
+{
+    public string Version { get; set; } = "unknown";
+    public string Built { get; set; } = "unknown";
+}