diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
index 795420f..f303143 100644
--- a/.github/workflows/cicd.yaml
+++ b/.github/workflows/cicd.yaml
@@ -25,13 +25,18 @@ jobs:
       - name: Test
         run: dotnet test --collect:"XPlat Code Coverage" --settings VakilPors.Test/coverlet.runsettings --verbosity normal --no-build
         working-directory: ./src/VakilPors
+      - name: Find first subfolder
+        id: subfolder
+        run: subfolder=$(ls -d ./VakilPors.Test/TestResults head -n 1)
+            echo "subfolder=${subfolder%/}" >> $GITHUB_ENV
+        working-directory: ./src/VakilPors
       - name: Create Test Coverage Badge
         uses: simon-k/dotnet-code-coverage-badge@v1.0.0
         id: create_coverage_badge
         with:
           label: Unit Test Coverage
           color: brightgreen
-          path: ./src/VakilPors/VakilPors.Test/TestResults/coverage.opencover.xml
+          path: ./src/VakilPors/VakilPors.Test/TestResults/${{ env.subfolder }}/coverage.opencover.xml
           gist-filename: code-coverage.json
           gist-id: 20d8309ce4ac8005e22df30d985c6883
           gist-auth-token: ${{ secrets.GIST_AUTH_TOKEN }}
diff --git a/src/VakilPors/VakilPors.Test/coverlet.runsettings b/src/VakilPors/VakilPors.Test/coverlet.runsettings
index ed657a3..49852af 100644
--- a/src/VakilPors/VakilPors.Test/coverlet.runsettings
+++ b/src/VakilPors/VakilPors.Test/coverlet.runsettings
@@ -10,7 +10,7 @@
 <!--                    <Format>json,cobertura,lcov,teamcity,opencover</Format>-->
                     <ExcludeByAttribute>Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute</ExcludeByAttribute>
                     <ExcludeByFile>**/VakilPors.Data/**/*.cs,**/VakilPors.Shared/**/*.cs,**/VakilPors.Web/Configuration/**/*.cs,**/VakilPors.Web/Program.cs,**/VakilPors.Core/Authentication/**/*.cs,**/VakilPors.Core/Contracts/**/*.cs,**/VakilPors.Core/Domain/**/*.cs,**/VakilPors.Core/Exceptions/**/*.cs,**/VakilPors.Core/Hubs/**/*.cs,**/VakilPors.Core/Mapper/**/*.cs</ExcludeByFile> <!-- Globbing filter -->
-                    <IncludeByFile>**/VakilPors.Web/Controllers/*.cs,**/VakilPors.Core/Services/*.cs</IncludeByFile>
+                    <IncludeDirectory>**/VakilPors.Web/Controllers,**/VakilPors.Core/Services</IncludeDirectory>
 <!--                    <SingleHit>false</SingleHit>-->
 <!--                    <UseSourceLink>true</UseSourceLink>-->
                     <IncludeTestAssembly>true</IncludeTestAssembly>