diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index aa638b80f5..21c0c03ea5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -278,7 +278,7 @@ jobs:
           cd simapp
           go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb_build' ./...
       - name: sonarcloud
-        if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }}
+        if: ${{ env.GIT_DIFF && !github.event.pull_request.draft }}
         uses: SonarSource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -316,7 +316,7 @@ jobs:
           cd x/foundation
           go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb_build' ./...
       - name: sonarcloud
-        if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }}
+        if: ${{ env.GIT_DIFF && !github.event.pull_request.draft }}
         uses: SonarSource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/sonar-project.properties b/sonar-project.properties
index b9090bd34e..94cfa17138 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,7 +1,7 @@
-sonar.projectKey=cosmos_cosmos-sdk
-sonar.organization=cosmos
+sonar.projectKey=Finschia_finschia-sdk
+sonar.organization=finschia
 
-sonar.projectName=Cosmos SDK
+sonar.projectName=Finschia SDK
 sonar.project.monorepo.enabled=true
 
 sonar.sources=.
@@ -17,4 +17,4 @@ sonar.scm.provider=git
 # Exclude C/C++/Objective-C files from analysis
 sonar.c.file.suffixes=-
 sonar.cpp.file.suffixes=-
-sonar.objc.file.suffixes=-
\ No newline at end of file
+sonar.objc.file.suffixes=-
diff --git a/x/foundation/sonar-project.properties b/x/foundation/sonar-project.properties
new file mode 100644
index 0000000000..34ed713c52
--- /dev/null
+++ b/x/foundation/sonar-project.properties
@@ -0,0 +1,15 @@
+sonar.projectKey=Finschia_finschia-sdk-x-foundation
+sonar.organization=finschia
+
+sonar.projectName=Finschia SDK - x/foundation
+sonar.project.monorepo.enabled=true
+
+sonar.sources=.
+sonar.exclusions=**/*_test.go
+sonar.tests=.
+sonar.test.inclusions=**/*_test.go
+sonar.go.coverage.reportPaths=coverage.out
+
+sonar.sourceEncoding=UTF-8
+sonar.scm.provider=git
+sonar.pullrequest.github.summary_comment=true