diff --git a/.github/workflows/halyard-oes.yml b/.github/workflows/halyard-oes.yml
index f6f79ed465..2d90fca39d 100644
--- a/.github/workflows/halyard-oes.yml
+++ b/.github/workflows/halyard-oes.yml
@@ -29,7 +29,13 @@ jobs:
         id: build_variables
         run: |
           echo ::set-output name=REPO::ubi8-halyard-cve
-          echo ::set-output name=VERSION::"1.55.1$(date --utc +'%Y%m%d%H%M')"
+          
+          #echo ::set-output name=VERSION::"1.55.1$(date --utc +'%Y%m%d%H%M')"
+          #echo ::set-output name=VERSION::"1.55.1$(date --utc +'%Y%m%d')"
+          #echo ::set-output name=VERSION::"1.55.1$(date --utc +'%-m%d')"
+          echo ::set-output name=VERSION::"1.55.1"
+          echo "::set-output name=GITHASH::$(git rev-parse --short HEAD)"
+          echo "::set-output name=BUILDDATE::$(date -u +"%Y%m%d%H%M")"
       - name: Login to Quay
         uses: docker/login-action@v1
         # use service account flow defined at: https://github.com/docker/login-action#service-account-based-authentication-1
@@ -59,4 +65,5 @@ jobs:
           file: docker/ubi8/Dockerfile-fips
           push: true
           tags: |
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}" 
+            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-${{ steps.build_variables.outputs.GITHASH }}-${{ steps.build_variables.outputs.BUILDDATE }}"
+