diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml
new file mode 100644
index 00000000..975769a5
--- /dev/null
+++ b/.github/workflows/semgrep.yml
@@ -0,0 +1,22 @@
+name: Semgrep
+
+on:
+  pull_request: {}
+  push:
+    branches:
+      - master
+      - '201[7-9][0-1][0-9]'
+      - '202[0-9][0-1][0-9]'
+
+jobs:
+  semgrep:
+    if: github.repository_owner == 'sonic-net'
+    name: Semgrep
+    runs-on: ubuntu-latest
+    container:
+      image: returntocorp/semgrep
+    steps:
+      - uses: actions/checkout@v3
+      - run: semgrep ci
+        env:
+           SEMGREP_RULES: p/default
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7d24de07..546a3331 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -14,24 +14,6 @@ pr:
     - master
 
 stages:
-- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-  - stage: Analysis
-    dependsOn: []
-    jobs:
-    - job:
-      displayName: "Semgrep"
-      pool:
-        vmImage: ubuntu-latest
-      steps:
-      - script: |
-          set -ex
-          target_branch=origin/$(System.PullRequest.TargetBranch)
-          files_changed=$(git --no-pager diff $target_branch..HEAD --name-only --diff-filter=d)
-          python -m pip install --upgrade pip
-          pip install semgrep
-          semgrep --config "p/default" --error $files_changed
-        displayName: 'Run Semgrep'
-
 - stage: Build
   jobs:
   - job: