diff --git a/.github/workflows/coverage_api21_request.yml b/.github/workflows/coverage.yml
similarity index 90%
rename from .github/workflows/coverage_api21_request.yml
rename to .github/workflows/coverage.yml
index 7244c6b5b..94155e7c3 100644
--- a/.github/workflows/coverage_api21_request.yml
+++ b/.github/workflows/coverage.yml
@@ -15,7 +15,7 @@ jobs:
   coverageReport:
     strategy:
       matrix:
-        api-level: [21]
+        api-level: [21,30]
       fail-fast: false
     runs-on: macos-10.15
     steps:
@@ -23,16 +23,18 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 1
-        env:
-          GRADLE_OPTS: "-Dorg.gradle.internal.http.connectionTimeout=60000 -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.network.retry.max.attempts=6 -Dorg.gradle.internal.network.retry.initial.backOff=2000"
+
       - name: create instrumentation coverage
         uses: ReactiveCircus/android-emulator-runner@v2.23.0
+        env:
+          GRADLE_OPTS: "-Dorg.gradle.internal.http.connectionTimeout=60000 -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.network.retry.max.attempts=6 -Dorg.gradle.internal.network.retry.initial.backOff=2000"
         with:
           api-level: ${{ matrix.api-level }}
           arch: x86_64
           ndk: 21.4.7075529
           script: bash contrib/instrumentation.sh
 
+
       - name: Upload screenshot result
         uses: actions/upload-artifact@v1
         if: failure()
@@ -41,15 +43,17 @@ jobs:
           path: screencap.png
 
       - name: create unit coverage
+        if: ${{ matrix.api-level==21  }}
         run: ./gradlew jacocoTestDebugUnitTestReport jacocoTestCustomExampleDebugUnitTestReport
 
       - name: Upload coverage to Codecov
+        if: ${{ matrix.api-level==21  }}
         run: |
           bash <(curl -s https://codecov.io/bash)
 
       - name: Upload Coverage to GH-Actions
         uses: actions/upload-artifact@v2.2.0
-        if: ${{ always()  }}
+        if: ${{ matrix.api-level==21  }}
         with:
           name: Tests Coverage Report
           path: |
diff --git a/.github/workflows/coverage_api30_request.yml b/.github/workflows/coverage_api30_request.yml
deleted file mode 100644
index da0e2b931..000000000
--- a/.github/workflows/coverage_api30_request.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Coverage Reporting
-
-on:
-  push:
-    branches:
-      - master
-      - develop
-
-  pull_request:
-    branches:
-      - '**'
-
-jobs:
-
-  coverageReport:
-    strategy:
-      matrix:
-        api-level: [30]
-      fail-fast: false
-    runs-on: macos-10.15
-    steps:
-      - name: checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
-        env:
-          GRADLE_OPTS: "-Dorg.gradle.internal.http.connectionTimeout=60000 -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.network.retry.max.attempts=6 -Dorg.gradle.internal.network.retry.initial.backOff=2000"
-      - name: create instrumentation coverage
-        uses: ReactiveCircus/android-emulator-runner@v2.23.0
-        with:
-          api-level: ${{ matrix.api-level }}
-          arch: x86_64
-          ndk: 21.4.7075529
-          script: bash contrib/instrumentation.sh
-
-      - name: Upload screenshot result
-        uses: actions/upload-artifact@v1
-        if: failure()
-        with:
-          name: ${{ matrix.api-level }}
-          path: screencap.png
-
-      - name: create unit coverage
-        run: ./gradlew jacocoTestDebugUnitTestReport jacocoTestCustomExampleDebugUnitTestReport