diff --git a/.config/zsh/utils.zsh b/.config/zsh/utils.zsh
index ca172e2..4077c0e 100644
--- a/.config/zsh/utils.zsh
+++ b/.config/zsh/utils.zsh
@@ -37,7 +37,7 @@ _rename_window "$DEFAULT_WINDOW_NAME"
 
 function ssh-clean() {
 	# Clean up ssh connection sockets
-	for i in $(find ~/.ssh -type s -name 'cm-*'); do
+	for i in $(find ~/.ssh/cm/ -type s); do
 		fname=$(basename $i)
 		conn=$(echo $fname | cut -d- -f2-)
 		user=$(echo $conn | cut -d@ -f1)
diff --git a/.ssh/config b/.ssh/config
index 6895fef..7585444 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -8,6 +8,7 @@ Include ~/.config/ssh/*.conf
 # Default config
 
 Host *
-     ControlPath ~/.ssh/cm-%r@%h:%p
-     ControlPersist 30m
-     ControlMaster auto
+	ControlPath ~/.ssh/cm/%j-%r@%n:%p
+	ControlPersist 30m
+	ControlMaster auto
+	PreferredAuthentications publickey,keyboard-interactive,password