diff --git a/trigger_pentest.sh b/trigger_pentest.sh
index b027c48..3f08281 100644
--- a/trigger_pentest.sh
+++ b/trigger_pentest.sh
@@ -1,14 +1,77 @@
+#!/bin/bash
+
+ASTRA_SCAN_START_URL="https://api.getastra.com/webhooks/integrations/ci-cd"
+ASTRA_SCAN_STATUS_URL="https://api.getastra.com/webhooks/integrations/ci-cd/scan-status"
 
-URL=https://api.getastra.com/webhooks/integrations/ci-cd
 ASTRA_SCAN_TYPE="${ASTRA_SCAN_TYPE:-lightning}"
-status_code=$(curl -s -o response.txt -w "%{http_code}" --user-agent "Astra Pentest Trigger Script/1.0" --header "Content-Type: application/json" --request POST --data "{\"accessToken\":\"$ASTRA_ACCESS_TOKEN\",\"projectId\":\"$ASTRA_PROJECT_ID\", \"mode\":\"$ASTRA_AUDIT_MODE\", \"automatedScanType\":\"$ASTRA_SCAN_TYPE\"}" $URL)
-if [[ "$status_code" == "200" ]] ; then
-  echo "✅ Astra pentest was successfully started."
+ASTRA_JOB_EXIT_STRATEGY="${ASTRA_JOB_EXIT_STRATEGY:-always_pass}"
+ASTRA_JOB_EXIT_REFETCH_INTERVAL="${ASTRA_JOB_EXIT_REFETCH_INTERVAL:-30}"
+ASTRA_JOB_EXIT_REFETCH_MAX_RETRIES="${ASTRA_JOB_EXIT_REFETCH_MAX_RETRIES:-20}"
+ASTRA_JOB_EXIT_CRITERION="${ASTRA_JOB_EXIT_CRITERION:-severityCount[\\\"high\\\"] > 0 or severityCount[\\\"critical\\\"] > 0}"
+
+
+response=$(curl -s -o response.txt -w "%{http_code}" --user-agent "Astra Pentest Trigger Script/1.1" --header "Content-Type: application/json" --request POST --data "{\"accessToken\":\"$ASTRA_ACCESS_TOKEN\",\"projectId\":\"$ASTRA_PROJECT_ID\", \"mode\":\"$ASTRA_AUDIT_MODE\", \"automatedScanType\":\"$ASTRA_SCAN_TYPE\", \"targetScopeUri\":\"$ASTRA_TARGET_SCOPE_URI\"}" "$ASTRA_SCAN_START_URL")
+status_code=$(tail -n1 <<< "$response")
+
+if [[ "$status_code" == "200" ]]; then
+  echo "✅ The Astra scan has been successfully initiated."
+  audit_id=$(awk '/"auditId"/{print $2}' RS=, FS=: response.txt | tr -d '"' | cut -d'}' -f1)
+  vulnerabilities_page_link=$(awk '/"vulnerabilitesPageLink"/{print $2}' RS=, FS=: response.txt | tr -d '"' | cut -d'}' -f1)
+  echo ""
+  echo "Webhook response:"
   cat response.txt
-elif [[ "$status_code" == "422" ]] ; then
-  echo "🟡 Cannot start an audit, because an audit might be underway."
+  echo ""
+elif [[ "$status_code" == "422" ]]; then
+  echo "🟡 Scan initiation failed. Another scan may already be in progress."
+  echo ""
+  echo "Webhook response:"
   cat response.txt
+  exit 1
 else
-  echo "⛔ Failed to start pentest."
+  echo "⛔ Scan initiation failed. HTTP status code: $status_code"
+  cat response.txt
   exit 1
 fi
+
+if [[ "$ASTRA_JOB_EXIT_STRATEGY" == "always_pass" ]]; then
+  echo "The scan is currently in progress, and you can review any detected vulnerabilities in the Astra dashboard. As the ASTRA_JOB_EXIT_STRATEGY is set to always_pass, this job will not be blocked."
+  exit 0
+fi
+
+json_data="{\"accessToken\":\"$ASTRA_ACCESS_TOKEN\",\"auditId\":\"$audit_id\",\"jobExitCriterion\":\"$ASTRA_JOB_EXIT_CRITERION\"}"
+
+for ((retry=0; retry<ASTRA_JOB_EXIT_REFETCH_MAX_RETRIES; retry++)); do
+
+  scan_status=$(curl -s -o scan_status_response.txt -w "%{http_code}" \
+  --user-agent "Astra Pentest Trigger Script/1.1" \
+  --header "Content-Type: application/json" \
+  --request POST \
+  --data "$json_data" \
+  "$ASTRA_SCAN_STATUS_URL")
+
+  if [[ "$scan_status" == "200" ]]; then
+
+    audit_progress=$(awk '/"auditProgress"/{print $2}' RS=, FS=: scan_status_response.txt | tr -d '"' | cut -d'}' -f1)
+    exit_criteria_evaluation=$(awk '/"exitCriteriaEvaluation"/{print $2}' RS=, FS=: scan_status_response.txt | tr -d '"' | cut -d'}' -f1)
+
+    if [[ "$ASTRA_JOB_EXIT_STRATEGY" == "fail_when_vulnerable" ]]; then
+      if [[ "$exit_criteria_evaluation" == "true" ]]; then
+        echo "⛔ Vulnerabilities have been detected according to the criteria defined in ASTRA_JOB_EXIT_CRITERION. Please review the Astra dashboard for a detailed list of vulnerabilities. Exiting the CI/CD job now..."
+        exit 1
+      fi
+    fi
+
+    if [[ "$audit_progress" == "reported" || "$audit_progress" == "reaudit" || "$audit_progress" == "completed" ]]; then
+      echo "✅ The scan has been successfully completed, without matching the exit criteria."
+      exit 0
+    fi
+
+    echo "🔍 The scan is currently in progress, and its status has just been refreshed."
+  else
+    echo "🟡 Unable to retrieve scan status. Retrying at the next interval..."
+  fi
+  sleep "$ASTRA_JOB_EXIT_REFETCH_INTERVAL"
+done
+
+echo "🔵 The scan is currently underway, but we are exiting this job as the ASTRA_JOB_EXIT_REFETCH_MAX_RETRIES limit has been reached."
+exit 0
\ No newline at end of file