diff --git a/.github/workflows/cxx-build.yml b/.github/workflows/cxx-build.yml
index 45fa40f8f..8a242d58d 100644
--- a/.github/workflows/cxx-build.yml
+++ b/.github/workflows/cxx-build.yml
@@ -33,7 +33,7 @@ jobs:
           path: /__w/firebolt-apis/install/
 
   openrpc:
-    name: Build firebolt-openrpc artifacts
+    name: Build Openrpc Artifacts
     runs-on: ubuntu-latest
     container:
       image: kevinshahfws/node-c:3.0
diff --git a/.github/workflows/utils.sh b/.github/workflows/utils.sh
index d1d95fe8d..8879c5451 100755
--- a/.github/workflows/utils.sh
+++ b/.github/workflows/utils.sh
@@ -280,22 +280,15 @@ function buildCoreCPPSDK() {
 
   FIREBOLT_VERSION=1.3.0-next.1
   cd /__w/core-sdk/
-  ls -la build/cpp/src
-  cp build/cpp/src/firebolt-core-native-sdk-${FIREBOLT_VERSION}.tgz $current_dir/data
-  cd $current_dir/data
-  tar -zxvf firebolt-core-native-sdk-${FIREBOLT_VERSION}.tgz
-  cd firebolt-core-native-sdk-${FIREBOLT_VERSION}/
+  npm run cpp
+
+  tar -zxvf build/cpp/src/firebolt-core-native-sdk-${FIREBOLT_VERSION}.tgz  -C $current_dir/data
+  cd $current_dir/data/firebolt-core-native-sdk-${FIREBOLT_VERSION}/
   chmod +x ./build.sh
   sed -i -e 's/prefix=/prefix /g' build.sh
-  cat ./build.sh
-
-  echo "***************** firebolt.h *****************"
-  cat include/firebolt.h
 
   ./build.sh -s "/__w/thunder/install/" || exit 9999
   ./build.sh -f "$current_dir/data/firebolt-core-native-sdk-${FIREBOLT_VERSION}/build/Firebolt" -s "/__w/thunder/install/"
-
-  cd $current_apis_dir
 }
 
 function buildManageCPPSDK() {
@@ -307,17 +300,12 @@ function buildManageCPPSDK() {
   # cd src/sdks/manage
   FIREBOLT_VERSION=1.3.0-next.1
   cd /__w/manage-sdk/
-  ls -la build/cpp/src
-  cp build/cpp/src/firebolt-manage-native-sdk-${FIREBOLT_VERSION}.tgz $current_dir/data
-  cd $current_dir/data
-  tar -zxvf firebolt-manage-native-sdk-${FIREBOLT_VERSION}.tgz
-  cd firebolt-manage-native-sdk-${FIREBOLT_VERSION}/
+  npm run cpp
+
+  tar -zxvf build/cpp/src/firebolt-manage-native-sdk-${FIREBOLT_VERSION}.tgz  -C $current_dir/data
+  cd $current_dir/data/firebolt-manage-native-sdk-${FIREBOLT_VERSION}/
   chmod +x ./build.sh
   sed -i -e 's/prefix=/prefix /g' build.sh
-  cat ./build.sh
-
-  echo "***************** firebolt.h *****************"
-  cat include/firebolt.h
 
   ./build.sh -s "/__w/thunder/install/" || exit 9999
   ./build.sh -f "$current_dir/data/firebolt-manage-native-sdk-${FIREBOLT_VERSION}/build/Firebolt" -s "/__w/thunder/install/"
@@ -333,17 +321,12 @@ function buildDiscoveryCPPSDK() {
 
   FIREBOLT_VERSION=1.3.0-next.1
   cd /__w/discovery-sdk/
-  ls -la build/cpp/src
-  cp build/cpp/src/firebolt-discovery-native-sdk-${FIREBOLT_VERSION}.tgz $current_dir/data
-  cd $current_dir/data
-  tar -zxvf firebolt-discovery-native-sdk-${FIREBOLT_VERSION}.tgz
-  cd firebolt-discovery-native-sdk-${FIREBOLT_VERSION}/
+  npm run cpp
+
+  tar -zxvf build/cpp/src/firebolt-discovery-native-sdk-${FIREBOLT_VERSION}.tgz  -C $current_dir/data
+  cd $current_dir/data/firebolt-discovery-native-sdk-${FIREBOLT_VERSION}/
   chmod +x ./build.sh
   sed -i -e 's/prefix=/prefix /g' build.sh
-  cat ./build.sh
-
-  echo "***************** firebolt.h *****************"
-  cat include/firebolt.h
 
   ./build.sh -s "/__w/thunder/install/" || exit 9999
   ./build.sh -f "$current_dir/data/firebolt-discovery-native-sdk-${FIREBOLT_VERSION}/build/Firebolt" -s "/__w/thunder/install/"