diff --git a/build.sbt b/build.sbt
index eeadb0610..5d7e07207 100644
--- a/build.sbt
+++ b/build.sbt
@@ -139,7 +139,10 @@ lazy val interopTests = Project(id = "akka-grpc-interop-tests", base = file("int
     ReflectiveCodeGen.extraGenerators := Seq("ScalaMarshallersCodeGenerator"),
     ReflectiveCodeGen.codeGeneratorSettings ++= Seq("server_power_apis"),
     // grpc-interop pulls in proto files with unfulfilled transitive deps it seems
-    PB.generate / excludeFilter := new SimpleFileFilter((f: File) => f.getParent.contains("envoy")),
+    // FIXME descriptor.proto is excluded because of EnumType issue https://github.com/scalapb/ScalaPB/issues/1557
+    PB.generate / excludeFilter := new SimpleFileFilter((f: File) =>
+      f.getAbsolutePath.endsWith("google/protobuf/descriptor.proto") ||
+      f.getParent.contains("envoy")),
     PB.protocVersion := Dependencies.Versions.googleProtobuf,
     // This project should use 'publish/skip := true', but we need
     // to be able to `publishLocal` to run the interop tests as an
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 7e1544e6e..d6d61c323 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -23,9 +23,6 @@ object Dependencies {
     val akkaHttpBinary = "10.6"
 
     val grpc = "1.58.0" // checked synced by VersionSyncCheckPlugin
-    // FIXME should be same as `grpc` but due to https://github.com/scalapb/ScalaPB/issues/1557
-    // we are testing with an older version that doesn't expose that problem.
-    val grpcInterop = "1.54.2"
 
     // Even referenced explicitly in the sbt-plugin's sbt-tests
     // If changing this, remember to update protoc plugin version to align in
@@ -61,7 +58,7 @@ object Dependencies {
 
     // Excluding grpc-alts works around a complex resolution bug
     // Details are in https://github.com/akka/akka-grpc/pull/469
-    val grpcInteropTesting = ("io.grpc" % "grpc-interop-testing" % Versions.grpcInterop)
+    val grpcInteropTesting = ("io.grpc" % "grpc-interop-testing" % Versions.grpc)
       .exclude("io.grpc", "grpc-alts")
       .exclude("io.grpc", "grpc-xds")
 
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
index 9b7bf274a..0964115c4 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
@@ -22,10 +22,13 @@ enablePlugins(AkkaGrpcPlugin)
 // They have different "java_outer_classname" options, but scalapb does not look at it:
 // https://github.com/scalapb/ScalaPB/issues/243#issuecomment-279769902
 // Therefore we exclude it here.
+// FIXME descriptor.proto is excluded because of EnumType issue https://github.com/scalapb/ScalaPB/issues/1557
 PB.generate / excludeFilter := new SimpleFileFilter((f: File) =>
+  f.getAbsolutePath.endsWith("google/protobuf/descriptor.proto") ||
   f.getAbsolutePath.endsWith("google/protobuf/empty.proto") ||
-  // grpc-interop pulls in proto files with unfulfilled transitive deps it seems, so skip them as well
-  f.getParent.contains("envoy"))
+    // grpc-interop pulls in proto files with unfulfilled transitive deps it seems, so skip them as well
+    f.getParent.contains("envoy")
+)
 
 //#sources-both
 // This is the default - both client and server