diff --git a/build.sbt b/build.sbt
index 3bc6f07..efaf07a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -43,7 +43,7 @@
   "org.apache.commons"              % "commons-compress"             % "1.18",
   "org.apache.commons"              % "commons-email"                % "1.5",
   "org.apache.httpcomponents"       % "httpclient"                   % "4.5.6",
-  "org.apache.sshd"                 % "apache-sshd"                  % "1.7.0" exclude ("org.slf4j", "slf4j-jdk14"),
+  "org.apache.sshd"                 % "apache-sshd"                  % "2.1.0" exclude ("org.slf4j", "slf4j-jdk14"),
   "org.apache.tika"                 % "tika-core"                    % "1.19",
   "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.10",
   "com.novell.ldap"                 % "jldap"                        % "2009-10-07",
diff --git a/src/main/scala/gitbucket/core/plugin/Plugin.scala b/src/main/scala/gitbucket/core/plugin/Plugin.scala
index 92a51ea..06355f2 100644
--- a/src/main/scala/gitbucket/core/plugin/Plugin.scala
+++ b/src/main/scala/gitbucket/core/plugin/Plugin.scala
@@ -8,7 +8,7 @@
 import gitbucket.core.service.SystemSettingsService.SystemSettings
 import gitbucket.core.util.SyntaxSugars._
 import io.github.gitbucket.solidbase.model.Version
-import org.apache.sshd.server.Command
+import org.apache.sshd.server.command.Command
 import play.twirl.api.Html
 
 /**
diff --git a/src/main/scala/gitbucket/core/plugin/PluginRegistry.scala b/src/main/scala/gitbucket/core/plugin/PluginRegistry.scala
index 6964732..c37f1ae 100644
--- a/src/main/scala/gitbucket/core/plugin/PluginRegistry.scala
+++ b/src/main/scala/gitbucket/core/plugin/PluginRegistry.scala
@@ -24,7 +24,7 @@
 import io.github.gitbucket.solidbase.model.Module
 import org.apache.commons.io.FileUtils
 import org.apache.http.client.methods.HttpGet
-import org.apache.sshd.server.Command
+import org.apache.sshd.server.command.Command
 import org.slf4j.LoggerFactory
 import play.twirl.api.Html
 
diff --git a/src/main/scala/gitbucket/core/ssh/GitCommand.scala b/src/main/scala/gitbucket/core/ssh/GitCommand.scala
index 8380e94..8e8cfe5 100644
--- a/src/main/scala/gitbucket/core/ssh/GitCommand.scala
+++ b/src/main/scala/gitbucket/core/ssh/GitCommand.scala
@@ -5,7 +5,8 @@
 import gitbucket.core.service.{AccountService, DeployKeyService, RepositoryService, SystemSettingsService}
 import gitbucket.core.servlet.{CommitLogHook, Database}
 import gitbucket.core.util.{SyntaxSugars, Directory}
-import org.apache.sshd.server.{Command, CommandFactory, Environment, ExitCallback, SessionAware}
+import org.apache.sshd.server.{Environment, ExitCallback, SessionAware}
+import org.apache.sshd.server.command.{Command, CommandFactory}
 import org.apache.sshd.server.session.ServerSession
 import org.slf4j.LoggerFactory
 import java.io.{File, InputStream, OutputStream}
@@ -15,7 +16,7 @@
 import Directory._
 import gitbucket.core.ssh.PublicKeyAuthenticator.AuthType
 import org.eclipse.jgit.transport.{ReceivePack, UploadPack}
-import org.apache.sshd.server.scp.UnknownCommand
+import org.apache.sshd.server.shell.UnknownCommand
 import org.eclipse.jgit.errors.RepositoryNotFoundException
 
 object GitCommand {
diff --git a/src/main/scala/gitbucket/core/ssh/NoShell.scala b/src/main/scala/gitbucket/core/ssh/NoShell.scala
index 45130e4..b350e26 100644
--- a/src/main/scala/gitbucket/core/ssh/NoShell.scala
+++ b/src/main/scala/gitbucket/core/ssh/NoShell.scala
@@ -2,7 +2,8 @@
 
 import gitbucket.core.service.SystemSettingsService.SshAddress
 import org.apache.sshd.common.Factory
-import org.apache.sshd.server.{Environment, ExitCallback, Command}
+import org.apache.sshd.server.{Environment, ExitCallback}
+import org.apache.sshd.server.command.Command
 import java.io.{OutputStream, InputStream}
 import org.eclipse.jgit.lib.Constants
 
diff --git a/src/main/scala/gitbucket/core/ssh/SshServerListener.scala b/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
index fe04b9f..d5e8397 100644
--- a/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
+++ b/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
@@ -17,7 +17,9 @@
 
   private def configure(sshAddress: SshAddress, baseUrl: String) = {
     server.setPort(sshAddress.port)
-    val provider = new SimpleGeneratorHostKeyProvider(new File(s"${Directory.GitBucketHome}/gitbucket.ser"))
+    val provider = new SimpleGeneratorHostKeyProvider(
+      java.nio.file.Paths.get(s"${Directory.GitBucketHome}/gitbucket.ser")
+    )
     provider.setAlgorithm("RSA")
     provider.setOverwriteAllowed(false)
     server.setKeyPairProvider(provider)
diff --git a/src/test/scala/gitbucket/core/ssh/GitCommandSpec.scala b/src/test/scala/gitbucket/core/ssh/GitCommandSpec.scala
index 9051c57..93dd0d4 100644
--- a/src/test/scala/gitbucket/core/ssh/GitCommandSpec.scala
+++ b/src/test/scala/gitbucket/core/ssh/GitCommandSpec.scala
@@ -1,6 +1,6 @@
 package gitbucket.core.ssh
 
-import org.apache.sshd.server.scp.UnknownCommand
+import org.apache.sshd.server.shell.UnknownCommand
 import org.scalatest.FunSpec
 
 class GitCommandFactorySpec extends FunSpec {