diff --git a/.scalafmt.conf b/.scalafmt.conf
index 6d0ee03a..fc9bd4fe 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.11.1"
+version = "3.11.4"
 runner.dialect = scala213source3
 project.git = true
 
diff --git a/bifunctor-tagless/jvm/src/main/scala/leaderboard/plugins/LeaderboardPlugin.scala b/bifunctor-tagless/jvm/src/main/scala/leaderboard/plugins/LeaderboardPlugin.scala
index 7ff56e29..8b83d5fc 100644
--- a/bifunctor-tagless/jvm/src/main/scala/leaderboard/plugins/LeaderboardPlugin.scala
+++ b/bifunctor-tagless/jvm/src/main/scala/leaderboard/plugins/LeaderboardPlugin.scala
@@ -3,7 +3,7 @@ package leaderboard.plugins
 import distage.StandardAxis.Repo
 import distage.config.ConfigModuleDef
 import distage.{ModuleDef, Scene, TagKK}
-import doobie.util.transactor.Transactor
+import org.typelevel.doobie.util.transactor.Transactor
 import izumi.distage.plugins.PluginDef
 import izumi.distage.roles.bundled.BundledRolesModule
 import izumi.distage.roles.model.definition.RoleModuleDef
diff --git a/bifunctor-tagless/jvm/src/main/scala/leaderboard/repo/LadderPostgres.scala b/bifunctor-tagless/jvm/src/main/scala/leaderboard/repo/LadderPostgres.scala
index e21900c8..09050aa3 100644
--- a/bifunctor-tagless/jvm/src/main/scala/leaderboard/repo/LadderPostgres.scala
+++ b/bifunctor-tagless/jvm/src/main/scala/leaderboard/repo/LadderPostgres.scala
@@ -1,8 +1,8 @@
 package leaderboard.repo
 
 import distage.Lifecycle
-import doobie.postgres.implicits.*
-import doobie.syntax.string.*
+import org.typelevel.doobie.postgres.implicits.*
+import org.typelevel.doobie.syntax.string.*
 import izumi.functional.bio.Monad2
 import leaderboard.model.{QueryFailure, Score, UserId}
 import leaderboard.sql.SQL
diff --git a/bifunctor-tagless/jvm/src/main/scala/leaderboard/repo/ProfilesPostgres.scala b/bifunctor-tagless/jvm/src/main/scala/leaderboard/repo/ProfilesPostgres.scala
index 23b2c1a8..a72584ca 100644
--- a/bifunctor-tagless/jvm/src/main/scala/leaderboard/repo/ProfilesPostgres.scala
+++ b/bifunctor-tagless/jvm/src/main/scala/leaderboard/repo/ProfilesPostgres.scala
@@ -1,8 +1,8 @@
 package leaderboard.repo
 
 import distage.Lifecycle
-import doobie.postgres.implicits.*
-import doobie.implicits.*
+import org.typelevel.doobie.postgres.implicits.*
+import org.typelevel.doobie.implicits.*
 import izumi.functional.bio.Monad2
 import leaderboard.model.{QueryFailure, UserId, UserProfile}
 import leaderboard.sql.SQL
diff --git a/bifunctor-tagless/jvm/src/main/scala/leaderboard/sql/SQL.scala b/bifunctor-tagless/jvm/src/main/scala/leaderboard/sql/SQL.scala
index f5d9b52f..d494bf59 100644
--- a/bifunctor-tagless/jvm/src/main/scala/leaderboard/sql/SQL.scala
+++ b/bifunctor-tagless/jvm/src/main/scala/leaderboard/sql/SQL.scala
@@ -1,7 +1,7 @@
 package leaderboard.sql
 
-import doobie.free.connection.ConnectionIO
-import doobie.util.transactor.Transactor
+import org.typelevel.doobie.free.connection.ConnectionIO
+import org.typelevel.doobie.util.transactor.Transactor
 import izumi.functional.bio.Panic2
 import izumi.functional.bio.catz.*
 import leaderboard.model.QueryFailure
