diff --git a/.github/workflows/build-for-test.yml b/.github/workflows/build-for-test.yml
index fe84181f..50e9cc3c 100644
--- a/.github/workflows/build-for-test.yml
+++ b/.github/workflows/build-for-test.yml
@@ -20,34 +20,34 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       
-      - name: Build and push
+      - name: Build and push goose
         uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile.goose
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/sgroups.goose:${{ github.head_ref || github.ref_name }} 
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/sgroups.goose:${{ github.head_ref || github.ref_name }}-${{ github.sha }} 
 
-      - name: Build and push
+      - name: Build and push sgroups
         uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile.sgroups
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/sgroups:${{ github.head_ref || github.ref_name }} 
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/sgroups:${{ github.head_ref || github.ref_name }}-${{ github.sha }}
 
-      - name: Build and push
+      - name: Build and push terraform
         uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile.terraform
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/sgroups.terraform:${{ github.head_ref || github.ref_name }} 
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/sgroups.terraform:${{ github.head_ref || github.ref_name }}-${{ github.sha }}
 
-      - name: Build and push
+      - name: Build and push to-nft
         uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile.to-nft
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/sgroups.to-nft:${{ github.head_ref || github.ref_name }} 
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/sgroups.to-nft:${{ github.head_ref || github.ref_name }}-${{ github.sha }}