diff --git a/.github/workflows/images_build_rhel.yml b/.github/workflows/images_build_rhel.yml
index b1703624f..7d501c98b 100644
--- a/.github/workflows/images_build_rhel.yml
+++ b/.github/workflows/images_build_rhel.yml
@@ -274,6 +274,7 @@ jobs:
           key: ${{ env.BASE_BUILD_NAME }}-${{ matrix.arch }}-${{ github.run_id }}
 
       - name: Push image to local storage
+        id: push_image
         env:
           IMAGE_TAG: ${{ steps.image_metadata.outputs.image_tag }}
           IMAGE_TAG_ID: ${{ steps.image_metadata.outputs.image_tag_id }}
@@ -305,6 +306,15 @@ jobs:
 
             echo "::endgroup::"
 
+      - name: Post build image
+        if: ${{ (cancelled() || failure()) && ( steps.push_image.outcome == 'failure' || steps.push_image.outcome == 'cancelled') }}
+        env:
+          IMAGE_TAG_ID: ${{ steps.image_metadata.outputs.image_tag_id }}
+        run: |
+            echo "::group::Removing orphaned image"
+            rm -rf "${IMAGE_DIR}/${IMAGE_TAG_ID}"
+            echo "::endgroup::"
+
   build_base_database:
     timeout-minutes: 180
     needs: [ "build_base", "init_build"]
@@ -423,6 +433,7 @@ jobs:
           key: ${{ matrix.build }}-${{ matrix.arch }}-${{ github.run_id }}
 
       - name: Push image to local storage
+        id: push_image
         env:
           IMAGE_TAG: ${{ steps.image_metadata.outputs.image_tag }}
           IMAGE_TAG_ID: ${{ steps.image_metadata.outputs.image_tag_id }}
@@ -454,6 +465,15 @@ jobs:
 
             echo "::endgroup::"
 
+      - name: Post build image
+        if: ${{ (cancelled() || failure()) && ( steps.push_image.outcome == 'failure' || steps.push_image.outcome == 'cancelled') }}
+        env:
+          IMAGE_TAG_ID: ${{ steps.image_metadata.outputs.image_tag_id }}
+        run: |
+            echo "::group::Removing orphaned image"
+            rm -rf "${IMAGE_DIR}/${IMAGE_TAG_ID}"
+            echo "::endgroup::"
+
   build_images:
     timeout-minutes: 90
     needs: [ "build_base_database", "init_build"]