diff --git a/config/boards/odroidhc4.csc b/config/boards/odroidhc4.csc
index a0df6d3ec7..9de607795e 100644
--- a/config/boards/odroidhc4.csc
+++ b/config/boards/odroidhc4.csc
@@ -8,7 +8,7 @@ MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="no"
 SERIALCON="ttyAML0"
 BOOT_FDT_FILE="amlogic/meson-sm1-odroid-hc4.dtb"
-PACKAGE_LIST_BOARD="mtd-utils lm-sensors fancontrol" # SPI, sensors, manual fan control via 'pwmconfig'
+PACKAGE_LIST_BOARD="lm-sensors fancontrol" # SPI, sensors, manual fan control via 'pwmconfig'
 
 # Newer u-boot for the HC4. There's patches in `board_odroidhc4` for the defconfigs used in the UBOOT_TARGET_MAP below.
 BOOTBRANCH_BOARD="tag:v2023.01"
diff --git a/config/optional/architectures/armhf/_config/cli/noble b/config/optional/architectures/armhf/_config/cli/noble
deleted file mode 120000
index 9a63c961dc..0000000000
--- a/config/optional/architectures/armhf/_config/cli/noble
+++ /dev/null
@@ -1 +0,0 @@
-sid
\ No newline at end of file
diff --git a/config/optional/architectures/armhf/_config/cli/noble/main/packages b/config/optional/architectures/armhf/_config/cli/noble/main/packages
new file mode 100644
index 0000000000..9d8cabdad7
--- /dev/null
+++ b/config/optional/architectures/armhf/_config/cli/noble/main/packages
@@ -0,0 +1,3 @@
+gpiod
+#mtd-utils
+nocache
diff --git a/config/optional/architectures/armhf/_config/cli/noble/main/packages.additional b/config/optional/architectures/armhf/_config/cli/noble/main/packages.additional
new file mode 100644
index 0000000000..52e608d18f
--- /dev/null
+++ b/config/optional/architectures/armhf/_config/cli/noble/main/packages.additional
@@ -0,0 +1 @@
+iozone3