diff --git a/build-scripts/image.sh b/build-scripts/image.sh
index 0a5bafc..b649544 100755
--- a/build-scripts/image.sh
+++ b/build-scripts/image.sh
@@ -25,14 +25,22 @@ gobool_to_int() {
 
 NGX_DEBUG=$(gobool_to_int "${NGX_DEBUG:-0}" 0)
 case "${NGX_DEBUG}" in
-0 ) img="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-${ANGIE_VERSION}" ;;
-1 ) img="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-${ANGIE_VERSION}-debug" ;;
+0 )
+	img="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}"
+	img_fq="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-${ANGIE_VERSION}"
+;;
+1 )
+	img="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-debug"
+	img_fq="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-${ANGIE_VERSION}-debug"
+;;
 esac
 
-exec buildah bud \
+buildah bud \
   -f ./Dockerfile \
-  -t "${img}" \
+  -t "${img_fq}" \
   --env "ANGIE_VERSION=${ANGIE_VERSION}" \
   --env "NGX_DEBUG=${NGX_DEBUG}" \
   --pull=missing --no-cache \
   --build-arg "IMAGE_VERSION=${IMAGE_VERSION}" \
+
+podman tag "${img_fq}" "${img}"