diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 16c1633..c33807a 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -123,13 +123,22 @@ jobs:
 
       - name: Push tested eventhub image
         if: github.event_name == 'push'
+        env:
+          REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
+          GITEA_TOKEN: ${{ secrets.REGISTRY_PASSWORD }}
         run: |
           set -euo pipefail
+          APP_VERSION="$(bash scripts/resolve-product-version.sh)"
+          APP_BUILD="${GITHUB_RUN_NUMBER:-0}"
           TAG="sha-${GITHUB_SHA:0:12}"
+          VER_TAG="${APP_VERSION}.${APP_BUILD}"
           docker tag eventhub:latest "${REGISTRY}/eventhub:${TAG}"
+          docker tag eventhub:latest "${REGISTRY}/eventhub:${VER_TAG}"
           docker tag eventhub:latest "${REGISTRY}/eventhub:ift"
           docker tag eventhub:latest "${REGISTRY}/eventhub:dev"
+          echo "Push tags: ${TAG} ${VER_TAG} ift dev"
           bash scripts/retry-docker-build.sh 5 30 -- docker push "${REGISTRY}/eventhub:${TAG}"
+          bash scripts/retry-docker-build.sh 5 30 -- docker push "${REGISTRY}/eventhub:${VER_TAG}"
           bash scripts/retry-docker-build.sh 5 30 -- docker push "${REGISTRY}/eventhub:ift"
           bash scripts/retry-docker-build.sh 5 30 -- docker push "${REGISTRY}/eventhub:dev"