diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 54719b0..3a9bea5 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -30,13 +30,16 @@ jobs:
           FULL_SHA=$(git rev-parse HEAD)
           IMAGE="git.kubebase.de/${{ gitea.repository }}"
           if [ "${{ gitea.ref_type }}" = "tag" ]; then VERSION="${{ gitea.ref_name }}"; else VERSION=""; fi
+          TAGS="-t ${IMAGE}:sha-${SHA} -t ${IMAGE}:latest"
+          if [ -n "$VERSION" ]; then TAGS="${TAGS} -t ${IMAGE}:${VERSION}"; fi
           docker build --no-cache \
             --build-arg COMMIT_SHA="$FULL_SHA" \
             --build-arg BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
             --build-arg VERSION="$VERSION" \
-            -t "${IMAGE}:sha-${SHA}" -t "${IMAGE}:latest" .
+            $TAGS .
           docker push "${IMAGE}:sha-${SHA}"
           docker push "${IMAGE}:latest"
+          if [ -n "$VERSION" ]; then docker push "${IMAGE}:${VERSION}"; fi
 
       - name: Update k8s manifest in admin/apps
         env: