diff --git a/.github/workflows/zap-baseline-scan.yaml b/.github/workflows/zap-baseline-scan.yaml
new file mode 100644
index 00000000..6b32723a
--- /dev/null
+++ b/.github/workflows/zap-baseline-scan.yaml
@@ -0,0 +1,23 @@
+name: ZAP Baseline Scan
+on:
+  workflow_dispatch:
+    inputs:
+      envname:
+        description: 'dev or test'
+        required: true
+        default: 15
+jobs:
+
+  zap-baseline-scan:
+    runs-on: ubuntu-latest
+    steps:
+      - name: ZAP Full Scan on Frontend
+        uses: zaproxy/action-full-scan@v0.8.0
+        with:
+          target: "https://itvr-${{ github.event.inputs.envname }}.apps.silver.devops.gov.bc.ca"
+          issue_title: "ZAP ${{ github.event.inputs.envname }} Frontend Baseline Scan Report"
+      - name: ZAP Full Scan on Backend
+        uses: zaproxy/action-full-scan@v0.8.0
+        with:
+          target: 'https://itvr-backend-${{ github.event.inputs.envname }}.apps.silver.devops.gov.bc.ca'
+          issue_title: "ZAP ${{ github.event.inputs.envname }} Backend Baseline Scan Report"
\ No newline at end of file
diff --git a/.github/workflows/zap-scan.yaml b/.github/workflows/zap-full-scan.yaml
similarity index 88%
rename from .github/workflows/zap-scan.yaml
rename to .github/workflows/zap-full-scan.yaml
index f5fa90ae..fba7db82 100644
--- a/.github/workflows/zap-scan.yaml
+++ b/.github/workflows/zap-full-scan.yaml
@@ -24,7 +24,9 @@ jobs:
         uses: zaproxy/action-full-scan@v0.8.0
         with:
           target: 'https://itvr-test.apps.silver.devops.gov.bc.ca'
+          issue_title: ZAP Test Frontend Baseline Scan Report
       - name: ZAP Full Scan on Backend
         uses: zaproxy/action-full-scan@v0.8.0
         with:
-          target: 'https://itvr-backend-test.apps.silver.devops.gov.bc.ca'
\ No newline at end of file
+          target: 'https://itvr-backend-test.apps.silver.devops.gov.bc.ca'
+          issue_title: ZAP Test Backend Baseline Scan Report
\ No newline at end of file