diff --git a/.github/workflows/dietpi-software.bash b/.github/workflows/dietpi-software.bash
index 6d330a068e..1014e57070 100644
--- a/.github/workflows/dietpi-software.bash
+++ b/.github/workflows/dietpi-software.bash
@@ -359,6 +359,12 @@ G_CONFIG_INJECT 'AUTO_SETUP_AUTOMATED=' 'AUTO_SETUP_AUTOMATED=1' rootfs/boot/die
 # - Set HOME path, required e.g. go builds, which is otherwise missing when started from a systemd unit.
 if [[ $DISTRO == 'trixie' ]] && (( $G_HW_ARCH != $arch && ( $G_HW_ARCH > 9 || $G_HW_ARCH < $arch ) ))
 then
+	for i in rootfs/usr/lib/systemd/system/*.service
+	do
+		grep -q '^ImportCredential=' "$i" || continue
+		G_EXEC mkdir "${i/usr\/lib/etc}.d"
+		G_EXEC eval "echo -e '[Service]\nImportCredential=' > ${i/usr\/lib/etc}.d/dietpi-no-ImportCredential.conf"
+	done
 	cat << '_EOF_' > rootfs/etc/systemd/system/dietpi-automation.service
 [Unit]
 Description=DietPi-Automation