diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
deleted file mode 100644
index 36fb221..0000000
--- a/.github/workflows/codeql-analysis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: "CodeQL"
-
-on:
-  # workflow_dispatch enables manual triggering of the workflow
-  workflow_dispatch:
-  schedule:
-  - cron: '57 16 * * 6'
-env:
-  FAST_EMAIL: ${{ secrets.FAST_EMAIL }}
-  FAST_USER: ${{ secrets.FAST_USER }}
-  FAST_TOKEN: ${{ secrets.FAST_TOKEN }}
-  FAST_HTTPAUTH: ${{ secrets.FAST_HTTPAUTH }}
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    steps:
-    - name: S24 static application security testing (SAST) action
-      uses: scout24/s24-sast-action@v1
-      with:
-        languages: java
-        fast_user: ${{ env.FAST_USER }}
-        fast_token: ${{ env.FAST_TOKEN }}
-        java_version: '11'
-
diff --git a/.github/workflows/security-analysis.yml b/.github/workflows/security-analysis.yml
new file mode 100644
index 0000000..a9f0f9c
--- /dev/null
+++ b/.github/workflows/security-analysis.yml
@@ -0,0 +1,24 @@
+name: "Security Static Analysis"
+
+on:
+  pull_request: {}
+  workflow_dispatch: {}
+  push:
+    branches:
+    - main
+    - master
+  schedule:
+  - cron: '48 9 27 * *'
+jobs:
+  scan:
+    name: "Security Static Analysis"
+    runs-on: ubuntu-latest
+
+    # Skip any PR created by dependabot:
+    if: (github.actor != 'dependabot[bot]')
+
+    steps:
+    - uses: scout24/s24-sast-action@v2
+      with:
+        SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
+