diff --git a/docker/build_docker.sh b/docker/build_docker.sh
index 3b4f5d5..2ad0862 100755
--- a/docker/build_docker.sh
+++ b/docker/build_docker.sh
@@ -5,8 +5,8 @@ script_dir="$( dirname "${0}" )"
 IMAGE_LATEST_TAG="latest"
 IMAGE_VERSION_TAG=`git tag -l --sort=-creatordate | head -n 1 | sed "s/v//g"`
 
-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}/../" \
+sudo docker build \
+  -t getpinry/pinry:${IMAGE_VERSION_TAG} \
+  -t getpinry/pinry:${IMAGE_LATEST_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 f280b1b..8305257 100755
--- a/docker/build_docker_multiple_platform.sh
+++ b/docker/build_docker_multiple_platform.sh
@@ -8,11 +8,7 @@ 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_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}/../" \
+  -t getpinry/pinry:${IMAGE_LATEST_TAG} \
+  -t getpinry/pinry:${IMAGE_VERSION_TAG} \
+  "${script_dir}/../" \
   -f "${script_dir}/../Dockerfile.autobuild"