diff --git a/.github/workflows/build-steps.yml b/.github/workflows/build-steps.yml
index cbc2133223..a35687a563 100644
--- a/.github/workflows/build-steps.yml
+++ b/.github/workflows/build-steps.yml
@@ -186,8 +186,8 @@ jobs:
             ls -l /__w/OpenImageIO/OpenImageIO/bw_output
             echo "BUILD_OUTPUT_DIR is " "${{ env.BUILD_WRAPPER_OUT_DIR }}"
             find . -name "*.gcov" -print
-            # sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
-            time sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.build-wrapper-output="$BUILD_WRAPPER_OUT_DIR" --define sonar.cfamily.gcov.reportsPath="_coverage" --define sonar.cfamily.threads="$PARALLEL"
+            # sonar-scanner --define sonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json"
+            time sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.compile-commands="$BUILD_WRAPPER_OUT_DIR/compile_commands.json" --define sonar.cfamily.gcov.reportsPath="_coverage" --define sonar.cfamily.threads="$PARALLEL"
         # Consult https://docs.sonarcloud.io/advanced-setup/ci-based-analysis/sonarscanner-cli/ for more information and options
       - name: Check ABI
         if: inputs.abi_check != ''
diff --git a/sonar-project.properties b/sonar-project.properties
index d988b8e397..e3a05e7aad 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -21,7 +21,6 @@ sonar.exclusions=src/doc/**,src/build-scripts/**,src/include/OpenImageIO/detail/
 sonar.sourceEncoding=UTF-8
 
 # C/C++ analyzer properties
-sonar.cfamily.build-wrapper-output=/__w/OpenImageIO/OpenImageIO/bw_output
 sonar.cfamily.gcov.reportsPath=_coverage
 sonar.coverage.exclusions=src/iv/**,src/include/OpenImageIO/detail/pugixml/**,src/include/OpenImageIO/detail/fmt/**,src/libOpenImageIO/kissfft.hh