diff --git a/.meta/dietpi-trixie-upgrade b/.meta/dietpi-trixie-upgrade
index 0ee05bfe48..3071b0ab1f 100644
--- a/.meta/dietpi-trixie-upgrade
+++ b/.meta/dietpi-trixie-upgrade
@@ -19,7 +19,6 @@ do
 		65) alist+=('Netdata');;
 		111) (( $G_HW_ARCH < 3 )) && alist+=('UrBackup');;
 		116) alist+=('Medusa');;
-		124) (( $G_HW_ARCH < 3 )) && alist+=('NAA Daemon');;
 		148) (( $G_HW_ARCH == 1 )) && alist+=('myMPD');;
 		178) (( $G_HW_ARCH < 3 )) && alist+=('Jellyfin');;
 		194) (( $G_HW_ARCH < 3 )) && alist+=('PostgreSQL');;
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5f34be5d52..9b4ff95c91 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -7,6 +7,7 @@ New software:
 Enhancement:
 - DietPi-Banner | An option to wrap the banner output for smaller terminals/screens has been added. Run "dietpi-banner" from console to configure its output, and find the new option at the bottom of the list. Many thanks to @mtekman for implementing this feature: https://github.com/MichaIng/DietPi/pull/7779
 - DietPi-Software | UrBackup: Support for Debian Trixie and above has been unlocked for x86_64 systems, which do now depend on the correct OpenSSL flavour of libcurl. This is not the case yet for the ARMv7 build, which still depends on "libcurl3-gnutls", not available on Debian Trixie.
+- DietPi-Software | NAA Daemon: Support for Debian Trixie and above on ARMv6/7 systems has been unlocked.
 
 Bug fixes:
 - Raspberry Pi | We updated our raspberrypi-sys-mods package to be compatible with the new kernel stack and Raspberry Pi 5. This solves several issues like missing serial console access on first boot, missing device nodes or permissions to access them with gpio/i2c/spi/video system groups.
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 32015ab454..dbd8675533 100755
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -433,8 +433,6 @@ Available commands:
 		aSOFTWARE_DEPS[$software_id]='5'
 		# - RISC-V: https://signalyst.com/bins/naa/linux/
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,11]=0
-		# - ARMv6/7 Trixie
-		(( $G_HW_ARCH < 3 && $G_DISTRO > 7 )) && aSOFTWARE_AVAIL_G_DISTRO[$software_id,$G_DISTRO]=0
 		#------------------
 		software_id=128
 		aSOFTWARE_NAME[$software_id]='MPD'
@@ -489,8 +487,8 @@ Available commands:
 		(( $G_HW_ARCH == 1 || $G_HW_ARCH == 11 )) || aSOFTWARE_DEPS[$software_id]+=' 121'
 		# Netdata not available on Trixie
 		(( $G_DISTRO > 7 )) || aSOFTWARE_DEPS[$software_id]+=' 65'
-		# NAA Daemon not available for ARMv6/7 Trixie and RISC-V
-		(( $G_HW_ARCH < 3 && $G_DISTRO > 7 || $G_HW_ARCH == 11 )) || aSOFTWARE_DEPS[$software_id]+=' 124'
+		# NAA Daemon not available for RISC-V
+		(( $G_HW_ARCH == 11 )) || aSOFTWARE_DEPS[$software_id]+=' 124'
 		#------------------
 		software_id=160
 		aSOFTWARE_NAME[$software_id]='Allo GUI'
@@ -7002,9 +7000,7 @@ _EOF_
 		if To_Install 124 networkaudiod # NAA Daemon
 		then
 			# Base URL
-			local dist=$G_DISTRO_NAME
-			(( $G_DISTRO > 7 )) && dist='bookworm'
-			local url="https://signalyst.com/bins/naa/linux/$dist/"
+			local url="https://signalyst.com/bins/naa/linux/${G_DISTRO_NAME/forky/trixie}/"
 
 			# Check download dir
 			G_CHECK_URL "$url"
@@ -7019,7 +7015,7 @@ _EOF_
 			Download_Install "${package:+$url$package}"
 			G_EXEC systemctl stop networkaudiod
 
-			unset -v url arch package
+			unset -v url package
 		fi
 
 		if To_Install 71 webiopi # WebIOPi