diff --git a/build.sbt b/build.sbt
index 1fd3d28af..afd6708a7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -108,8 +108,7 @@ lazy val protocol = (project in file("protocol"))
     commonSettings,
     commonCompileSettings,
     testSettings,
-    ProtobufConfig / version := "3.18.0",
-    libraryDependencies += "com.google.protobuf" % "protobuf-java" % (ProtobufConfig / version).value,
+    ProtobufConfig / protobufGrpcEnabled := true,
     // Include the protobuf files in the JAR
     Compile / unmanagedResourceDirectories += (ProtobufConfig / sourceDirectory).value
   )
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 89cabf412..914520556 100755
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -20,4 +20,4 @@ libraryDependencies += "commons-io" % "commons-io" % "2.11.0"
 
 addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
 
-addSbtPlugin("com.github.sbt" % "sbt-protobuf" % "0.7.1")
+addSbtPlugin("com.github.sbt" % "sbt-protobuf" % "0.8.0")
diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala b/snapi-client/src/test/scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala
index e0068c855..8c01d2036 100644
--- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala
+++ b/snapi-client/src/test/scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala
@@ -70,35 +70,35 @@ object TestCredentials {
     .newBuilder()
     .setAccessSecretKey(S3AccessSecretKey.newBuilder().setAccessKey(accessKeyId).setSecretKey(secretKeyId))
     .setRegion("eu-west-1")
-    .buildPartial()
+    .build()
 
   val UnitTestPrivateBucket2 = "rawlabs-unit-tests"
   val UnitTestPrivateBucket2Cred = S3Config
     .newBuilder()
     .setAccessSecretKey(S3AccessSecretKey.newBuilder().setAccessKey(accessKeyId).setSecretKey(secretKeyId))
     .setRegion("eu-west-1")
-    .buildPartial()
+    .build()
 
   val UnitTestEmptyBucketPrivateBucket = "rawlabs-unit-test-empty-bucket"
   val UnitTestEmptyBucketPrivateBucketCred = S3Config
     .newBuilder()
     .setAccessSecretKey(S3AccessSecretKey.newBuilder().setAccessKey(accessKeyId).setSecretKey(secretKeyId))
     .setRegion("eu-west-1")
-    .buildPartial()
+    .build()
 
   val UnitTestListRootPrivateBucket = "rawlabs-unit-test-list-root"
   val UnitTestListRootPrivateBucketCred = S3Config
     .newBuilder()
     .setAccessSecretKey(S3AccessSecretKey.newBuilder().setAccessKey(accessKeyId).setSecretKey(secretKeyId))
     .setRegion("eu-west-1")
-    .buildPartial()
+    .build()
 
   val unitTestPrivateBucketUsEast1 = "rawlabs-unit-tests-us-east-1"
   val unitTestPrivateBucketUsEast1Cred = S3Config
     .newBuilder()
     .setAccessSecretKey(S3AccessSecretKey.newBuilder().setAccessKey(accessKeyId).setSecretKey(secretKeyId))
     .setRegion("eu-west-1")
-    .buildPartial()
+    .build()
 
   ///////////////////////////////////////////////////////////////////////////
   // Jdbc Credentials