diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 26a28ec..3ffcc0c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,17 +34,18 @@ jobs:
         run: dotnet build -c Release --no-restore
 
       - name: Test
+        if: ${{ success() }}
         run: dotnet test -c Release --no-restore
 
       - name: Update Release Drafter
-        if: github.ref == 'refs/heads/main'
+        if: ${{ success() }} and github.ref == 'refs/heads/main'
         id: last_release
         uses: release-drafter/release-drafter@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to DockerHub
-        if: github.ref == 'refs/heads/main'
+        if: ${{ success() }} and github.ref == 'refs/heads/main'
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -53,7 +54,7 @@ jobs:
        ##ref: https://docs.docker.com/language/golang/configure-ci-cd/
        ##ref: https://event-driven.io/en/how_to_buid_and_push_docker_image_with_github_actions
       - name: Build Docker Image
-        if: github.ref == 'refs/heads/main'
+        if: ${{ success() }} and github.ref == 'refs/heads/main'
         run: |
           docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-flight:${{ steps.last_release.outputs.tag_name }} -f "${{ github.workspace }}/src/Services/Flight/Dockerfile" .
           docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-identity:${{ steps.last_release.outputs.tag_name }} -f "${{ github.workspace }}/src/Services/Identity/Dockerfile" .
@@ -61,7 +62,7 @@ jobs:
           docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-booking:${{ steps.last_release.outputs.tag_name }} -f "${{ github.workspace }}/src/Services/Booking/Dockerfile" .
 
       - name: Publish Docker Image
-        if: github.ref == 'refs/heads/main'
+        if: ${{ success() }} and github.ref == 'refs/heads/main'
         run: |
           docker push ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-flight:${{ steps.last_release.outputs.tag_name }}
           docker push ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-identity:${{ steps.last_release.outputs.tag_name }}