diff --git a/docker/build_docker.sh b/docker/build_docker.sh
index a7eb041..3b4f5d5 100755
--- a/docker/build_docker.sh
+++ b/docker/build_docker.sh
@@ -2,13 +2,11 @@
 
 script_dir="$( dirname "${0}" )"
 
-IMAGE_TAG="latest"
+IMAGE_LATEST_TAG="latest"
+IMAGE_VERSION_TAG=`git tag -l --sort=-creatordate | head -n 1 | sed "s/v//g"`
 
-# shellcheck disable=SC2199
-if [[ "${@}" != "" ]];then
-    # shellcheck disable=SC2124
-    IMAGE_TAG="${@}"
-fi
-
-sudo docker build -t getpinry/pinry:${IMAGE_TAG} "${script_dir}/../" \
+sudo docker build -t getpinry/pinry:${IMAGE_LATEST_TAG} "${script_dir}/../" \
+  -f "${script_dir}/../Dockerfile.autobuild"
+
+sudo docker build -t getpinry/pinry:${IMAGE_VERSION_TAG} "${script_dir}/../" \
   -f "${script_dir}/../Dockerfile.autobuild"
diff --git a/docker/build_docker_multiple_platform.sh b/docker/build_docker_multiple_platform.sh
index 81db3c1..f280b1b 100755
--- a/docker/build_docker_multiple_platform.sh
+++ b/docker/build_docker_multiple_platform.sh
@@ -2,16 +2,17 @@
 
 script_dir="$( dirname "${0}" )"
 
-IMAGE_TAG="latest"
-
-# shellcheck disable=SC2199
-if [[ "${@}" != "" ]];then
-    # shellcheck disable=SC2124
-    IMAGE_TAG="${@}"
-fi
+IMAGE_LATEST_TAG="latest"
+IMAGE_VERSION_TAG=`git tag -l --sort=-creatordate | head -n 1 | sed "s/v//g"`
 
 sudo docker buildx build \
   --push \
   --platform linux/arm/v7,linux/arm64/v8,linux/amd64 \
-  -t getpinry/pinry:${IMAGE_TAG} "${script_dir}/../" \
+  -t getpinry/pinry:${IMAGE_LATEST_TAG} "${script_dir}/../" \
+  -f "${script_dir}/../Dockerfile.autobuild"
+
+sudo docker buildx build \
+  --push \
+  --platform linux/arm/v7,linux/arm64/v8,linux/amd64 \
+  -t getpinry/pinry:${IMAGE_VERSION_TAG} "${script_dir}/../" \
   -f "${script_dir}/../Dockerfile.autobuild"