diff --git a/build_and_push.sh b/build_and_push.sh
index edf9631..d21d68b 100755
--- a/build_and_push.sh
+++ b/build_and_push.sh
@@ -23,31 +23,32 @@ do
         "$container"
 
     podman image tag "${container_image_name}:latest" "${container_image_name}:alpine"
-    alpine_version_part="${ALPINE_VERSION}"
-    while [ -n "${alpine_version_part}" ]
-    do
-        app_version_part="${app_version}"
-        while [ -n "${app_version_part}" ]
-        do
-            podman image tag "${container_image_name}:latest" "${container_image_name}:${app_version_part}-alpine${alpine_version_part}"
-            app_version_part=${app_version_part%.*}
-        done
-        podman image tag "${container_image_name}:latest" "${container_image_name}:alpine${alpine_version_part}"
-        alpine_version_part=${alpine_version_part%.*}
-    done
-
-    podman push "${container_image_name}:latest"
     podman push "${container_image_name}:alpine"
     alpine_version_part="${ALPINE_VERSION}"
-    while [ -n "${alpine_version_part}" ]
+    while true
     do
         app_version_part="${app_version}"
-        while [ -n "${app_version_part}" ]
+        while true
         do
+            podman image tag "${container_image_name}:latest" "${container_image_name}:${app_version_part}-alpine${alpine_version_part}"
             podman push "${container_image_name}:${app_version_part}-alpine${alpine_version_part}"
-            app_version_part=${app_version_part%.*}
+            if [ "${app_version_part}" = ${app_version_part%.*} ]
+            then
+                break
+            else
+                app_version_part=${app_version_part%.*}
+            fi
         done
+        podman image tag "${container_image_name}:latest" "${container_image_name}:alpine${alpine_version_part}"
         podman push "${container_image_name}:alpine${alpine_version_part}"
-        alpine_version_part=${alpine_version_part%.*}
+        if [ -z "${app_version_part}" ]
+        then
+            break
+        elif [ "${app_version_part}" = ${app_version_part%.*} ]
+        then
+            app_version_part=""
+        else
+            app_version_part=${app_version_part%.*}
+        fi
     done
 done