diff --git a/.github/workflows/quay.yml b/.github/workflows/quay.yml
index 9b225e7..9b3e575 100644
--- a/.github/workflows/quay.yml
+++ b/.github/workflows/quay.yml
@@ -34,7 +34,7 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_ROBOT_TOKEN }}
 
-      # Craft image tags
+      # Craft image tags and version
       - name: Craft image tags
         id: tags
         run: |
@@ -44,8 +44,13 @@ jobs:
             echo "quay.io/fgiudici/headertrace:${{ github.ref_name }}" >> $GITHUB_OUTPUT
             echo "quay.io/fgiudici/headertrace:latest" >> $GITHUB_OUTPUT
             echo "EOF" >> $GITHUB_OUTPUT
+            echo "version=${{ github.ref_name }}" >> $GITHUB_OUTPUT
           else
-            echo "tags=quay.io/fgiudici/headertrace:${{ github.event.inputs.image-tag }}" >> $GITHUB_OUTPUT
+            INPUT_TAG="${{ github.event.inputs.image-tag }}"
+            SAFE_TAG="${INPUT_TAG//$'\n'/}"
+            SAFE_TAG="${SAFE_TAG//$'\r'/}"
+            echo "tags=quay.io/fgiudici/headertrace:${SAFE_TAG}" >> $GITHUB_OUTPUT
+            echo "version=${SAFE_TAG}" >> $GITHUB_OUTPUT
           fi
 
       # Build and Push
@@ -58,3 +63,6 @@ jobs:
           platforms: linux/amd64,linux/arm64
           tags: |
             ${{ steps.tags.outputs.tags }}
+          build-args: |
+            VERSION=${{ steps.tags.outputs.version }}
+            COMMIT=${{ github.sha }}