diff --git a/.github/workflows/mcp-tests.yml b/.github/workflows/mcp-tests.yml
index d44f5c6d31b..3a4e0fc48d9 100644
--- a/.github/workflows/mcp-tests.yml
+++ b/.github/workflows/mcp-tests.yml
@@ -109,11 +109,25 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: mvn -DskipTests clean install -pl :openmetadata-mcp -am
 
+      - name: Free build artifacts
+        run: |
+          rm -rf openmetadata-service/target/lib openmetadata-service/target/classes
+          rm -rf openmetadata-spec/target openmetadata-sdk/target common/target
+          rm -rf openmetadata-shaded-deps/*/target
+          df -h /
+
       - name: Run MCP Tests
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: mvn test -pl :openmetadata-mcp
 
+      - name: Clean Up
+        if: ${{ always() }}
+        run: |
+          cd ./docker/development
+          docker compose down --remove-orphans
+          sudo rm -rf ${PWD}/docker-volume
+
       - name: Publish Test Report
         if: ${{ always() }}
         uses: scacap/action-surefire-report@v1
diff --git a/openmetadata-mcp/src/test/resources/docker-java.properties b/openmetadata-mcp/src/test/resources/docker-java.properties
new file mode 100644
index 00000000000..d06ebb9264e
--- /dev/null
+++ b/openmetadata-mcp/src/test/resources/docker-java.properties
@@ -0,0 +1 @@
+api.version=1.44
diff --git a/openmetadata-mcp/src/test/resources/testcontainers.properties b/openmetadata-mcp/src/test/resources/testcontainers.properties
new file mode 100644
index 00000000000..0c60378ecf9
--- /dev/null
+++ b/openmetadata-mcp/src/test/resources/testcontainers.properties
@@ -0,0 +1,2 @@
+docker.client.strategy=org.testcontainers.dockerclient.UnixSocketClientProviderStrategy
+testcontainers.reuse.enable=true