diff --git a/.github/workflows/build-builder.yml b/.github/workflows/build-builder.yml
index 45b68ab0..a8d57476 100644
--- a/.github/workflows/build-builder.yml
+++ b/.github/workflows/build-builder.yml
@@ -3,8 +3,6 @@ name: Build Builder Docker image
 on:
   workflow_dispatch:
   push:
-    branches:
-      - main
     paths:
       - "builder/**"
       - ".github/workflows/build-builder.yml"
@@ -16,11 +14,12 @@ jobs:
     
     steps:
     - name: Checkout
-      uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
     
     - name: Login to GitHub Container Registry
+      if: ${{ (github.ref == 'refs/heads/main' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')) }}
       run: |
         echo $GITHUB_TOKEN | docker login ghcr.io -u SteamDeckHomebrew --password-stdin
       env:
@@ -32,11 +31,12 @@ jobs:
         docker build -t ghcr.io/steamdeckhomebrew/builder:latest .
 
     - name: Wait for other runs to complete
-      uses: softprops/turnstyle@8db075d65b19bf94e6e8687b504db69938dc3c65
+      uses: softprops/turnstyle@v2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Push
+      if: ${{ (github.ref == 'refs/heads/main' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')) }}
       run: |
         docker push ghcr.io/steamdeckhomebrew/builder:latest
 
diff --git a/.github/workflows/build-plugins.yml b/.github/workflows/build-plugins.yml
index e63bf64b..818bcf33 100644
--- a/.github/workflows/build-plugins.yml
+++ b/.github/workflows/build-plugins.yml
@@ -313,7 +313,7 @@ jobs:
         SUBMIT_AUTH_KEY: ${{ secrets.SUBMIT_AUTH_KEY }}
         STORE_URL: ${{ secrets.STORE_URL }}
         upload: ${{ matrix.upload }}
-      if: ${{ matrix.upload == true && env.SUBMIT_AUTH_KEY != '' }}
+      if: ${{ matrix.upload == true && inputs.test_build != true && env.SUBMIT_AUTH_KEY != '' }}
       run: |
         shopt -s dotglob
 
diff --git a/builder/Dockerfile b/builder/Dockerfile
index d2203a11..5a6460b7 100644
--- a/builder/Dockerfile
+++ b/builder/Dockerfile
@@ -1,8 +1,8 @@
-FROM node:18-alpine
+FROM node:20-alpine
 
 RUN apk add --no-cache rsync
 
-RUN npm i --location=global pnpm@9.4.0
+RUN npm i --location=global pnpm@9
 
 COPY ./entrypoint.sh /entrypoint.sh
 
diff --git a/plugins/Junk-Store b/plugins/Junk-Store
index befe4d05..846c3361 160000
--- a/plugins/Junk-Store
+++ b/plugins/Junk-Store
@@ -1 +1 @@
-Subproject commit befe4d055035c5dddcf933af21f077f8b442fe6d
+Subproject commit 846c3361970fde62bfbfb3c03a7b5982b2ebb6d3
diff --git a/plugins/SDH-CssLoader b/plugins/SDH-CssLoader
index 05068b6b..b58bdbbe 160000
--- a/plugins/SDH-CssLoader
+++ b/plugins/SDH-CssLoader
@@ -1 +1 @@
-Subproject commit 05068b6b2a7446a8b1f336a79b88eff37a017b88
+Subproject commit b58bdbbe2e2782403e00257885f544a080fcd16a
diff --git a/plugins/TabMaster b/plugins/TabMaster
index dd203e5c..c3b9cd07 160000
--- a/plugins/TabMaster
+++ b/plugins/TabMaster
@@ -1 +1 @@
-Subproject commit dd203e5c8a607f4eb78e478363781274da894390
+Subproject commit c3b9cd07e7893e5f852ef11cff1cfb9e20a0e467
diff --git a/plugins/decky-XRGaming b/plugins/decky-XRGaming
index 8c303e71..0ea5fe99 160000
--- a/plugins/decky-XRGaming
+++ b/plugins/decky-XRGaming
@@ -1 +1 @@
-Subproject commit 8c303e719969aebc2b7b56e4a14a5f5a63e3703e
+Subproject commit 0ea5fe992de8d16b5a9a6bda57fa7efce97a5689
diff --git a/plugins/decky-brightness-bar b/plugins/decky-brightness-bar
index 5305b48b..3bc1854a 160000
--- a/plugins/decky-brightness-bar
+++ b/plugins/decky-brightness-bar
@@ -1 +1 @@
-Subproject commit 5305b48bdbe4dc43e9fab4e7dfb51467d670fee4
+Subproject commit 3bc1854a391283b6f3ba6e6f11f12520f171c8fb
diff --git a/plugins/moondeck b/plugins/moondeck
index e9e93a49..9a6f4c56 160000
--- a/plugins/moondeck
+++ b/plugins/moondeck
@@ -1 +1 @@
-Subproject commit e9e93a4909dc4277cb758023097e7adce0a9dd42
+Subproject commit 9a6f4c5604a245ccb85896b416ac5a5853c4dc6f