diff --git a/.github/workflows/ansible-aws-image-build.yml b/.github/workflows/ansible-aws-image-build.yml
index 528b8b71..027f0acb 100644
--- a/.github/workflows/ansible-aws-image-build.yml
+++ b/.github/workflows/ansible-aws-image-build.yml
@@ -56,7 +56,7 @@ jobs:
           path: /tmp/ansible-aws-image.tar
           retention-days: 1
 
-  scan-observer-image:
+  scan-image:
     name: Scan Image
     needs: build-image
     permissions:
@@ -93,12 +93,12 @@ jobs:
           scan-type: 'image'
           trivyignores: 'docker/delius-ansible-aws/.trivyignore'
           ignore-unfixed: 'true'
-          output: 'trivy-results-observer.sarif'
+          output: 'trivy-results.sarif'
       - name: Upload Trivy scan results to GitHub Security tab
         uses: github/codeql-action/upload-sarif@v3
         if: failure() # If Trivy found vulnerabilities
         with:
-          sarif_file: 'trivy-results-observer.sarif'
+          sarif_file: 'trivy-results.sarif'
 
   publish-image:
     name: Publish image
diff --git a/.github/workflows/oracle-observer-image-build.yml b/.github/workflows/oracle-observer-image-build.yml
index a8d74185..bcf9c50f 100644
--- a/.github/workflows/oracle-observer-image-build.yml
+++ b/.github/workflows/oracle-observer-image-build.yml
@@ -72,7 +72,7 @@ jobs:
           name: oracle-client-zip
           path: /tmp/LINUX.X64_193000_client.zip
 
-  build-image:
+  build-observer-image:
     runs-on: ubuntu-22.04
     needs: download-client-software
 
@@ -112,9 +112,9 @@ jobs:
           path: /tmp/oracle-observer-image.tar
           retention-days: 1
 
-  scan-image:
+  scan-observer-image:
     name: Scan Image
-    needs: build-image
+    needs: build-observer-image
     permissions:
       # required for all workflows
       security-events: write
@@ -156,9 +156,9 @@ jobs:
         with:
           sarif_file: 'trivy-results.sarif'
 
-  publish-image:
+  publish-observer-image:
     name: Publish image
-    needs: [build-image, scan-image]
+    needs: [build-observer-image, scan-observer-image]
     permissions:
       contents: write
       packages: write