diff --git a/pentoo/zero-system/files/zero-system-ssh.conf b/pentoo/zero-system/files/zero-system-ssh.conf
new file mode 100644
index 000000000..cafbe7e37
--- /dev/null
+++ b/pentoo/zero-system/files/zero-system-ssh.conf
@@ -0,0 +1,7 @@
+Host *
+  ControlMaster auto
+  ControlPath ~/.ssh/sockets/%r@%h-%p
+  ControlPersist 3600
+  Compression yes
+  PasswordAuthentication no
+  PreferredAuthentications publickey
diff --git a/pentoo/zero-system/files/zero-system.conf b/pentoo/zero-system/files/zero-system-sshd.conf
similarity index 100%
rename from pentoo/zero-system/files/zero-system.conf
rename to pentoo/zero-system/files/zero-system-sshd.conf
diff --git a/pentoo/zero-system/zero-system-2025.3-r1.ebuild b/pentoo/zero-system/zero-system-2025.3-r2.ebuild
similarity index 94%
rename from pentoo/zero-system/zero-system-2025.3-r1.ebuild
rename to pentoo/zero-system/zero-system-2025.3-r2.ebuild
index 851c6b869..6e102c74f 100644
--- a/pentoo/zero-system/zero-system-2025.3-r1.ebuild
+++ b/pentoo/zero-system/zero-system-2025.3-r2.ebuild
@@ -135,9 +135,12 @@ src_install() {
 	keepdir /etc/skel/.vim-scratch
 
 	insinto /etc/ssh/sshd_config.d
-	doins "${FILESDIR}"/zero-system.conf
-	fperms 600 '/etc/ssh/sshd_config.d/zero-system.conf'
+	doins "${FILESDIR}"/zero-system-sshd.conf
+	fperms 600 '/etc/ssh/sshd_config.d/zero-system-sshd.conf'
 
+	insinto /etc/ssh/ssh_config.d
+	doins "${FILESDIR}"/zero-system-ssh.conf
+	fperms 644 '/etc/ssh/ssh_config.d/zero-system-ssh.conf'
 }
 
 pkg_postinst() {