diff --git a/bifunctor-tagless/jvm/src/main/scala/leaderboard/sql/TransactorResource.scala b/bifunctor-tagless/jvm/src/main/scala/leaderboard/sql/TransactorResource.scala
index 1c0ede33..206d4fff 100644
--- a/bifunctor-tagless/jvm/src/main/scala/leaderboard/sql/TransactorResource.scala
+++ b/bifunctor-tagless/jvm/src/main/scala/leaderboard/sql/TransactorResource.scala
@@ -2,7 +2,7 @@ package leaderboard.sql
 
 import cats.effect.{Async, Sync}
 import distage.{Id, Lifecycle}
-import doobie.hikari.HikariTransactor
+import org.typelevel.doobie.hikari.HikariTransactor
 import izumi.distage.model.provisioning.IntegrationCheck
 import izumi.fundamentals.platform.integration.{PortCheck, ResourceCheck}
 import leaderboard.config.{PostgresCfg, PostgresPortCfg}
diff --git a/build.sbt b/build.sbt
index 91a7e63e..deb26238 100644
--- a/build.sbt
+++ b/build.sbt
@@ -8,14 +8,14 @@ val V = new {
   val logstage      = distage
   val scalatest     = "3.2.20"
   val scalacheck    = "1.19.0"
-  val http4s        = "0.23.34"
-  val doobie        = "1.0.0-RC12"
+  val http4s        = "0.23.36"
+  val doobie        = "1.0.0-RC13"
   val catsCore      = "2.13.0"
   val zio           = "2.1.26"
   val zioCats       = "23.1.0.13"
   val kindProjector = "0.13.4"
-  val circeGeneric  = "0.14.15"
-  val graalMetadata = "1.1.1"
+  val circeGeneric  = "0.14.16"
+  val graalMetadata = "1.1.5"
   val catsEffect    = "3.5.4"
 }
 
