diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml
index 2c1714b10..846a23f2c 100644
--- a/.github/workflows/semgrep.yml
+++ b/.github/workflows/semgrep.yml
@@ -15,23 +15,18 @@ jobs:
       actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
     runs-on: ubuntu-latest
     container:
-      image: returntocorp/semgrep
+      image: semgrep/semgrep
 
     steps:
       - uses: actions/checkout@v4
-
-      - name: Checkout semgrep-rules repo
-        uses: actions/checkout@v4
         with:
-          repository: sourcegraph/security-semgrep-rules
-          token: ${{ secrets.GH_SEMGREP_SAST_TOKEN }}
-          path: semgrep-rules
+          fetch-depth: 0
 
       - name: Run Semgrep SAST Scan
-        run: |
-          mv semgrep-rules ../
-          semgrep ci -f ../semgrep-rules/semgrep-rules/ --metrics=off --oss-only --suppress-errors --sarif -o results.sarif --exclude='semgrep-rules' --baseline-commit "$(git merge-base main HEAD)" || true
+        run: semgrep scan --config p/default --metrics=off --sarif --sarif-output=results.sarif --baseline-commit "${{ github.event.pull_request.base.sha }}"
+
       - name: Upload SARIF file
+        if: always()
         uses: github/codeql-action/upload-sarif@v3
         with:
-          sarif_file: results.sarif
\ No newline at end of file
+          sarif_file: results.sarif
diff --git a/.github/workflows/vulnerability-triage.yml b/.github/workflows/vulnerability-triage.yml
index b2236b873..433fa62b4 100644
--- a/.github/workflows/vulnerability-triage.yml
+++ b/.github/workflows/vulnerability-triage.yml
@@ -9,6 +9,7 @@ permissions:
   contents: read
   packages: read
   security-events: read
+  vulnerability-alerts: read
   id-token: write
 
 jobs: