diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 5fbd071916..cef243bb43 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -280,6 +280,7 @@ object Defaults extends BuildCommon {
         )
         .toFile(),
       sonaBundle / aggregate :== false,
+      sonaUploadRequestTimeout :== 10.minutes,
       commands ++= Seq(Publishing.sonaRelease, Publishing.sonaUpload),
     )
 
@@ -3108,7 +3109,6 @@ object Classpaths {
       val uuid = UUID.randomUUID().toString().take(8)
       s"$o:$v:$uuid"
     },
-    sonaUploadRequestTimeout := 10.minutes,
   )
 
   @nowarn("cat=deprecation")
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 6564f942b1..6147eb617b 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -14,7 +14,7 @@ object Dependencies {
   // sbt modules
   private val ioVersion = nightlyVersion.getOrElse("1.10.5")
   private val lmVersion =
-    sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.11.2")
+    sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.11.3")
   val zincVersion = nightlyVersion.getOrElse("1.10.8")
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
diff --git a/sbt b/sbt
index 46727548bb..f635a5a369 100755
--- a/sbt
+++ b/sbt
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 set +e
-declare builtin_sbt_version="1.11.3"
+declare builtin_sbt_version="1.11.4"
 declare -a residual_args
 declare -a java_args
 declare -a scalac_args