diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f2c373f916..d67dfed404 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,7 @@ v9.8
 (2024-09-XX)
 
 Enhancements:
+- DietPi-Software | NoMachine: Our install option will now always download the latest NoMachine version, instead of a hardcoded one depending on the DietPi version. Many thanks to @tzvi208 for for figuring it out to version-agnostic download URLs: https://github.com/MichaIng/DietPi/issues/7198
 
 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
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index e7be946a59..cef1f4fb6c 100755
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -3258,14 +3258,13 @@ _EOF_
 
 		if To_Install 30 # NoMachine
 		then
-			local version='8.13.1_1' # https://downloads.nomachine.com/
 			case $G_HW_ARCH in
-				1) local url="Raspberry/nomachine_${version}_armv6hf";;
-				2) local url="Arm/nomachine_${version}_armhf";;
-				3) local url="Arm/nomachine_${version}_arm64";;
-				*) local url="Linux/nomachine_${version}_amd64";;
+				1) local url='raspberry/v6/deb/nomachine_latest_armv6hf';;
+				2) local url='arm/v7/deb/nomachine_latest_armhf';;
+				3) local url='arm/v8/deb/nomachine_latest_arm64';;
+				*) local url='linux/64/deb/nomachine_latest_amd64';;
 			esac
-			Download_Install "https://download.nomachine.com/download/${version%.*}/$url.deb"
+			Download_Install "https://www.nomachine.com/free/$url.deb"
 			aSTART_SERVICES+=('nxserver')
 		fi