diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index f52436d..a4ef11e 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -344,6 +344,7 @@ function build_custom_if_needed() {
     printf "\t%s" "$docker_command"
     eval $docker_command
     printf "\n\nSUCCESS - Successfully built:\n\t%s" "$full_image_name"
+    echo ""
 }
 
 build_custom_if_needed $@
diff --git a/scripts/lib/custom-docker.sh b/scripts/lib/custom-docker.sh
index df92c12..505f42a 100644
--- a/scripts/lib/custom-docker.sh
+++ b/scripts/lib/custom-docker.sh
@@ -25,5 +25,10 @@ function get_image_tag() {
             tag="${tag}-${tool,,}-${!tool}"
         fi
     done
-    echo "${tag:1}"
+    
+    if [[ -n "$tag" ]]; then
+        echo "${tag:1}"
+    else
+        echo "latest"
+    fi
 }