diff --git a/TODO b/TODO
index 38892df..2fb6e73 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,3 @@
 TODO List :
 
-- Remove auth_papatcher.sh from image
-- Request credentials and ip at build startup
-- Request also region and server name
-- Request listen on pastat
+- Improve buildImage.sh inpur error checking
diff --git a/buildImage.sh b/buildImage.sh
index ef1a867..ee59960 100755
--- a/buildImage.sh
+++ b/buildImage.sh
@@ -56,4 +56,7 @@ sed -i "/listonpastats/ s/true/$serverlistonpastats/" NodePAMaster_conf.json
 
 
 if [ $1 = "nobuild" ]; then exit 0;fi
-sudo docker build --rm=true .
+sudo docker build --rm=true -t "uggla/passerver" .
+paversion=$(sudo docker run -ti --rm --entrypoint="/bin/cat" uggla/paserver:latest .local/Uber\ Entertainment/Planetary\ Annihilation/stable/version.txt)
+echo "Tag image with version : $paversion"
+sudo docker tag uggla/paserver:latest uggla/paserver:$paversion