diff --git a/build.bat b/build.bat
index f5a2e11..2b2bbda 100644
--- a/build.bat
+++ b/build.bat
@@ -1 +1,31 @@
-docker build -t xwindow-korean-dotnet:latest .
+@echo off
+REM Docker 이미지 빌드 배치 파일
+
+setlocal enabledelayedexpansion
+
+set IMAGE_NAME=xwindow-korean-dotnet
+
+REM 버전 태그 설정 (날짜시간 기반 또는 인자로 받기)
+if not "%1"=="" (
+    set VERSION=%1
+) else (
+    for /f "tokens=2-4 delims=/ " %%a in ('date /t') do set DATE=%%c%%a%%b
+    for /f "tokens=1-2 delims=: " %%a in ('time /t') do set TIME=%%a%%b
+    set TIME=!TIME: =0!
+    set VERSION=!DATE!_!TIME!
+)
+
+echo 🐳 Building Docker image: %IMAGE_NAME%:latest and %IMAGE_NAME%:!VERSION!
+
+REM 빌드 시작 (latest와 버전 태그 동시 적용)
+docker build -t %IMAGE_NAME%:latest -t %IMAGE_NAME%:!VERSION! .
+
+echo ✅ Build completed successfully!
+echo 🏷️  Tagged as:
+echo    - %IMAGE_NAME%:latest
+echo    - %IMAGE_NAME%:!VERSION!
+echo 📋 Next steps:
+echo    - Test: docker run -p 3389:3389 %IMAGE_NAME%:!VERSION!
+echo    - Push both tags: docker push %IMAGE_NAME%:latest ^&^& docker push %IMAGE_NAME%:!VERSION!
+
+pause
diff --git a/build.sh b/build.sh
index 3b81b62..3cfa6ec 100644
--- a/build.sh
+++ b/build.sh
@@ -4,15 +4,24 @@
 set -e
 
 IMAGE_NAME="xwindow-korean-dotnet"
-VERSION="latest"
 
-echo "🐳 Building Docker image: $IMAGE_NAME:$VERSION"
+# 버전 태그 설정 (날짜시간 기반 또는 인자로 받기)
+if [ -n "$1" ]; then
+    VERSION="$1"
+else
+    VERSION=$(date +%Y%m%d_%H%M%S)
+fi
 
-# 빌드 시작
-docker build -t $IMAGE_NAME:$VERSION .
+echo "🐳 Building Docker image: $IMAGE_NAME:latest and $IMAGE_NAME:$VERSION"
+
+# 빌드 시작 (latest와 버전 태그 동시 적용)
+docker build -t $IMAGE_NAME:latest -t $IMAGE_NAME:$VERSION .
 
 echo "✅ Build completed successfully!"
+echo "🏷️  Tagged as:"
+echo "   - $IMAGE_NAME:latest"
+echo "   - $IMAGE_NAME:$VERSION"
 echo "📋 Next steps:"
 echo "   - Test: docker run -p 3389:3389 $IMAGE_NAME:$VERSION"
-echo "   - Push: docker push $IMAGE_NAME:$VERSION"
-echo "   - Multi-platform: docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE_NAME:$VERSION --push ."
\ No newline at end of file
+echo "   - Push both tags: docker push $IMAGE_NAME:latest && docker push $IMAGE_NAME:$VERSION"
+echo "   - Multi-platform: docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE_NAME:latest -t $IMAGE_NAME:$VERSION --push ."
\ No newline at end of file