diff --git a/action.yaml b/action.yaml
index 50396df..22580ec 100644
--- a/action.yaml
+++ b/action.yaml
@@ -17,6 +17,10 @@ inputs:
     required: false
     default: "europe-docker.pkg.dev/puzzle-and-play/docker"
 
+  tag_commit:
+    required: false
+    default: true
+
 runs:
   using: composite
   steps:
@@ -27,6 +31,7 @@ runs:
         IMAGE_LOCAL_TAG: "${{ inputs.image_local_tag }}"
         IMAGE_REMOTE_NAME: "${{ inputs.repository_location }}/${{ inputs.image_name }}"
         IMAGE_REMOTE_TAG: "${{ inputs.image_remote_tag }}"
+        TAG_COMMIT: "${{ inputs.tag_commit }}"
 
       run: |
         : ${IMAGE_REMOTE_TAG:="${{ github.ref_name }}-${{ github.run_number }}"}
@@ -37,3 +42,10 @@ runs:
           "$IMAGE_REMOTE_NAME:$IMAGE_REMOTE_TAG"
 
         docker push "$IMAGE_REMOTE_NAME:$IMAGE_REMOTE_TAG"
+
+        if [[ "$TAG_COMMIT" == "true" ]]; then
+          TAG_NAME="image-$IMAGE_REMOTE_TAG"
+          echo "tagging commit with $TAG_NAME"
+          git tag "$TAG_NAME"
+          git push origin $TAG_NAME
+        fi