diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 029044a9..55179ced 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -8,22 +8,38 @@ env:
   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
 jobs:
-  test:
+  unit-test:
+    name: Build and Test
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
       - name: Setup Scala
-        uses: olafurpg/setup-scala@v10
+        uses: olafurpg/setup-scala@v13
         with:
           java-version: "adopt@1.8"
       - name: Build and Unit Tests
         run: sbt -v -Dfile.encoding=UTF-8 +clean +test
-      #- name: Coverage Report
-      #  run: sbt -v -Dfile.encoding=UTF-8 coverageReport
-      #- name: Codecov
-      #  uses: codecov/codecov-action@v1
-      #  with:
-      #    token: ${{ secrets.CODECOV_TOKEN }}
-      #    verbose: false # optional (default = false)
-      #    flags: unittests
+  coverage:
+    name: Code Coverage
+    strategy:
+      matrix:
+        scala: [2.12.15, 2.13.7]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Scala
+        uses: olafurpg/setup-scala@v13
+        with:
+          java-version: "adopt@1.8"
+      - name: Coverage for Scala 2 (until Scala 3 is available)
+        run: sbt ++${{ matrix.scala }} clean coverage test
+      - name: Coverage Report
+        run: sbt ++${{ matrix.scala }} coverageReport
+      - name: Codecov
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: false # optional (default = false)
+          flags: unittests
diff --git a/README.md b/README.md
index 116d1cc6..ceaf06d0 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 [![CI Tests](https://github.com/data-tools/big-data-types/workflows/ci-tests/badge.svg)](https://github.com/data-tools/big-data-types/actions/workflows/ci-tests.yml)
 [![BQ IT](https://github.com/data-tools/big-data-types/workflows/BigQuery-Integration/badge.svg)](https://github.com/data-tools/big-data-types/actions/workflows/bigquery-integration.yml)
 ![Maven Central](https://img.shields.io/maven-central/v/io.github.data-tools/big-data-types-core_2.13)
+[![codecov](https://codecov.io/gh/data-tools/big-data-types/branch/main/graph/badge.svg?token=1DUBMIAEO8)](https://codecov.io/gh/data-tools/big-data-types)
 [![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://scala-steward.org)
 
 A type-safe library to transform Case Classes into Database schemas and to convert implemented types into another types
diff --git a/project/plugins.sbt b/project/plugins.sbt
index e3a64609..76714bbf 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,4 +1,4 @@
-//addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.2")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")