diff --git a/.github/workflows/cxx-build.yml b/.github/workflows/cxx-build.yml
index 8038abb7..a5958f0e 100644
--- a/.github/workflows/cxx-build.yml
+++ b/.github/workflows/cxx-build.yml
@@ -277,23 +277,6 @@ jobs:
     container:
       image: node:latest
     steps:
-      - 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/templates/sdk/scripts/build.sh" >> .git/info/sparse-checkout
-          git pull origin chore/cpp-ci-unit-covorage-report
-
-      - name: Download Thunder 
-        uses: actions/download-artifact@v3
-        with: 
-          name: thunder
-          path: /__w/thunder/install/
-
       - name: Checkout
         uses: actions/checkout@v2
         with:
@@ -316,10 +299,7 @@ jobs:
           key: deps-node-modules-${{ hashFiles('package-lock.json') }}
 
       - name: Install dependencies
-        run: |
-          apt update
-          apt install -y cmake
-          npm install
+        run: npm install
 
       - name: Set file permissions
         run: |
@@ -330,15 +310,59 @@ jobs:
         run: |
           npm run dist
 
-      - name: Generate core SDK source code
-        run: |
-          .github/workflows/utils.sh generate_cpp_core_sdk_source_code
-
-      - name: Upload artifacts
+      - name: Upload Core SDK
         uses: actions/upload-artifact@v3
         with:
           name: core
-          path: /__w/firebolt-apis/firebolt-apis/src/sdks/core/build/cpp/src/
+          path: src/sdks/core
+
+  core_sdk:
+    name: Build Core SDK
+    needs: [thunder, openrpc]
+    runs-on: ubuntu-latest
+    container:
+      image: node:latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Download Core SDK
+        uses: actions/download-artifact@v3
+        with:
+          name: core
+          path: /__w/firebolt-apis/firebolt-apis/src/sdks/core
+
+      - name: Download Thunder 
+        uses: actions/download-artifact@v3
+        with: 
+          name: thunder
+          path: /__w/thunder/install/
+
+      - 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
+          git pull origin chore/cpp-ci-unit-covorage-report
+
+      - name: Cache npm dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.npm
+          key: deps-node-modules-${{ hashFiles('package-lock.json') }}
+
+      - name: Install npm dependencies
+        run: |
+          apt update
+          apt install -y cmake
+          npm install
+
+      - name: Generate core SDK source code
+        run: |
+          .github/workflows/utils.sh generate_cpp_core_sdk_source_code
 
       - name: Build CXX Core SDK 
         run: |
@@ -347,3 +371,4 @@ jobs:
       - name: Test CXX Core SDK 
         run: |
           .github/workflows/utils.sh test_core_cpp_sdk
+