diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml
index c45e453c7..f0041ecd0 100644
--- a/.github/workflows/on-tag.yml
+++ b/.github/workflows/on-tag.yml
@@ -34,6 +34,9 @@ jobs:
       - name: Checkout project
         uses: actions/checkout@v2
 
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+
       - name: Init repo for Dockerization
         run: docker/init.sh "$TAG"
 
@@ -65,6 +68,7 @@ jobs:
           --platform linux/amd64,linux/arm64,linux/arm/v7 \
           --tag ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:$TAG \
           --output "type=registry" ./${{ matrix.service }}/
+          --build-arg commitHash=$SHORT_SHA
 
       - name: Run Docker buildx for ${{ matrix.service }} against latest
         run: |
@@ -74,4 +78,5 @@ jobs:
           --platform linux/amd64,linux/arm64,linux/arm/v7 \
           --tag ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:latest \
           --output "type=registry" ./${{ matrix.service }}/
+          --build-arg commitHash=$SHORT_SHA