diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 30beb21a..5672ba93 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -240,7 +240,7 @@ jobs:
         with:
           rechunk: 'ghcr.io/hhd-dev/rechunk:v0.8.3'
           ref: 'raw-img'
-          prev-ref: ${{ github.event.inputs.fresh-rechunk == 'true' && '' || 'ghcr.io/ublue-os/bazzite:unstable' }}
+          prev-ref: ${{ github.event.inputs.fresh-rechunk == 'true' && '' || "${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:stable" }}
           version: '${{ steps.generate-version.outputs.tag }}'
           labels: |
             io.artifacthub.package.logo-url=https://raw.githubusercontent.com/ublue-os/bazzite/main/repo_content/logo.png
diff --git a/spec_files/steamdeck-kde-presets/nested-desktop-resolution.patch b/spec_files/steamdeck-kde-presets/nested-desktop-resolution.patch
index 0b51e741..989a10ba 100644
--- a/spec_files/steamdeck-kde-presets/nested-desktop-resolution.patch
+++ b/spec_files/steamdeck-kde-presets/nested-desktop-resolution.patch
@@ -8,14 +8,16 @@ index b833773..f7ae36f 100755
  
  set -eu
  
-@@ -28,8 +28,9 @@ ln -s $XDG_RUNTIME_DIR/pipewire* $NEW_XDG_RUNTIME_DIR/.
+@@ -28,8 +28,11 @@ ln -s $XDG_RUNTIME_DIR/pipewire* $NEW_XDG_RUNTIME_DIR/.
  ## whilst being launched by plasma-session
  mkdir $NEW_XDG_RUNTIME_DIR/bin
  cat <<EOF > $NEW_XDG_RUNTIME_DIR/bin/kwin_wayland_wrapper
 -#!/bin/sh
 -/usr/bin/kwin_wayland_wrapper --width 1280 --height 800 --no-lockscreen \$@
 +#!/usr/bin/bash
-+source /etc/default/steamos-nested-desktop
++if [ -z "${STEAMOS_NESTED_DESKTOP_WIDTH:-}" ] && [ -z "${STEAMOS_NESTED_DESKTOP_HEIGHT:-}" ]; then
++    source /etc/default/steamos-nested-desktop
++fi
 +/usr/bin/kwin_wayland_wrapper --width ${STEAMOS_NESTED_DESKTOP_WIDTH:-1280} --height ${STEAMOS_NESTED_DESKTOP_HEIGHT:-800} --no-lockscreen \$@
  EOF
  chmod a+x $NEW_XDG_RUNTIME_DIR/bin/kwin_wayland_wrapper
diff --git a/system_files/desktop/shared/usr/bin/bazzite-rollback-helper b/system_files/desktop/shared/usr/bin/bazzite-rollback-helper
index 7ac2c51f..0a7501e1 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-rollback-helper
+++ b/system_files/desktop/shared/usr/bin/bazzite-rollback-helper
@@ -39,10 +39,10 @@ EOF
 if [[ "$1" == "list" ]]; then
   if [ -z "$2" ]; then
       echo "Listing images for $DEFAULT_BRANCH"
-      skopeo list-tags docker://ghcr.io/ublue-os/bazzite | grep -- "-$DEFAULT_BRANCH-" | sort -rV
+      skopeo list-tags docker://ghcr.io/ublue-os/bazzite | grep -E "\"$DEFAULT_BRANCH-[0-9]+\.[0-9]+|-$DEFAULT_BRANCH-[0-9]+" | sort -rV
   else
       echo "Listing images for $2"
-      skopeo list-tags docker://ghcr.io/ublue-os/bazzite | grep -- "-$2-" | sort -rV
+      skopeo list-tags docker://ghcr.io/ublue-os/bazzite | grep -E "\"$2-[0-9]+\.[0-9]+|-$2-[0-9]+" | sort -rV
   fi
 
 elif [[ "$1" == "rollback" ]]; then
@@ -83,4 +83,4 @@ EOF
 # display the helptext
 elif [[ "$1" == "-h" || "$1" == "--h" || "$1" == "-help" || "$1" == "--help" || "$1" == "help" || -z "$1" ]]; then
  echo "$helptext"
-fi
\ No newline at end of file
+fi
diff --git a/system_files/desktop/shared/usr/bin/waydroid-launcher b/system_files/desktop/shared/usr/bin/waydroid-launcher
index 04b5351c..78ec6159 100755
--- a/system_files/desktop/shared/usr/bin/waydroid-launcher
+++ b/system_files/desktop/shared/usr/bin/waydroid-launcher
@@ -2,7 +2,10 @@
 
 set -eux
 
-source /etc/default/waydroid-launcher
+# Import defaults if WIDTH/HEIGHT is not defined by an external script
+if [ -z "${WAYDROID_WIDTH:-}" ] || [ -z "${WAYDROID_HEIGHT:-}" ]; then
+    source /etc/default/waydroid-launcher
+fi
 
 # for backwards compatibility, default to show-full-ui
 if (($# == 0)); then
diff --git a/system_files/desktop/shared/usr/libexec/waydroid-container-start b/system_files/desktop/shared/usr/libexec/waydroid-container-start
index c8105eea..8b6a1131 100755
--- a/system_files/desktop/shared/usr/libexec/waydroid-container-start
+++ b/system_files/desktop/shared/usr/libexec/waydroid-container-start
@@ -1,7 +1,9 @@
 #!/usr/bin/bash
 
-source /etc/default/waydroid-launcher
-source /etc/default/steamos-nested-desktop
+# Import defaults if WIDTH/HEIGHT is not defined by an external script
+if [ -z "${WAYDROID_WIDTH:-}" ] || [ -z "${WAYDROID_HEIGHT:-}" ]; then
+    source /etc/default/waydroid-launcher
+fi
 
 # Ensure needed props are present
 if ! grep -q "persist.waydroid.udev=true" "/var/lib/waydroid/waydroid_base.prop"; then