diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
index 1dae00d6..643793d7 100644
--- a/.github/workflows/ci-pr.yml
+++ b/.github/workflows/ci-pr.yml
@@ -103,14 +103,9 @@ jobs:
               -PspringBootVersion="$BOOT_VERSION" \
               -PsampleTests \
               :runAllSampleTests
-  scan:
-    needs: [prerequisites]
-    if: needs.prerequisites.outputs.runjobs
-    uses: ./.github/workflows/trivy-scan.yml
-
   done:
     runs-on: ubuntu-latest
-    needs: [ build_and_verify, check_samples, scan ]
+    needs: [ build_and_verify, check_samples ]
     steps:
       - name: 'Done'
         shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8258fcda..c9c6b658 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,6 +7,12 @@ on:
     paths-ignore:
       - '.github/**'
   workflow_dispatch:
+    inputs:
+      run-trivy-scan:
+        description: 'Run Trivy scan ?'
+        default: false
+        required: false
+        type: boolean
 
 env:
   GCHAT_WEBHOOK_URL: ${{ secrets.SPRING_RELEASE_GCHAT_WEBHOOK_URL }}
@@ -91,7 +97,7 @@ jobs:
               :runAllSampleTests
   scan:
     needs: [prerequisites]
-    if: needs.prerequisites.outputs.runjobs
+    if: ${{ needs.prerequisites.outputs.runjobs && inputs.run-trivy-scan }}
     uses: ./.github/workflows/trivy-scan.yml
   deploy_artifacts:
     name: Deploy Artifacts