diff --git a/.github/workflows/cxx-build.yml b/.github/workflows/cxx-build.yml
index 392b72485..afd40949f 100644
--- a/.github/workflows/cxx-build.yml
+++ b/.github/workflows/cxx-build.yml
@@ -105,7 +105,7 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: core
-          path: /__w/firebolt-apis/src/sdks/core
+          path: /__w/firebolt-apis/src/sdks
 
 
       - name: Download Thunder 
@@ -142,9 +142,10 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Download Manage SDK 
-        run: |
-          rm -rf src/sdks/manage
-          actions/download-artifact@v3 --name manage --path /__w/firebolt-apis/src/sdks/manage
+        uses: actions/download-artifact@v3
+        with:
+          name: manage
+          path: /__w/firebolt-apis/src/sdks
 
       - name: Download Thunder 
         uses: actions/download-artifact@v3
@@ -180,11 +181,10 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Download Discovery SDK
-        run: rm -rf src/sdks/discovery
         uses: actions/download-artifact@v3
         with:
-          name: core
-          path: /__w/firebolt-apis/src/sdks/core
+          name: discovery
+          path: /__w/firebolt-apis/src/sdks/
 
       - name: Download Thunder 
         uses: actions/download-artifact@v3