diff --git a/.gitea/workflows/build-push.yaml b/.gitea/workflows/build-push.yaml
index 11d2595..18c4844 100644
--- a/.gitea/workflows/build-push.yaml
+++ b/.gitea/workflows/build-push.yaml
@@ -56,9 +56,14 @@ jobs:
 
       - name: Build and tag image
         run: |
-          podman build -t ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${IMAGE_TAGS[0]} .
-          for tag in "${IMAGE_TAGS[@]:1}"; do
-            podman tag ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${IMAGE_TAGS[0]} \
+          tags=(${{ env.IMAGE_TAGS }})
+          sep=""
+          if [[ -n "${tags[1]}" ]] ; then
+             sep=":"
+          fi
+          podman build -t ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}${sep}${tags[1]} .
+          for tag in "${tags[@]:1}" ; do
+            podman tag ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${tags[1]} \
                        ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${tag}
           done
 
@@ -82,7 +87,12 @@ jobs:
 
       - name: Push image to registry
         run: |
-          for tag in ${{ env.IMAGE_TAGS }}; do
+          tags=(${{ env.IMAGE_TAGS }})
+          sep=""
+          if [[ -n "${tags[1]}" ]] ; then
+             sep=":"
+          fi
+          for tag in "${tags[@]}" ; do
             podman push ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:$tag
           done