diff --git a/build.sbt b/build.sbt
index ccce300d0..202457634 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,7 @@
 import sbt.Def
 
-lazy val kafkaVersion         = "3.6.1"
-lazy val embeddedKafkaVersion = "3.6.1" // Should be the same as kafkaVersion, except for the patch part
+lazy val kafkaVersion         = "3.7.0"
+lazy val embeddedKafkaVersion = "3.7.0" // Should be the same as kafkaVersion, except for the patch part
 
 lazy val kafkaClients          = "org.apache.kafka"        % "kafka-clients"           % kafkaVersion
 lazy val scalaCollectionCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0"
diff --git a/zio-kafka/src/main/scala/zio/kafka/admin/AdminClient.scala b/zio-kafka/src/main/scala/zio/kafka/admin/AdminClient.scala
index eefedf94f..92b529cbc 100644
--- a/zio-kafka/src/main/scala/zio/kafka/admin/AdminClient.scala
+++ b/zio-kafka/src/main/scala/zio/kafka/admin/AdminClient.scala
@@ -986,12 +986,17 @@ object AdminClient {
       override def asJava = JConfigResource.Type.UNKNOWN
     }
 
+    case object ClientMetrics extends ConfigResourceType {
+      override def asJava = JConfigResource.Type.CLIENT_METRICS
+    }
+
     def apply(jcrt: JConfigResource.Type): ConfigResourceType =
       jcrt match {
-        case JConfigResource.Type.BROKER_LOGGER => BrokerLogger
-        case JConfigResource.Type.BROKER        => Broker
-        case JConfigResource.Type.TOPIC         => Topic
-        case JConfigResource.Type.UNKNOWN       => Unknown
+        case JConfigResource.Type.BROKER_LOGGER  => BrokerLogger
+        case JConfigResource.Type.BROKER         => Broker
+        case JConfigResource.Type.TOPIC          => Topic
+        case JConfigResource.Type.UNKNOWN        => Unknown
+        case JConfigResource.Type.CLIENT_METRICS => ClientMetrics
       }
   }