diff --git a/.github/workflows/Configuration/keyboard_nontree.yaml b/.github/workflows/Configuration/keyboard_nontree.yaml
index e23d91ec..7812d86d 100644
--- a/.github/workflows/Configuration/keyboard_nontree.yaml
+++ b/.github/workflows/Configuration/keyboard_nontree.yaml
@@ -1,3 +1,3 @@
 keyboard:
-  - 'barbellboards/rollow'
+  - 'barbellboards'
   - 'planck'
\ No newline at end of file
diff --git a/.github/workflows/build_nontree_binaries.yaml b/.github/workflows/build_nontree_binaries.yaml
index a6dfc5e4..a2eb3ed9 100644
--- a/.github/workflows/build_nontree_binaries.yaml
+++ b/.github/workflows/build_nontree_binaries.yaml
@@ -12,6 +12,7 @@ jobs:
     with:
       qmk_repo: qmk/qmk_firmware
       qmk_ref: master
+      config-file: ./.github/workflows/Configuration/keyboard_nontree.yaml
 
   publish:
     name: 'QMK Userspace Publish'
diff --git a/.github/workflows/qmk_userspace_build.yml b/.github/workflows/qmk_userspace_build.yml
index 9f6789eb..ee0e1112 100644
--- a/.github/workflows/qmk_userspace_build.yml
+++ b/.github/workflows/qmk_userspace_build.yml
@@ -63,7 +63,9 @@ jobs:
 
       - name: Copy Non-Tree Keyboards to QMK Firmware
         run: |
-          cp $GITHUB_WORKSPACE/keyboards/barbellboards $GITHUB_WORKSPACE/qmk_firmware/keyboards -R
+          for kb in '${keyboard[@]}'; do
+            cp $GITHUB_WORKSPACE/keyboards/$kb $GITHUB_WORKSPACE/qmk_firmware/keyboards -R
+          done
 
       - name: Build
         run: |