diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8a0ceb88b8..5423a5c426 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,6 +5,7 @@ New software:
 
 Enhancements:
 - DietPi-Software | NFS Server: The "fsid=0" option has been removed from the /mnt/dietpi_userdata default export. As it is uncommon and not respected in "showmount -e" export lists, it caused confusion and issues.
+- DietPi-Software | YaCy: The latest YaCy version will now be installed, and the global software password will be set as default admin password on fresh installs.
 
 Bug fixes:
 - NanoPi M1 Plus | Resolved an issue where Ethernet did not work because of a faulty kernel patch. Many thanks to @InnovoMagicCube and @InnovoDeveloper for reporting this issue: https://github.com/MichaIng/DietPi/issues/6974
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 9808c6815f..87eecb9969 100755
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -4121,8 +4121,13 @@ _EOF_
 		if To_Install 133 yacy # YaCy
 		then
 			# Get latest download
-			local file=$(curl -sSfL 'https://download.yacy.net/?C=N;O=D' | grep -wo 'yacy_v[0-9._]*\.tar\.gz' | head -1)
-			[[ $file ]] || { file='yacy_v1.924_20210209_10069.tar.gz'; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} version detection failed. \"$file\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; }
+			if (( $G_HW_ARCH == 1 ))
+			then
+				local file='yacy_v1.926_202308282208_376bcfd54_last_java_8.tar.gz'
+			else
+				local file=$(curl -sSfL 'https://download.yacy.net/?C=N;O=D' | grep -wo 'yacy_v[0-9._a-f]*\.tar\.gz' | head -1)
+				[[ $file ]] || { file='yacy_v1.940_202405270005_70454654f.tar.gz'; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} version detection failed. \"$file\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; }
+			fi
 
 			Download_Install "https://download.yacy.net/$file" /etc
 
@@ -4142,6 +4147,12 @@ ExecStop=/etc/yacy/stopYACY.sh
 [Install]
 WantedBy=multi-user.target
 _EOF_
+			# Set admin interface passwd:
+			if [[ ! -f '/etc/yacy/DATA/SETTINGS/yacy.conf' ]]
+			then
+				Create_Config /etc/yacy/DATA/SETTINGS/yacy.conf yacy
+				/etc/yacy/bin/passwd.sh "$GLOBAL_PW"
+			fi
 		fi
 
 		if To_Install 186 ipfs # IPFS Node