diff --git a/.github/workflows/qmk_userspace_build.yml b/.github/workflows/qmk_userspace_build.yml
index 2464121..0a1a38d 100644
--- a/.github/workflows/qmk_userspace_build.yml
+++ b/.github/workflows/qmk_userspace_build.yml
@@ -26,7 +26,7 @@ jobs:
   build:
     name: Build Userspace Firmware
     runs-on: ubuntu-latest
-    container: qmkfm/base_container
+    container: ghcr.io/qmk/qmk_cli:latest
 
     steps:
       - name: Checkout Userspace
@@ -51,10 +51,11 @@ jobs:
           ref: ${{ inputs.qmk_ref || 'master' }}
           submodules: recursive
 
-      - name: Install QMK CLI
+      - name: Install QMK CLI dependencies
         run: |
-          python3 -m pip install --upgrade qmk
-          python3 -m pip install -r qmk_firmware/requirements.txt
+          qmk_tool_dir="$(uv tool dir)/qmk"
+          . "$qmk_tool_dir/bin/activate"
+          uv pip install -r qmk_firmware/requirements.txt
 
       - name: Configure QMK CLI
         run: |
diff --git a/.github/workflows/qmk_userspace_publish.yml b/.github/workflows/qmk_userspace_publish.yml
index 0eda60c..3ce6225 100644
--- a/.github/workflows/qmk_userspace_publish.yml
+++ b/.github/workflows/qmk_userspace_publish.yml
@@ -25,6 +25,11 @@ jobs:
         with:
           name: Firmware
 
+      - name: Delete release
+        run: gh release delete ${{ inputs.release_name || 'latest' }} --cleanup-tag || true
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
       - name: Generate Release
         uses: softprops/action-gh-release@v2
         if: always() && !cancelled()