diff --git a/.github/workflows/build_binaries.yaml b/.github/workflows/build_binaries.yaml
index f7908fad..876880ab 100755
--- a/.github/workflows/build_binaries.yaml
+++ b/.github/workflows/build_binaries.yaml
@@ -8,7 +8,8 @@ permissions:
 jobs:
   build:
     name: 'QMK Userspace Build'
-    uses: qmk/.github/.github/workflows/qmk_userspace_build.yml@main
+    #uses: qmk/.github/.github/workflows/qmk_userspace_build.yml@main
+    uses: ./.github/workflows/qmk_userspace_build.yml
     with:
       qmk_repo: qmk/qmk_firmware
       qmk_ref: master
diff --git a/.github/workflows/build_nontree_binaries.yaml b/.github/workflows/build_nontree_binaries.yaml
deleted file mode 100644
index a6dfc5e4..00000000
--- a/.github/workflows/build_nontree_binaries.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Build Non-Tree QMK firmware
-
-on: [push, workflow_dispatch]
-
-permissions:
-  contents: write
-
-jobs:
-  build:
-    name: 'QMK Userspace Build'
-    uses: ./.github/workflows/qmk_userspace_build.yml
-    with:
-      qmk_repo: qmk/qmk_firmware
-      qmk_ref: master
-
-  publish:
-    name: 'QMK Userspace Publish'
-    uses: qmk/.github/.github/workflows/qmk_userspace_publish.yml@main
-    if: always() && !cancelled()
-    needs: build
diff --git a/.github/workflows/qmk_userspace_build.yml b/.github/workflows/qmk_userspace_build.yml
index efd148cc..71950a09 100644
--- a/.github/workflows/qmk_userspace_build.yml
+++ b/.github/workflows/qmk_userspace_build.yml
@@ -69,18 +69,14 @@ jobs:
       - name: Read Non Tree Targets from JSON file
         run: |
           {
-            echo 'JSON_FILE<<EOF'
+            echo 'COPY_TARGETS<<EOF'
             cat $GITHUB_WORKSPACE/qmk_nontree.json
             echo 'EOF'
           } >> "$GITHUB_ENV"
 
-      - name: Parse Non Tree Targets JSON file
+      - name: Copy Non-Tree Keyboard Defintions from Userspace to QMK Firmware
         run: |
-          echo ${{ fromJson(env.JSON_FILE).nontree_targets }}
-
-      - name: Copy Non-Tree Keyboards to QMK Firmware
-        run: |
-          for target in ${{ join(fromJson(env.JSON_FILE).nontree_targets, ' ') }};
+          for target in ${{ join(fromJson(env.COPY_TARGETS).nontree_targets, ' ') }};
           do
             echo "Copying keyboard: $target"
             cp $GITHUB_WORKSPACE/keyboards/$target $GITHUB_WORKSPACE/qmk_firmware/keyboards -R