diff --git a/.build/images/dietpi-installer b/.build/images/dietpi-installer
index f60c82ddf2..21055faaff 100755
--- a/.build/images/dietpi-installer
+++ b/.build/images/dietpi-installer
@@ -791,6 +791,11 @@ setenv rootuuid "true"' /boot/boot.cmd
 				G_EXEC mv "$dir/.build/images/NanoPiM3/boot.cmd" /boot/boot.cmd
 				G_EXEC sed --follow-symlinks -i '/overlay/d' /boot/dietpiEnv.txt
 				G_EXEC sed --follow-symlinks -i 's/ttyAML0/ttySAC0/' /boot/dietpiEnv.txt
+				# Device tree
+				case $HW_VARIANT in
+					2) G_CONFIG_INJECT 'fdtfile=' 'fdtfile=s5p6818-nanopi-fire3.dtb' /boot/dietpiEnv.txt;;
+					*) G_CONFIG_INJECT 'fdtfile=' 'fdtfile=s5p6818-nanopi-m3.dtb' /boot/dietpiEnv.txt;;
+				esac
 			fi
 		fi
 
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1e10bb210d..f2c373f916 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ v9.8
 Enhancements:
 
 Bug fixes:
+- NanoPi M3/T3 | Resolved an issue where our recent image did not boot because the bootloader did not define a default device tree path anymore. Many thanks to @rozcietrzewiacz for reporting this issue: https://github.com/MichaIng/DietPi/issues/2630#issuecomment-2322085507
 - DietPi-Software | NoMachine: Resolved an issue where the installation failed due to an outdated download URL. Many thanks to @tzvi208 for reporting this issue: https://github.com/MichaIng/DietPi/issues/7198
 
 As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/ADDME