diff --git a/.github/workflows/nightly-security-scan.yml b/.github/workflows/nightly-security-scan.yml
index b31e3fa45..e3abac8d9 100644
--- a/.github/workflows/nightly-security-scan.yml
+++ b/.github/workflows/nightly-security-scan.yml
@@ -101,10 +101,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@master
 
-      - name: Use golang 1.17.x
+      - name: Use golang 1.18
         uses: actions/setup-go@v3
         with:
-          go-version: '>=1.17.0'
+          go-version: '1.18'
 
       - name: Use Node.js 12.x
         uses: actions/setup-node@v1
@@ -195,7 +195,7 @@ jobs:
                       "type": "section",
                       "text": {
                         "type": "mrkdwn",
-                        "text": "Code Scanning Result (*${{ github.event.repository.name}}*)\n*<${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}|GitHub Actions Workflow URL>*"
+                        "text": "Code Scanning Result (*${{ github.repository }}*)\n*<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|GitHub Actions Workflow URL>*"
                       }
                     },
                     {
diff --git a/.github/workflows/pr-security.yml b/.github/workflows/pr-security.yml
index 486a9c004..3b40c9551 100644
--- a/.github/workflows/pr-security.yml
+++ b/.github/workflows/pr-security.yml
@@ -1,8 +1,14 @@
 name: PR Code Security Scan
 
 on:
-  pull_request_review:
-    types: [edited, submitted]
+  pull_request:
+    paths:
+      - 'package.json'
+      - 'api/go.mod'
+      - 'gruntfile.js'
+      - 'build/linux/Dockerfile'
+      - 'build/linux/alpine.Dockerfile'
+      - 'build/windows/Dockerfile'
   workflow_dispatch:
     
 jobs:
@@ -125,10 +131,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@master
 
-      - name: Use golang 1.17.x
+      - name: Use golang 1.18
         uses: actions/setup-go@v3
         with:
-          go-version: '>=1.17.0'
+          go-version: '1.18'
 
       - name: Use Node.js 12.x
         uses: actions/setup-node@v1