diff --git a/board/common/rootfs/etc/ssh/sshd_config b/board/common/rootfs/etc/ssh/sshd_config
index cf9ac977..98d81b92 100644
--- a/board/common/rootfs/etc/ssh/sshd_config
+++ b/board/common/rootfs/etc/ssh/sshd_config
@@ -1 +1,4 @@
+# Allow client to pass locale environment
+AcceptEnv LANG LC_*
+
 Include /etc/ssh/sshd_config.d/*.conf
diff --git a/board/common/rootfs/etc/ssh/sshd_config.d/cli.conf b/board/common/rootfs/etc/ssh/sshd_config.d/cli.conf
deleted file mode 100644
index 6946e76b..00000000
--- a/board/common/rootfs/etc/ssh/sshd_config.d/cli.conf
+++ /dev/null
@@ -1 +0,0 @@
-Subsystem cli /usr/bin/klish
diff --git a/board/common/rootfs/etc/ssh/sshd_config.d/sftp.conf b/board/common/rootfs/etc/ssh/sshd_config.d/sftp.conf
new file mode 100644
index 00000000..ac9b6a65
--- /dev/null
+++ b/board/common/rootfs/etc/ssh/sshd_config.d/sftp.conf
@@ -0,0 +1 @@
+Subsystem	sftp	/usr/libexec/sftp-server