diff --git a/config/boards/ayn-odin2-grub.csc b/config/boards/ayn-odin2-grub.csc
index 817aeca801..09ec74ac84 100644
--- a/config/boards/ayn-odin2-grub.csc
+++ b/config/boards/ayn-odin2-grub.csc
@@ -110,6 +110,12 @@ function post_family_tweaks_bsp__ayn-odin2_bsp_firmware_in_initrd() {
 		#!/bin/bash
 		[[ "$1" == "prereqs" ]] && exit 0
 		. /usr/share/initramfs-tools/hook-functions
+		for f in /lib/firmware/qcom/sm8550/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
+		for f in /lib/firmware/qcom/sm8550/ayn/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
 		for f in /lib/firmware/qcom/sm8550/ayn/odin2portal/* ; do
 			add_firmware "${f#/lib/firmware/}"
 		done
diff --git a/config/boards/ayn-odin2-portal-grub.csc b/config/boards/ayn-odin2-portal-grub.csc
index ddb460251e..711dff7694 100644
--- a/config/boards/ayn-odin2-portal-grub.csc
+++ b/config/boards/ayn-odin2-portal-grub.csc
@@ -26,7 +26,6 @@ function ayn-odin2portal_is_userspace_supported() {
 	[[ "${RELEASE}" == "trixie" ]] && return 0
 	[[ "${RELEASE}" == "noble" ]] && return 0
 	[[ "${RELEASE}" == "plucky" ]] && return 0
-	[[ "${RELEASE}" == "questing" ]] && return 0
 	return 1
 }
 
@@ -72,7 +71,7 @@ function post_family_tweaks__ayn-odin2portal_enable_services() {
 		return 0
 	fi
 
-	if [[ "${RELEASE}" == "jammy" ]] || [[ "${RELEASE}" == "noble" ]] || [[ "${RELEASE}" == "plucky" ]] || [[ "${RELEASE}" == "questing" ]]; then
+	if [[ "${RELEASE}" == "jammy" ]] || [[ "${RELEASE}" == "noble" ]] || [[ "${RELEASE}" == "plucky" ]]; then
 		display_alert "Adding Mesa PPA For Ubuntu ${BOARD}" "warn"
 		do_with_retries 3 chroot_sdcard add-apt-repository ppa:kisak/kisak-mesa --yes
 
@@ -110,6 +109,12 @@ function post_family_tweaks_bsp__ayn-odin2portal_bsp_firmware_in_initrd() {
 		#!/bin/bash
 		[[ "$1" == "prereqs" ]] && exit 0
 		. /usr/share/initramfs-tools/hook-functions
+		for f in /lib/firmware/qcom/sm8550/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
+		for f in /lib/firmware/qcom/sm8550/ayn/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
 		for f in /lib/firmware/qcom/sm8550/ayn/odin2portal/* ; do
 			add_firmware "${f#/lib/firmware/}"
 		done
diff --git a/config/boards/ayn-odin2.csc b/config/boards/ayn-odin2.csc
index 8c63c18e25..79d8e6f496 100644
--- a/config/boards/ayn-odin2.csc
+++ b/config/boards/ayn-odin2.csc
@@ -105,6 +105,12 @@ function post_family_tweaks_bsp__ayn-odin2_bsp_firmware_in_initrd() {
 		#!/bin/bash
 		[[ "$1" == "prereqs" ]] && exit 0
 		. /usr/share/initramfs-tools/hook-functions
+		for f in /lib/firmware/qcom/sm8550/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
+		for f in /lib/firmware/qcom/sm8550/ayn/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
 		for f in /lib/firmware/qcom/sm8550/ayn/odin2portal/* ; do
 			add_firmware "${f#/lib/firmware/}"
 		done