diff --git a/build-docker.sh b/build-docker.sh
index aa1e68b..4c51f36 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -1,4 +1,26 @@
 #!/bin/bash
+# Build script for PISCAL Docker image with automatic versioning
 
-sudo docker build -t piscal-server:latest .
-#sudo docker run -it --rm -p 2222:22 --name my-piscal-server piscal-server
+set -e
+
+# Generate version tag: YYYYMMDD-gitsha
+DATE_TAG=$(date +%Y%m%d)
+GIT_SHA=$(git rev-parse --short HEAD)
+VERSION="${DATE_TAG}-${GIT_SHA}"
+
+echo "Building PISCAL Docker image..."
+echo "Version: ${VERSION}"
+echo ""
+
+# Build with version tag and latest tag
+docker build \
+  -t piscal:${VERSION} \
+  -t piscal:latest \
+  .
+
+echo ""
+echo "Successfully built:"
+echo "  - piscal:${VERSION}"
+echo "  - piscal:latest"
+echo ""
+echo "To run: docker run -d -p 2222:22 --name piscal-server piscal:latest"