diff --git a/.github/workflows/groovy-tests.yml b/.github/workflows/groovy-tests.yml
index 9371638f92..e77f602650 100644
--- a/.github/workflows/groovy-tests.yml
+++ b/.github/workflows/groovy-tests.yml
@@ -15,7 +15,3 @@ jobs:
       - name: Run Tests
         run: |
           ./gradlew test --info
-      - name: Upload Coverage Report
-        uses: codecov/codecov-action@v2
-        with:
-          files: ./build/reports/jacoco/test/jacocoTestReport.xml
diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 618dafb0d0..9bc7208448 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 
 jobs:
   Get-CI-Image-Tag:
-    uses: ./.github/workflows/get-ci-image-tag.yml
+    uses: opensearch-project/opensearch-build/.github/workflows/get-ci-image-tag.yml@main
     with:
       product: opensearch
 
@@ -76,7 +76,21 @@ jobs:
       - name: Run Tests with Coverage
         run: |
           pipenv run coverage run -m pytest --cov=./src --cov-report=xml
+      - uses: actions/upload-artifact@v4
+        with:
+          name: coverage-report-${{ matrix.os }}
+          path: ./coverage.xml
+
+  python-tests-codecov:
+    needs: python-tests-linux
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: coverage-report-ubuntu-24.04
+          path: ./
       - name: Upload Coverage Report
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v5
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.xml