diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index ec36ac1cf..2c0629fdc 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -86,12 +86,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        subset: [1, 2, 3, 4]
+        subset: [1, 2]
         board: ${{ fromJson(inputs.boards_to_test) }}
     uses: ./.github/workflows/run_tests_dut.yml
     with:
       subset: ${{ matrix.subset }}
-      max_subsets: 4
+      max_subsets: 2
       run_tests: true
       target_board: ${{ matrix.board }}
       nrf_revision: ${{ inputs.nrf_revision }}
diff --git a/.github/workflows/run_tests_dut.yml b/.github/workflows/run_tests_dut.yml
index fa544f010..b2f3c2a99 100644
--- a/.github/workflows/run_tests_dut.yml
+++ b/.github/workflows/run_tests_dut.yml
@@ -172,5 +172,5 @@ jobs:
       - name: clean artifacts
         if: always()
         run: |
-          cd nrf; git checkout main; git branch -D branch_to_run;
+          cd nrf; git checkout main; git branch -D branch_to_run; cd ..;
           rm -rf PACKAGE_ARTIFACTS_* twister-out
diff --git a/.github/workflows/samples_build.yml b/.github/workflows/samples_build.yml
index 4f6c12366..c59bc7ba3 100644
--- a/.github/workflows/samples_build.yml
+++ b/.github/workflows/samples_build.yml
@@ -21,10 +21,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        subset: [1, 2, 3, 4, 5]
+        subset: [1, 2, 3]
         board: ${{ fromJson(inputs.boards_to_test) }}
     env:
-      MAX_SUBSETS: 5
+      MAX_SUBSETS: 3
 
     runs-on: ubuntu-24.04
     container: