diff --git a/action.yaml b/action.yaml
index 232f80e..a3eea28 100644
--- a/action.yaml
+++ b/action.yaml
@@ -66,8 +66,17 @@ runs:
         echo "DEBUG=ON" >> $GITHUB_ENV
         debug Debug switch on
 
+    - name: Set healthcheck enabled flag
+      shell: bash
+      run: |
+        if [[ "${{ inputs.check_server }}" != "" && "${{ inputs.check_uuid }}" != "" ]]; then
+          echo "HEALTHCHECK_ENABLED=true" >> $GITHUB_ENV
+        else
+          echo "HEALTHCHECK_ENABLED=false" >> $GITHUB_ENV
+        fi
+
     - name: Start the job
-      if: inputs.check_server != '' && inputs.check_uuid != ''
+      if: env.HEALTHCHECK_ENABLED == 'true'
       uses: https://gargoton.petite-maison-orange.fr/pmo-actions/healthchecks-ping@main
       with:
         check_server: ${{ inputs.check_server }}
@@ -107,7 +116,7 @@ runs:
         fi
 
     - name: Build image starting
-      if: inputs.check_server != '' && inputs.check_uuid != ''
+      if: env.HEALTHCHECK_ENABLED == 'true'
       uses: https://gargoton.petite-maison-orange.fr/pmo-actions/healthchecks-ping@main
       with:
         check_server: ${{ inputs.check_server }}
@@ -122,7 +131,7 @@ runs:
         echo "IMAGE_TAGS=${{ inputs.image_tags }}" >> $GITHUB_ENV
 
     - name: Add PMO version tag
-      if: inputs.add_version_tag
+      if: inputs.add_version_tag == 'true'
       run: |
         source "${{ github.action_path }}/../bashlib.sh"
         echo "IMAGE_TAGS=${{ env.IMAGE_TAGS }} pmo-${{ steps.get_version.outputs.version }}" >> $GITHUB_ENV
@@ -138,7 +147,7 @@ runs:
         debug: ${{ inputs.debug }}
 
     - name: Canceled building
-      if: cancelled() && inputs.check_server != '' && inputs.check_uuid != ''
+      if: cancelled() && env.HEALTHCHECK_ENABLED == 'true'
       uses: https://gargoton.petite-maison-orange.fr/pmo-actions/healthchecks-ping@main
       with:
         check_server: ${{ inputs.check_server }}
@@ -148,7 +157,7 @@ runs:
         debug: ${{ inputs.debug }}
 
     - name: Build image failed
-      if: failure() && inputs.check_server != '' && inputs.check_uuid != ''
+      if: failure() && env.HEALTHCHECK_ENABLED == 'true'
       uses: https://gargoton.petite-maison-orange.fr/pmo-actions/healthchecks-ping@main
       with:
         check_server: ${{ inputs.check_server }}
@@ -158,7 +167,7 @@ runs:
         debug: ${{ inputs.debug }}
 
     - name: Image built and tagged
-      if: inputs.check_server != '' && inputs.check_uuid != ''
+      if: env.HEALTHCHECK_ENABLED == 'true'
       uses: https://gargoton.petite-maison-orange.fr/pmo-actions/healthchecks-ping@main
       with:
         check_server: ${{ inputs.check_server }}
@@ -180,7 +189,7 @@ runs:
         debug: ${{ inputs.debug }}
 
     - name: Push image failed
-      if: failure() && inputs.check_server != '' && inputs.check_uuid != ''
+      if: failure() && env.HEALTHCHECK_ENABLED == 'true'
       uses: https://gargoton.petite-maison-orange.fr/pmo-actions/healthchecks-ping@main
       with:
         check_server: ${{ inputs.check_server }}
@@ -190,7 +199,7 @@ runs:
         debug: ${{ inputs.debug }}
 
     - name: End of the image building
-      if: inputs.check_server != '' && inputs.check_uuid != ''
+      if: env.HEALTHCHECK_ENABLED == 'true'
       uses: https://gargoton.petite-maison-orange.fr/pmo-actions/healthchecks-ping@main
       with:
         check_server: ${{ inputs.check_server }}