diff --git a/docker/build_docker.sh b/docker/build_docker.sh
index 7b3147a..a7eb041 100755
--- a/docker/build_docker.sh
+++ b/docker/build_docker.sh
@@ -1,5 +1,14 @@
 #!/bin/bash
 
 script_dir="$( dirname "${0}" )"
-sudo docker build -t getpinry/pinry${@} "${script_dir}/../" \
+
+IMAGE_TAG="latest"
+
+# shellcheck disable=SC2199
+if [[ "${@}" != "" ]];then
+    # shellcheck disable=SC2124
+    IMAGE_TAG="${@}"
+fi
+
+sudo docker build -t getpinry/pinry:${IMAGE_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 f04abb7..81db3c1 100755
--- a/docker/build_docker_multiple_platform.sh
+++ b/docker/build_docker_multiple_platform.sh
@@ -2,8 +2,16 @@
 
 script_dir="$( dirname "${0}" )"
 
+IMAGE_TAG="latest"
+
+# shellcheck disable=SC2199
+if [[ "${@}" != "" ]];then
+    # shellcheck disable=SC2124
+    IMAGE_TAG="${@}"
+fi
+
 sudo docker buildx build \
   --push \
   --platform linux/arm/v7,linux/arm64/v8,linux/amd64 \
-  -t getpinry/pinry:${@} "${script_dir}/../" \
+  -t getpinry/pinry:${IMAGE_TAG} "${script_dir}/../" \
   -f "${script_dir}/../Dockerfile.autobuild"