diff --git a/.github/workflows/build_and_push_dev.yaml b/.github/workflows/build_and_push_dev.yaml
index 32637de60..f1e586b96 100644
--- a/.github/workflows/build_and_push_dev.yaml
+++ b/.github/workflows/build_and_push_dev.yaml
@@ -29,6 +29,7 @@ jobs:
       - name: Create dev image tag
         run: |
           echo "DEV_TAG=dev-$(date +%Y%m%d)-$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+          echo "SHORT_COMMIT=$(git rev-parse --short=7 HEAD)" >> $GITHUB_ENV
           echo "dev image tag: ${{ env.DEV_TAG }}"
       - name: Build image with Buildah
         id: build_image
@@ -37,6 +38,7 @@ jobs:
           image: ${{ env.IMAGE_NAME }}
           tags: |
             ${{ env.DEV_TAG }}
+            ${{ env.SHORT_COMMIT }}
             ${{ env.LATEST_TAG }}
           containerfiles: |
             ${{ env.CONTAINER_FILE }}
diff --git a/.tekton/lightspeed-stack-push.yaml b/.tekton/lightspeed-stack-push.yaml
index 7b5844eab..a6d2b6532 100644
--- a/.tekton/lightspeed-stack-push.yaml
+++ b/.tekton/lightspeed-stack-push.yaml
@@ -557,6 +557,9 @@ spec:
         value: $(tasks.build-image-index.results.IMAGE_URL)
       - name: IMAGE_DIGEST
         value: $(tasks.build-image-index.results.IMAGE_DIGEST)
+      - name: ADDITIONAL_TAGS
+        value:
+          - $(tasks.clone-repository.results.short-commit)
       runAfter:
       - build-image-index
       taskRef: