diff --git a/.github/workflows/cxx-build.yml b/.github/workflows/cxx-build.yml
index 9991cbbb..a37c5b9c 100644
--- a/.github/workflows/cxx-build.yml
+++ b/.github/workflows/cxx-build.yml
@@ -115,6 +115,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Firebolt Openrpc
+        run: |
+          mkdir -p /__w/openrpc
+          cd /__w/openrpc
+          git init
+          git remote add -f origin https://github.com/rdkcentral/firebolt-openrpc.git
+          git config core.sparseCheckout true
+          echo "languages/cpp/src/shared/CMakeLists.txt" >> .git/info/sparse-checkout
+          echo "languages/cpp/src/shared/cmake/CodeCoverage.cmake" >> .git/info/sparse-checkout
+          git pull origin chore/cpp-ci-unit-covorage-report
+
       - name: Download Core SDK
         uses: actions/download-artifact@v3
         with:
@@ -166,7 +177,7 @@ jobs:
           hide_complexity: true
           indicators: true
           output: both
-          thresholds: '80 40'
+          thresholds: '10 20'
       
       - name: Add coverage PR comment
         uses: marocchino/sticky-pull-request-comment@v2
@@ -185,6 +196,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Firebolt Openrpc
+        run: |
+          mkdir -p /__w/openrpc
+          cd /__w/openrpc
+          git init
+          git remote add -f origin https://github.com/rdkcentral/firebolt-openrpc.git
+          git config core.sparseCheckout true
+          echo "languages/cpp/src/shared/CMakeLists.txt" >> .git/info/sparse-checkout
+          echo "languages/cpp/src/shared/cmake/CodeCoverage.cmake" >> .git/info/sparse-checkout
+          git pull origin chore/cpp-ci-unit-covorage-report
+
       - name: Download Manage SDK
         uses: actions/download-artifact@v3
         with:
@@ -236,7 +258,7 @@ jobs:
           hide_complexity: true
           indicators: true
           output: both
-          thresholds: '80 40'
+          thresholds: '10 20'
       
       - name: Add coverage PR comment
         uses: marocchino/sticky-pull-request-comment@v2
@@ -305,7 +327,7 @@ jobs:
           hide_complexity: true
           indicators: true
           output: both
-          thresholds: '80 40'
+          thresholds: '10 20'
       
       - name: Add coverage PR comment
         uses: marocchino/sticky-pull-request-comment@v2
diff --git a/.github/workflows/utils.sh b/.github/workflows/utils.sh
index c61f3b10..a07098f8 100755
--- a/.github/workflows/utils.sh
+++ b/.github/workflows/utils.sh
@@ -273,6 +273,9 @@ function build_cpp_sdk() {
 
   tar -xvf /__w/firebolt-apis/firebolt-apis/src/sdks/${sdk_name}/build/cpp/src/firebolt-${sdk_name}-native-sdk-${FIREBOLT_VERSION}.tgz -C /__w/firebolt-apis/firebolt-apis/
   cd /__w/firebolt-apis/firebolt-apis/firebolt-${sdk_name}-native-sdk-${FIREBOLT_VERSION}
+  ls -l /__w/openrpc/
+  cp -f /__w/openrpc/languages/cpp/src/shared/CMakeLists.txt .
+  cp -f /__w/openrpc/languages/cpp/src/shared/cmake/CodeCoverage.cmake cmake/
   chmod +x ./build.sh
 
   ./build.sh -s "/__w/thunder/install/" || exit 9999