diff --git a/Containerfile b/Containerfile
index 69330de5..732bb272 100644
--- a/Containerfile
+++ b/Containerfile
@@ -62,8 +62,7 @@ RUN if [[ "${IMAGE_FLAVOR}" =~ "asus" ]]; then \
             asusctl-rog-gui && \
         git clone https://gitlab.com/asus-linux/firmware.git --depth 1 /tmp/asus-firmware && \
         cp -rf /tmp/asus-firmware/* /usr/lib/firmware/ && \
-        rm -rf /tmp/asus-firmware && \
-        printf "blacklist bmi150_core\nblacklist bmi150_i2c\nblacklist bmi150_spi" >> /usr/lib/modprobe.d/bmi150-blacklist.conf \
+        rm -rf /tmp/asus-firmware \
     ; fi
 
 # Setup Surface devices
@@ -663,6 +662,7 @@ RUN wget https://steamdeck-packages.steamos.cloud/archlinux-mirror/jupiter-main/
 # Cleanup & Finalize
 COPY system_files/shared /
 RUN /tmp/image-info.sh && \
+    printf "blacklist bmi150_core\nblacklist bmi150_i2c\nblacklist bmi150_spi" >> /usr/lib/modprobe.d/bmi150-blacklist.conf && \
     mkdir -p "/usr/etc/xdg/autostart" && \
     cp "/usr/share/applications/steam.desktop" "/usr/etc/xdg/autostart/steam.desktop" && \
     sed -i 's@/usr/bin/bazzite-steam %U@/usr/bin/bazzite-steam -silent %U@g' /usr/etc/xdg/autostart/steam.desktop && \
diff --git a/system_files/deck/shared/usr/etc/default/steamos-nested-desktop b/system_files/deck/shared/usr/etc/default/steamos-nested-desktop
index ee1e843c..5f1cedd2 100644
--- a/system_files/deck/shared/usr/etc/default/steamos-nested-desktop
+++ b/system_files/deck/shared/usr/etc/default/steamos-nested-desktop
@@ -11,7 +11,7 @@ case "$(cat /sys/devices/virtual/dmi/id/product_name)" in
 	"ROG Ally RC71L_RC71L" | "G1618-04" | "G1617-01" | "Loki Max")
 		STEAMOS_NESTED_DESKTOP_WIDTH=1920
 		STEAMOS_NESTED_DESKTOP_HEIGHT=1080 ;;
-	"AYANEO 2" | "AYANEO 2S" | "AOKZOE A1 AR07" | "G1619-04")
+	"AYANEO 2" | "AYANEO 2S" | "AOKZOE A1 AR07" | "G1619-04" | "AIR Plus")
 		STEAMOS_NESTED_DESKTOP_WIDTH=1920
 		STEAMOS_NESTED_DESKTOP_HEIGHT=1200 ;;
 	"83E1")
diff --git a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
index f56b6b4e..2876cfd0 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
@@ -7,7 +7,7 @@ IMAGE_FLAVOR=$(jq -r '."image-flavor"' < $IMAGE_INFO)
 FEDORA_VERSION=$(jq -r '."fedora-version"' < $IMAGE_INFO)
 
 # SCRIPT VERSION
-HWS_VER=25
+HWS_VER=26
 HWS_VER_FILE="/etc/bazzite/hws_version"
 HWS_VER_RAN=$(cat $HWS_VER_FILE)
 
@@ -169,7 +169,7 @@ if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegam
     systemctl enable --now vpower.service
   else
     echo "Generic device detected. Performing setup..."
-    if [[ ":ROG Ally RC71L_RC71L:83E1:G1618-04:G1617-01:G1619-05:" =~ ":$SYS_ID:" ]]; then
+    if [[ ":ROG Ally RC71L_RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:" =~ ":$SYS_ID:" ]]; then
       echo "HHD supported handheld detected, disabling handycon & ds-inhibit..."
       systemctl disable --now handycon.service
       systemctl disable --now ds-inhibit.service
diff --git a/system_files/desktop/shared/usr/bin/bazzite-user-setup b/system_files/desktop/shared/usr/bin/bazzite-user-setup
index 0a870702..b4d3eef3 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-user-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-user-setup
@@ -11,7 +11,7 @@ BAZZITE_CONFIG_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/bazzite"
 mkdir -p "$BAZZITE_CONFIG_DIR"
 
 # SCRIPT VERSION
-USER_SETUP_VER=23
+USER_SETUP_VER=24
 USER_SETUP_VER_FILE="$BAZZITE_CONFIG_DIR/version"
 USER_SETUP_FEDORA_VER_FILE="$BAZZITE_CONFIG_DIR/fedora_version"
 
@@ -110,7 +110,7 @@ fi
 # Deck Build Setup
 if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegame" ]]; then
   # HHD Setup
-  if [[ ":ROG Ally RC71L_RC71L:83E1:" =~ ":$SYS_ID:" ]]; then
+  if [[ "ROG Ally RC71L_RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:" =~ ":$SYS_ID:" ]]; then
     echo 'Enabling HHD'
     pkexec /usr/libexec/bazzite-enable-hhd "$USER"
   fi