diff --git a/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala b/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala
index 19ed2690..8cf30e44 100644
--- a/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala
+++ b/modules/joex/src/main/scala/docspell/joex/notify/YamuscaConverter.scala
@@ -8,6 +8,7 @@ package docspell.joex.notify
 
 import docspell.common._
 
+import yamusca.derive._
 import yamusca.implicits._
 import yamusca.imports._
 
@@ -23,7 +24,7 @@ trait YamuscaConverter {
     ValueConverter.of(id => Value.fromString(id.id))
 
   implicit val account: ValueConverter[AccountId] =
-    ValueConverter.deriveConverter[AccountId]
+    deriveValueConverter[AccountId]
 
 }
 
diff --git a/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala b/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala
index c7a5bb0b..88ffa5a7 100644
--- a/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala
+++ b/modules/joex/src/main/scala/docspell/joex/updatecheck/MakeMail.scala
@@ -15,6 +15,7 @@ import docspell.store.records.RUserEmail
 import emil._
 import emil.builder._
 import emil.markdown._
+import yamusca.derive._
 import yamusca.implicits._
 import yamusca.imports._
 
@@ -54,6 +55,6 @@ object MakeMail {
       TemplateCtx(thisVersion.get, release.version, release.published_at)
 
     implicit val yamuscaConverter: ValueConverter[TemplateCtx] =
-      ValueConverter.deriveConverter[TemplateCtx]
+      deriveValueConverter[TemplateCtx]
   }
 }
diff --git a/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala b/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala
index 393b2be8..fddbda4e 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala
@@ -12,6 +12,7 @@ import docspell.restserver.{BuildInfo, Config}
 
 import io.circe._
 import io.circe.generic.semiauto._
+import yamusca.derive._
 import yamusca.implicits._
 import yamusca.imports._
 
@@ -65,11 +66,11 @@ object Flags {
   implicit def yamuscaIdentConverter: ValueConverter[Ident] =
     ValueConverter.of(id => Value.fromString(id.id))
   implicit def yamuscaOpenIdAuthConverter: ValueConverter[OpenIdAuth] =
-    ValueConverter.deriveConverter[OpenIdAuth]
+    deriveValueConverter[OpenIdAuth]
   implicit def yamuscaSignupModeConverter: ValueConverter[SignupConfig.Mode] =
     ValueConverter.of(m => Value.fromString(m.name))
   implicit def yamuscaUriConverter: ValueConverter[LenientUri] =
     ValueConverter.of(uri => Value.fromString(uri.asString))
   implicit def yamuscaValueConverter: ValueConverter[Flags] =
-    ValueConverter.deriveConverter[Flags]
+    deriveValueConverter[Flags]
 }
diff --git a/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala
index 85a43fda..d3b24f28 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala
@@ -21,6 +21,7 @@ import org.http4s._
 import org.http4s.dsl.Http4sDsl
 import org.http4s.headers._
 import org.http4s.implicits._
+import yamusca.derive._
 import yamusca.implicits._
 import yamusca.imports._
 
@@ -114,7 +115,7 @@ object TemplateRoutes {
       )
 
     implicit def yamuscaValueConverter: ValueConverter[DocData] =
-      ValueConverter.deriveConverter[DocData]
+      deriveValueConverter[DocData]
   }
 
   case class IndexData(
@@ -147,7 +148,7 @@ object TemplateRoutes {
       Seq(s"/app/assets/docspell-webapp/${BuildInfo.version}/css/styles.css")
 
     implicit def yamuscaValueConverter: ValueConverter[IndexData] =
-      ValueConverter.deriveConverter[IndexData]
+      deriveValueConverter[IndexData]
   }
 
   private def memo[F[_]: Sync, A](fa: => F[A]): F[A] = {
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index ec64f1b3..32b63ef7 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -47,7 +47,7 @@ object Dependencies {
   val SourcecodeVersion = "0.2.8"
   val StanfordNlpVersion = "4.4.0"
   val TikaVersion = "2.3.0"
-  val YamuscaVersion = "0.8.2"
+  val YamuscaVersion = "0.9.0"
   val SwaggerUIVersion = "4.5.0"
   val TestContainerVersion = "0.40.2"
   val TwelveMonkeysVersion = "3.8.2"
@@ -318,7 +318,8 @@ object Dependencies {
   )
 
   val yamusca = Seq(
-    "com.github.eikek" %% "yamusca-core" % YamuscaVersion
+    "com.github.eikek" %% "yamusca-core" % YamuscaVersion,
+    "com.github.eikek" %% "yamusca-derive" % YamuscaVersion
   )
   val yamuscaCirce = Seq(
     "com.github.eikek" %% "yamusca-circe" % YamuscaVersion