diff --git a/.github/actions/veracode-create-jira-ticket/action.yml b/.github/actions/veracode-create-jira-ticket/action.yml
index b8e3c95245..bbff79f172 100644
--- a/.github/actions/veracode-create-jira-ticket/action.yml
+++ b/.github/actions/veracode-create-jira-ticket/action.yml
@@ -41,11 +41,6 @@ runs:
     - name: Create Jira Issue
       if: ${{ env.abort_ticket_creation != 'true' }}
       run: |
-        component_name="${{ inputs.module_name }}"
-        if [[ "${{ inputs.module_name }}" == "centreon" ]]; then
-          component_name="centreon-web"
-        fi
-
         DATA=$( cat <<-EOF
         {
           "fields": {
diff --git a/.github/workflows/veracode-analysis.yml b/.github/workflows/veracode-analysis.yml
index 2e421fece5..606a9a7f91 100644
--- a/.github/workflows/veracode-analysis.yml
+++ b/.github/workflows/veracode-analysis.yml
@@ -136,7 +136,7 @@ jobs:
 
       - name: Backup analysis reports
         # debug step used to investigate support case
-        if: vars.VERACODE_BACKUP_DEBUG == 'true' || failure()
+        if: vars.VERACODE_BACKUP_DEBUG == 'true' || (failure() && github.event.pull_request.draft == false)
         run: |
           echo "[DEBUG] downloaded baseline details in /tmp"
           ls -la /tmp
@@ -202,7 +202,7 @@ jobs:
 
       - name: Save baseline files
         # only baseline files not generated from a development branch are saved
-        if: vars.VERACODE_BACKUP_DEBUG == 'true' || failure()
+        if: vars.VERACODE_BACKUP_DEBUG == 'true' || (failure() && github.event.pull_request.draft == false)
         run: |
           BRANCHES=(dev master)
           for BRANCH in "${BRANCHES[@]}"; do