diff --git a/config/rootfiles/oldcore/94/filelists/files b/config/rootfiles/oldcore/94/filelists/files
index e63a611fc..9ef227bb6 100644
--- a/config/rootfiles/oldcore/94/filelists/files
+++ b/config/rootfiles/oldcore/94/filelists/files
@@ -22,5 +22,6 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi
 srv/web/ipfire/cgi-bin/wakeonlan.cgi
 srv/web/ipfire/cgi-bin/wireless.cgi
 var/ipfire/langs
+var/ipfire/menu.d/10-system.menu
 var/ipfire/menu.d/40-services.menu
 var/ipfire/network-functions.pl
diff --git a/config/rootfiles/oldcore/94/update.sh b/config/rootfiles/oldcore/94/update.sh
index a9c24a5f8..99aa04659 100644
--- a/config/rootfiles/oldcore/94/update.sh
+++ b/config/rootfiles/oldcore/94/update.sh
@@ -48,9 +48,10 @@ telinit u
 # Update SSH configuration
 sed -i /etc/ssh/sshd_config \
 	-e 's/^#PermitRootLogin yes$/PermitRootLogin yes/' \
-	-e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_rsa_key|' \
-	-e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \
-	-e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$|HostKey /etc/ssh/ssh_host_ed25519_key|' \
+	-e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$||' \
+	-e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$||' \
+	-e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$||' \
+	-e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
 
 # Move away old and unsupported keys
 mv -f /etc/ssh/ssh_host_dsa_key{,.old}
diff --git a/lfs/openssh b/lfs/openssh
index 1178d6ff0..0bba1ecd9 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -91,9 +91,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	    -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
 	    -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
 	    -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \
-	    -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_rsa_key|' \
-	    -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \
-	    -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$|HostKey /etc/ssh/ssh_host_ed25519_key|' \
+	    -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \
+	    -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \
+	    -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \
+	    -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
 	    /etc/ssh/sshd_config
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)