diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3bdf33cf..504ec5bd 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -20,9 +20,13 @@ jobs:
     - name: Build with Maven
       run: mvn  package
 
-    - name: Run Shell Commands
+  FS_Scan:
+
+    runs-on: self-hosted
+    steps:
+    - name: Trivy FS Scan
       run: |
-        trivy fs --format table -o trivy.report .
+        trivy fs --format table -o trivy-fs-report.html .
 
     - name: SonarQube Scan
       uses: sonarsource/sonarqube-scan-action@master
@@ -52,7 +56,11 @@ jobs:
 
     - name: Build Docker Image
       run: |
-        docker build -t adijaiswal/board:latest .
+        docker build -t adijaiswal/boardgame:latest .
+
+    - name: Trivy Image Scan
+      run: |
+        trivy image --format table -o trivy-image-report.html adijaiswal/board:latest
     
     - name: Login to Docker Hub
       uses: docker/login-action@v3
@@ -62,6 +70,6 @@ jobs:
 
     - name: Push Docker Image
       run: |
-          docker push adijaiswal/board:latest
+          docker push adijaiswal/boardgame:latest