diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b41a4b6..8b78dd9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ env:
   SAMPLES_DIR: bl5340pa_samples
   DTM_DIR: nrf/samples/bluetooth/direct_test_mode
   MANIFEST_DIR: bl5340pa_manifest
-  ARTIFACT_NAME: BL5340PA_samples
+  ARTIFACT_NAME: BL5340PA_atifacts
   DEBUG: true
 
 jobs:
@@ -29,6 +29,8 @@ jobs:
             ls -la
             ls -la ${{env.PROJ_DIR}}
             ls -la ${{env.PROJ_DIR}}/${{env.MANIFEST_DIR}}
+            cd ~
+            pwd
       - name: Cache Source Code
         uses: actions/cache@v4
         with:
@@ -75,21 +77,19 @@ jobs:
       - name: Build Firmware
         run: |
           set -x
+          rm -rf ${{env.BUILD_DIR}}
           cd ${{env.PROJ_DIR}}
-          west twister -T ${{env.SAMPLES_DIR}} -c --overflow-as-errors --exclude-tag should_fail
-          west twister -T ${{env.DTM_DIR}} -c --overflow-as-errors --exclude-tag should_fail
+          west twister -O ../${{env.BUILD_DIR}} -T ${{env.SAMPLES_DIR}} --no-clean --overflow-as-errors --exclude-tag should_fail
+          west twister -O ../${{env.BUILD_DIR}} -T ${{env.DTM_DIR}} --no-clean --overflow-as-errors --exclude-tag should_fail
       - if: ${{env.DEBUG}}
         run: |
           pwd
           ls -la
           ls -la ${{env.PROJ_DIR}}
-          ls -la ${{env.SAMPLES_DIR}}
-          ls -la ${{env.SAMPLES_DIR}}/twister-out
-          ls -la ${{env.DTM_DIR}}
-          ls -la ${{env.DTM_DIR}}/twister-out
+          ls -la ${{env.BUILD_DIR}}
       - name: Store Artifacts
         # always run this step to store build logs for debugging
-        if: false
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: ${{env.ARTIFACT_NAME}}
diff --git a/west.yml b/west.yml
index 0bd5877..59da093 100644
--- a/west.yml
+++ b/west.yml
@@ -10,12 +10,12 @@ manifest:
   projects:
     - name: bl5340pa_samples
       path: bl5340pa_samples
-      revision: bl5340pa-ga3.0
+      revision: workflow
       remote: LairdCP
     # The Laird Connectivity (BL5340PA) fork of the nRF Connect SDK (NCS).
     - name: sdk-nrf
       path: nrf
-      revision: bl5340pa-ga3.0
+      revision: workflow
       remote: LairdCP
       import:
         # Import /nrf/west.yml except for Zephyr which is done below