diff --git a/.github/workflows/reusable-dotnet-quality.yml b/.github/workflows/reusable-dotnet-quality.yml
index 00ff5f1..5ff8b77 100644
--- a/.github/workflows/reusable-dotnet-quality.yml
+++ b/.github/workflows/reusable-dotnet-quality.yml
@@ -137,14 +137,17 @@ jobs:
         if: ${{ inputs.fossa-enabled }}
         uses: fossas/fossa-action@v1.8.0
         id: fossa
+        # https://status.fossa.com/
+        continue-on-error: true
+        timeout-minutes: 3
         with:
           api-key: "${{ secrets.fossa-api-key }}"
           run-tests: ${{ inputs.fossa-test && github.event_name == 'pull_request' }}
           test-diff-revision: ${{ github.event.pull_request.base.sha }}
           generate-report: html
       - name: Create FOSSA report file
+        if: ${{ inputs.fossa-enabled && steps.fossa.outputs.report != '' }}
         run: echo '${{ steps.fossa.outputs.report }}' > report/fossa.html
-        if: ${{ inputs.fossa-enabled }}
       - name: Generate SBOM with Syft
         uses: anchore/sbom-action@v0
         # with:
diff --git a/actions/dotnet/build-test-sonar/action.yml b/actions/dotnet/build-test-sonar/action.yml
index 5826723..3d9331d 100644
--- a/actions/dotnet/build-test-sonar/action.yml
+++ b/actions/dotnet/build-test-sonar/action.yml
@@ -60,10 +60,16 @@ runs:
       shell: bash
     - name: Start code analysis
       run: |
-        ./.sonar/scanner/dotnet-sonarscanner begin /k:"${{ inputs.sonar-project-key }}" /o:"${{ inputs.sonar-organization }}" \
-          /n:"${{ inputs.sonar-project-name }}" /d:sonar.token="${{ inputs.sonar-token}}" /d:sonar.host.url="${{ inputs.sonar-host-url }}" \
-          /d:sonar.cpd.exclusions="**/*Generated*.cs,${{ inputs.report-folder }}/**" /d:sonar.exclusions="${{ inputs.report-folder }}/**/*" \
-          /d:sonar.coverageReportPaths="${{ inputs.report-folder }}/SonarQube.xml"
+        ./.sonar/scanner/dotnet-sonarscanner begin \
+          /k:"${{ inputs.sonar-project-key }}" \
+          /o:"${{ inputs.sonar-organization }}" \
+          /n:"${{ inputs.sonar-project-name }}" \
+          /d:sonar.token="${{ inputs.sonar-token}}" \
+          /d:sonar.host.url="${{ inputs.sonar-host-url }}" \
+          /d:sonar.cpd.exclusions="**/*Generated*.cs,${{ inputs.report-folder }}/**" \
+          /d:sonar.exclusions="${{ inputs.report-folder }}/**/*" \
+          /d:sonar.coverageReportPaths="${{ inputs.report-folder }}/SonarQube.xml" \
+          /d:sonar.cs.vstest.reportsPaths="${{ inputs.report-folder }}/TestResults/*.trx"
       shell: bash
     - name: Build .NET solution
       run: dotnet build --no-restore --configuration Debug
@@ -71,14 +77,15 @@ runs:
     - name: Run tests
       run: |
         dotnet test --no-build --verbosity normal --configuration Debug \
-          --logger:"junit;LogFilePath=..\..\artifacts\{assembly}-test-result.xml;MethodFormat=Class;FailureBodyFormat=Verbose" \
-          --collect:"XPlat Code Coverage"
+          --results-directory "${{ inputs.report-folder }}/TestResults" \
+          --report-xunit-trx \
+          --coverage --coverage-output-format cobertura
       shell: bash
       env:
         ASPNETCORE_ENVIRONMENT: Development
     - name: Generate test report
       run: |
-        reportgenerator "-reports:./test/*/TestResults/*/coverage.cobertura.xml" \
+        reportgenerator "-reports:${{ inputs.report-folder }}/TestResults/*.cobertura.xml" \
           "-targetdir:${{ inputs.report-folder }}" \
           "-reporttypes:Cobertura;Html;TextSummary;SonarQube"
       shell: bash
diff --git a/actions/dotnet/install-lint-restore/action.yml b/actions/dotnet/install-lint-restore/action.yml
index 87679a8..41ab806 100644
--- a/actions/dotnet/install-lint-restore/action.yml
+++ b/actions/dotnet/install-lint-restore/action.yml
@@ -23,9 +23,9 @@ runs:
         dotnet tool install --global dotnet-reportgenerator-globaltool
         export PATH="$PATH:/root/.dotnet/tools"
       shell: bash
-    - name: Lint .NET code
-      run: dotnet format --verify-no-changes --severity warn --verbosity:diagnostic
-      shell: bash
     - name: Restore .NET packages
       run: dotnet restore
       shell: bash
+    - name: Lint .NET code
+      run: dotnet format --verify-no-changes --severity warn --verbosity:diagnostic
+      shell: bash