diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
index 3982411a..f8ab550d 100644
--- a/.github/workflows/gradle-build.yml
+++ b/.github/workflows/gradle-build.yml
@@ -51,6 +51,8 @@ jobs:
     needs: check-changes
     if: ${{ needs.check-changes.outputs.build-changes == 'true' }}
     runs-on: ubuntu-latest
+    outputs:
+      build-artifacts: ${{ steps.upload-build-artifacts.outputs.artifact-id }}
     steps:
       - uses: actions/checkout@v5
         with:
@@ -80,10 +82,16 @@ jobs:
         uses: atomicjar/testcontainers-cloud-setup-action@v1
         with:
           action: terminate
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        id: upload-build-artifacts
+        with:
+          name: build-artifacts
+          path: '**/build/'
 
   code-quality:
     name: Code Quality with Sonar
-    needs: check-changes
+    needs: [gradle-build, check-changes]
     if: ${{ needs.check-changes.outputs.source-changes == 'true' }}
     runs-on: ubuntu-latest
     steps:
@@ -102,15 +110,11 @@ jobs:
           build-scan-publish: true
           build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
           build-scan-terms-of-use-agree: "yes"
-      - name: Setup Testcontainers Cloud Client
-        uses: atomicjar/testcontainers-cloud-setup-action@v1
+      - name: Download build artifacts
+        uses: actions/download-artifact@v5
         with:
-          token: ${{ secrets.TC_CLOUD_TOKEN }}
+          artifact-ids: ${{ needs.gradle-build.outputs.build-artifacts }}
       - name: Publish Sonar report
         env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}      
-        run: ./gradlew check sonar
-      - name: Terminate Testcontainers Cloud Client active sessions
-        uses: atomicjar/testcontainers-cloud-setup-action@v1
-        with:
-          action: terminate
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: ./gradlew sonar
\ No newline at end of file
diff --git a/data-mongodb-full-text-search/src/test/java/zin/rashidi/boot/data/mongodb/character/CharacterRepositoryTests.java b/data-mongodb-full-text-search/src/test/java/zin/rashidi/boot/data/mongodb/character/CharacterRepositoryTests.java
index e1eb6b57..9ce38f34 100644
--- a/data-mongodb-full-text-search/src/test/java/zin/rashidi/boot/data/mongodb/character/CharacterRepositoryTests.java
+++ b/data-mongodb-full-text-search/src/test/java/zin/rashidi/boot/data/mongodb/character/CharacterRepositoryTests.java
@@ -28,7 +28,7 @@ class CharacterRepositoryTests {
 
     @Container
     @ServiceConnection
-    private final static MongoDBContainer mongo = new MongoDBContainer("mongo:latest");
+    private static final MongoDBContainer mongo = new MongoDBContainer("mongo:latest");
 
     @Autowired
     private MongoOperations operations;