@@ -37,9 +37,9 @@ val Deps = new {
 
   val circeGeneric = "io.circe" %% "circe-generic" % V.circeGeneric
 
-  val doobie         = "org.tpolecat" %% "doobie-core" % V.doobie
-  val doobiePostgres = "org.tpolecat" %% "doobie-postgres" % V.doobie
-  val doobieHikari   = "org.tpolecat" %% "doobie-hikari" % V.doobie
+  val doobie         = "org.typelevel" %% "doobie-core" % V.doobie
+  val doobiePostgres = "org.typelevel" %% "doobie-postgres" % V.doobie
+  val doobieHikari   = "org.typelevel" %% "doobie-hikari" % V.doobie
 
   val kindProjector = "org.typelevel" % "kind-projector" % V.kindProjector cross CrossVersion.full
 
@@ -76,8 +76,8 @@ val Deps = new {
 
 inThisBuild(
   Seq(
-    crossScalaVersions := Seq("2.13.18", "3.3.7"),
-//    crossScalaVersions := Seq("3.3.7", "2.13.18"), // uncomment to use Scala 3 in IDE
+    crossScalaVersions := Seq("2.13.18", "3.3.8"),
+//    crossScalaVersions := Seq("3.3.8", "2.13.18"), // uncomment to use Scala 3 in IDE
     scalaVersion := crossScalaVersions.value.head,
     version      := "1.0.0",
     organization := "io.7mind",
diff --git a/monofunctor-tagless/src/main/scala/leaderboard/plugins/LeaderboardPlugin.scala b/monofunctor-tagless/src/main/scala/leaderboard/plugins/LeaderboardPlugin.scala
index 9e70ffa5..e916e5b4 100644
--- a/monofunctor-tagless/src/main/scala/leaderboard/plugins/LeaderboardPlugin.scala
+++ b/monofunctor-tagless/src/main/scala/leaderboard/plugins/LeaderboardPlugin.scala
@@ -3,7 +3,7 @@ package leaderboard.plugins
 import distage.StandardAxis.Repo
 import distage.config.ConfigModuleDef
 import distage.{ModuleDef, Scene, TagK}
-import doobie.util.transactor.Transactor
+import org.typelevel.doobie.util.transactor.Transactor
 import izumi.distage.plugins.{PluginBase, PluginDef}
 import izumi.distage.roles.bundled.BundledRolesModule
 import izumi.distage.roles.model.definition.RoleModuleDef
diff --git a/monofunctor-tagless/src/main/scala/leaderboard/repo/Ladder.scala b/monofunctor-tagless/src/main/scala/leaderboard/repo/Ladder.scala
index 6aced8ce..3cc77b26 100644
--- a/monofunctor-tagless/src/main/scala/leaderboard/repo/Ladder.scala
+++ b/monofunctor-tagless/src/main/scala/leaderboard/repo/Ladder.scala
@@ -4,8 +4,8 @@ import cats.Monad
 import cats.effect.{Concurrent, Ref}
 import cats.syntax.all.*
 import distage.Lifecycle
-import doobie.postgres.implicits.*
-import doobie.syntax.string.*
+import org.typelevel.doobie.postgres.implicits.*
+import org.typelevel.doobie.syntax.string.*
 import leaderboard.model.{Score, UserId}
 import leaderboard.sql.SQL
 import logstage.LogIO
diff --git a/monofunctor-tagless/src/main/scala/leaderboard/repo/Profiles.scala b/monofunctor-tagless/src/main/scala/leaderboard/repo/Profiles.scala
index 8c8532f6..fd31335c 100644
--- a/monofunctor-tagless/src/main/scala/leaderboard/repo/Profiles.scala
+++ b/monofunctor-tagless/src/main/scala/leaderboard/repo/Profiles.scala
@@ -4,8 +4,8 @@ import cats.Monad
 import cats.effect.{Concurrent, Ref}
 import cats.syntax.all.*
 import distage.Lifecycle
-import doobie.postgres.implicits.*
-import doobie.implicits.*
+import org.typelevel.doobie.postgres.implicits.*
+import org.typelevel.doobie.implicits.*
 import leaderboard.model.{UserId, UserProfile}
 import leaderboard.sql.SQL
 import logstage.LogIO
diff --git a/monofunctor-tagless/src/main/scala/leaderboard/sql/SQL.scala b/monofunctor-tagless/src/main/scala/leaderboard/sql/SQL.scala
index f8750216..71533c9c 100644
--- a/monofunctor-tagless/src/main/scala/leaderboard/sql/SQL.scala
+++ b/monofunctor-tagless/src/main/scala/leaderboard/sql/SQL.scala
@@ -2,8 +2,8 @@ package leaderboard.sql
 
 import cats.effect.Async
 import cats.syntax.applicativeError.*
-import doobie.free.connection.ConnectionIO
-import doobie.util.transactor.Transactor
+import org.typelevel.doobie.free.connection.ConnectionIO
+import org.typelevel.doobie.util.transactor.Transactor
 import leaderboard.model.QueryFailure
 
 trait SQL[F[_]] {
diff --git a/monofunctor-tagless/src/main/scala/leaderboard/sql/TransactorResource.scala b/monofunctor-tagless/src/main/scala/leaderboard/sql/TransactorResource.scala
index 1c0ede33..206d4fff 100644
--- a/monofunctor-tagless/src/main/scala/leaderboard/sql/TransactorResource.scala
+++ b/monofunctor-tagless/src/main/scala/leaderboard/sql/TransactorResource.scala
@@ -2,7 +2,7 @@ package leaderboard.sql
 
 import cats.effect.{Async, Sync}
 import distage.{Id, Lifecycle}
-import doobie.hikari.HikariTransactor
+import org.typelevel.doobie.hikari.HikariTransactor
 import izumi.distage.model.provisioning.IntegrationCheck
 import izumi.fundamentals.platform.integration.{PortCheck, ResourceCheck}
 import leaderboard.config.{PostgresCfg, PostgresPortCfg}
diff --git a/monomorphic-cats/src/main/scala/leaderboard/plugins/LeaderboardPlugin.scala b/monomorphic-cats/src/main/scala/leaderboard/plugins/LeaderboardPlugin.scala
index 1b994a32..d8717580 100644
--- a/monomorphic-cats/src/main/scala/leaderboard/plugins/LeaderboardPlugin.scala
+++ b/monomorphic-cats/src/main/scala/leaderboard/plugins/LeaderboardPlugin.scala
@@ -4,7 +4,7 @@ import cats.effect.IO
 import distage.StandardAxis.Repo
 import distage.config.ConfigModuleDef
 import distage.{ModuleDef, Scene}
-import doobie.util.transactor.Transactor
+import org.typelevel.doobie.util.transactor.Transactor
 import izumi.distage.plugins.PluginDef
 import izumi.distage.roles.bundled.BundledRolesModule
 import izumi.distage.roles.model.definition.RoleModuleDef
diff --git a/monomorphic-cats/src/main/scala/leaderboard/repo/Ladder.scala b/monomorphic-cats/src/main/scala/leaderboard/repo/Ladder.scala
index 6821aa8b..0114c765 100644
--- a/monomorphic-cats/src/main/scala/leaderboard/repo/Ladder.scala
+++ b/monomorphic-cats/src/main/scala/leaderboard/repo/Ladder.scala
@@ -2,8 +2,8 @@ package leaderboard.repo
 
 import cats.effect.{IO, Ref}
 import distage.Lifecycle
-import doobie.postgres.implicits.*
-import doobie.syntax.string.*
+import org.typelevel.doobie.postgres.implicits.*
+import org.typelevel.doobie.syntax.string.*
 import leaderboard.model.{Score, UserId}
 import leaderboard.sql.SQL
 import logstage.LogIO
diff --git a/monomorphic-cats/src/main/scala/leaderboard/repo/Profiles.scala b/monomorphic-cats/src/main/scala/leaderboard/repo/Profiles.scala
index 6542dee3..18ffd236 100644
--- a/monomorphic-cats/src/main/scala/leaderboard/repo/Profiles.scala
+++ b/monomorphic-cats/src/main/scala/leaderboard/repo/Profiles.scala
@@ -2,8 +2,8 @@ package leaderboard.repo
 
 import cats.effect.{IO, Ref}
 import distage.Lifecycle
-import doobie.implicits.*
-import doobie.postgres.implicits.*
+import org.typelevel.doobie.implicits.*
+import org.typelevel.doobie.postgres.implicits.*
 import leaderboard.model.{UserId, UserProfile}
 import leaderboard.sql.SQL
 import logstage.LogIO
diff --git a/monomorphic-cats/src/main/scala/leaderboard/sql/SQL.scala b/monomorphic-cats/src/main/scala/leaderboard/sql/SQL.scala
index a514a2cb..e4446a0f 100644
--- a/monomorphic-cats/src/main/scala/leaderboard/sql/SQL.scala
+++ b/monomorphic-cats/src/main/scala/leaderboard/sql/SQL.scala
@@ -1,8 +1,8 @@
 package leaderboard.sql
 
 import cats.effect.IO
-import doobie.free.connection.ConnectionIO
-import doobie.util.transactor.Transactor
+import org.typelevel.doobie.free.connection.ConnectionIO
+import org.typelevel.doobie.util.transactor.Transactor
 import leaderboard.model.QueryFailure
 
 trait SQL {
diff --git a/monomorphic-cats/src/main/scala/leaderboard/sql/TransactorResource.scala b/monomorphic-cats/src/main/scala/leaderboard/sql/TransactorResource.scala
index 64a2909b..95e40223 100644
--- a/monomorphic-cats/src/main/scala/leaderboard/sql/TransactorResource.scala
+++ b/monomorphic-cats/src/main/scala/leaderboard/sql/TransactorResource.scala
@@ -1,7 +1,7 @@
 package leaderboard.sql
 
 import distage.{Id, Lifecycle}
-import doobie.hikari.HikariTransactor
+import org.typelevel.doobie.hikari.HikariTransactor
 import izumi.distage.model.provisioning.IntegrationCheck
 import izumi.fundamentals.platform.integration.{PortCheck, ResourceCheck}
 import leaderboard.config.{PostgresCfg, PostgresPortCfg}
diff --git a/project/build.properties b/project/build.properties
index dabdb159..e544c4d1 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.12.11
+sbt.version=1.12.14
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 7c9cdd98..129f96ec 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,5 @@
-addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.5")
+addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.7")
 addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.13")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.21.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")